[SM-Commit] GIT changes to stable-0.43 grimoire by Arwed von Merkatz (1b0696358627f8e8a015d5ba58368f663f845d93)

Arwed von Merkatz scm at sourcemage.org
Wed Apr 21 15:13:37 EDT 2010


GIT changes to stable-0.43 grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 audio-soft/mediatomb/DEPENDS          |    8 +
 audio-soft/mediatomb/DETAILS          |    4 
 audio-soft/mediatomb/HISTORY          |    8 +
 audio-soft/mediatomb/INSTALL          |    1 
 audio-soft/mediatomb/PRE_BUILD        |   13 ---
 audio-soft/mediatomb/curl-7.18.patch  |   13 ---
 audio-soft/mediatomb/glibc-2.10.patch |   24 -----
 audio-soft/mediatomb/newffmpeg.patch  |   77 ------------------
 audio-soft/mediatomb/ps3-pcm.patch    |  139 ----------------------------------
 9 files changed, 18 insertions(+), 269 deletions(-)

New commits:
commit 1b0696358627f8e8a015d5ba58368f663f845d93
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    mediatomb: Create mediatomb account/group (Bug #15685)
    (cherry picked from commit a39f010ae063e87e13c37ad83906f2bf6c770c9e)

commit c4368ed3ce5568f67ec53b070dff8dc4399f5dfb
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    mediatomb: version 0.12.1, added missing optional deps on liblastfm and
    libmp4v2, removed obsolete patches and PRE_BUILD

diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
index 8a3ae35..babf612 100755
--- a/audio-soft/mediatomb/DEPENDS
+++ b/audio-soft/mediatomb/DEPENDS
@@ -47,4 +47,10 @@ optional_depends libextractor \
 optional_depends LIBAVCODEC \
                  "--enable-ffmpeg" \
                  "--disable-ffmpeg" \
-                 "to gather metadata from video files" 
+                 "to gather metadata from video files" &&
+optional_depends libmp4v2 \
+                 "" "--disable-libmp4v2" \
+                 "to enable MP4 support" &&
+optional_depends liblastfm \
+                 "" "--disable-lastfmlib" \
+                 "to enable last fm scrobbing"
diff --git a/audio-soft/mediatomb/DETAILS b/audio-soft/mediatomb/DETAILS
index 53d0378..0552531 100755
--- a/audio-soft/mediatomb/DETAILS
+++ b/audio-soft/mediatomb/DETAILS
@@ -1,8 +1,8 @@
            SPELL=mediatomb
-         VERSION=0.11.0
+         VERSION=0.12.1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:52e6fccbbda16edc778044ac591c1f3b80941edafbd80170ef4d10297fca051421976003566609db7461faa4c0efd74337943e10b802e57072525a2e5e74036b
+     SOURCE_HASH=sha512:36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://mediatomb.cc"
       LICENSE[0]=GPL
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
index 39e2249..1853121 100644
--- a/audio-soft/mediatomb/HISTORY
+++ b/audio-soft/mediatomb/HISTORY
@@ -1,3 +1,11 @@
+2010-04-20 Eric Sandall <sandalle at sourcemage.org>
+	* INSTALL: Create mediatomb account/group (Bug #15685)
+
+2010-04-15 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 0.12.1
+	* DEPENDS: added missing optional deps on libmp4v2 and liblastfm
+	* PRE_BUILD: no longer needed
+
 2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DEPENDS: a few tweaks
 	* PRE_BUILD: use proper headers
diff --git a/audio-soft/mediatomb/INSTALL b/audio-soft/mediatomb/INSTALL
index 8202db4..be6df00 100755
--- a/audio-soft/mediatomb/INSTALL
+++ b/audio-soft/mediatomb/INSTALL
@@ -1,3 +1,4 @@
+create_account mediatomb &&
 default_install &&
 mkdir -p /srv/mediatomb &&
 chown mediatomb.mediatomb /srv/mediatomb
diff --git a/audio-soft/mediatomb/PRE_BUILD b/audio-soft/mediatomb/PRE_BUILD
deleted file mode 100755
index ad371f7..0000000
--- a/audio-soft/mediatomb/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-default_pre_build &&
-create_account mediatomb &&
-cd $SOURCE_DIRECTORY &&
-sedit 's#FFMPEG_SEARCH_HEADERS/ffmpeg#FFMPEG_SEARCH_HEADERS#g' configure &&
-sedit 's#ffmpeg/avformat.h#libavformat/avformat.h#g' configure &&
-sedit 's#ffmpeg/avformat.h#libavformat/avformat.h#g' src/metadata/ffmpeg_handler.cc &&
-##next line can prolly be removed for versions > 0.11.0, fixed in svn
-#sedit 's#CURLOPT_NOBODY)#CURLOPT_NOBODY, 1)#' src/url.cc
-
-patch -p1 < $SPELL_DIRECTORY/curl-7.18.patch &&
-patch -p0 < $SPELL_DIRECTORY/glibc-2.10.patch &&
-patch -p1 < $SPELL_DIRECTORY/newffmpeg.patch &&
-patch -p1 < $SPELL_DIRECTORY/ps3-pcm.patch
diff --git a/audio-soft/mediatomb/curl-7.18.patch b/audio-soft/mediatomb/curl-7.18.patch
deleted file mode 100644
index 5d0d4b2..0000000
--- a/audio-soft/mediatomb/curl-7.18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mediatomb-0.11.0/src/url.cc
-===================================================================
---- mediatomb-0.11.0.orig/src/url.cc
-+++ mediatomb-0.11.0/src/url.cc
-@@ -75,7 +75,7 @@
- 
-     if (only_header)
-     {
--        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, TRUE);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
-                          (void *)buffer.getPtr());
diff --git a/audio-soft/mediatomb/glibc-2.10.patch b/audio-soft/mediatomb/glibc-2.10.patch
deleted file mode 100644
index ff207b7..0000000
--- a/audio-soft/mediatomb/glibc-2.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/tools.cc
-===================================================================
---- src/tools.cc	(revisione 2018)
-+++ src/tools.cc	(copia locale)
-@@ -303,8 +303,8 @@
-     Ref<StringBuffer> buf(new StringBuffer(len / 2));
-     for (int i = 0; i < len; i += 2)
-     {
--        char *chi = strchr(HEX_CHARS, ptr[i]);
--        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-+        const char *chi = strchr(HEX_CHARS, ptr[i]);
-+        const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-         int hi, lo;
-         
-         if (chi)
-@@ -397,7 +397,7 @@
-             char clo = data[i++];
-             int hi, lo;
- 
--            char *pos;
-+            const char *pos;
- 
-             pos = strchr(hex, chi);
-             if (!pos)
diff --git a/audio-soft/mediatomb/newffmpeg.patch b/audio-soft/mediatomb/newffmpeg.patch
deleted file mode 100644
index e18a161..0000000
--- a/audio-soft/mediatomb/newffmpeg.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: mediatomb-0.11.0/configure.ac
-===================================================================
---- mediatomb-0.11.0.orig/configure.ac
-+++ mediatomb-0.11.0/configure.ac
-@@ -2340,9 +2340,14 @@ if test "x$FFMPEG_OK" = xyes; then
-                 ]
-         )
-     else 
--        AC_CHECK_HEADER(ffmpeg/avformat.h,
--            [],
-+        AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h],
-+            [ffmpeg_found=yes; break;], [],
-             [
-+                #define __STDC_CONSTANT_MACROS
-+                #include <stdint.h>
-+            ]
-+        )
-+	if test "x$ffmpeg_found" != "xyes"; then
-                 CPPFLAGS="-I$SEARCH_DIR_HEADERS"
-                 unset ac_cv_header_ffmpeg_avformat_h
-                 AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
-@@ -2357,12 +2362,7 @@ if test "x$FFMPEG_OK" = xyes; then
-                         #include <stdint.h>
-                     ]
-                 )
--            ],
--            [
--                #define __STDC_CONSTANT_MACROS
--                #include <stdint.h>
--            ]
--        )
-+	fi
-     fi
- fi
-  
-@@ -2447,7 +2447,11 @@ if test "x$FFMPEG_OK" = xyes; then
-             [
-                 #define __STDC_CONSTANT_MACROS
-                 #include <stdint.h>
-+		#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+		#include <libavformat/avformat.h>
-+		#else
-                 #include <ffmpeg/avformat.h>
-+		#endif
-             ],
-             [
-                 av_register_all();
-@@ -2462,7 +2466,11 @@ if test "x$FFMPEG_OK" = xyes; then
-                     #define __STDC_CONSTANT_MACROS
-                     #include <stdint.h>
-                     extern "C" {
--                        #include <ffmpeg/avformat.h>
-+                        #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+			#include <libavformat/avformat.h>
-+			#else
-+                	#include <ffmpeg/avformat.h>
-+			#endif
-                     }
-                 ],
-                 [
-Index: mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
-===================================================================
---- mediatomb-0.11.0.orig/src/metadata/ffmpeg_handler.cc
-+++ mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
-@@ -56,7 +56,11 @@ extern "C" 
- {
- #endif
- 
--#include <ffmpeg/avformat.h>
-+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+# include <libavformat/avformat.h>
-+#else
-+# include <ffmpeg/avformat.h>
-+#endif
- 
- #ifdef FFMPEG_NEEDS_EXTERN_C
- } // extern "C"
diff --git a/audio-soft/mediatomb/ps3-pcm.patch b/audio-soft/mediatomb/ps3-pcm.patch
deleted file mode 100644
index 11657f0..0000000
--- a/audio-soft/mediatomb/ps3-pcm.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -urpN mediatomb-0.11.0.orig/src/cds_resource_manager.cc mediatomb-0.11.0/src/cds_resource_manager.cc
---- mediatomb-0.11.0.orig/src/cds_resource_manager.cc	2008-05-26 23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/cds_resource_manager.cc	2008-05-26 23:14:56.000000000 +1000
-@@ -184,6 +184,30 @@ void CdsResourceManager::addResources(Re
-                 t_res->addAttribute(MetadataHandler::getResAttrName(R_DURATION),
-                         duration);
- 
-+            int freq = tp->getSampleFreq();
-+            if (freq == SOURCE)
-+            {
-+                String frequency = item->getResource(0)->getAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY));
-+                if (string_ok(frequency))
-+                     t_res->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY), frequency);
-+            }
-+            else if (freq != OFF)
-+            {
-+                t_res->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY), String::from(freq));
-+            }
-+
-+            int chan = tp->getNumChannels();
-+            if (chan == SOURCE)
-+            {
-+                String nchannels = item->getResource(0)->getAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS));
-+                if (string_ok(nchannels))
-+                     t_res->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS), nchannels);
-+            }
-+            else if (chan != OFF)
-+            {
-+                t_res->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS), String::from(chan));
-+            }
-+
-             if (tp->isThumbnail())
-                 t_res->addOption(_(RESOURCE_CONTENT_TYPE), _(EXIF_THUMBNAIL));
- 
-diff -urpN mediatomb-0.11.0.orig/src/config_manager.cc mediatomb-0.11.0/src/config_manager.cc
---- mediatomb-0.11.0.orig/src/config_manager.cc	2008-05-26 23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/config_manager.cc	2008-05-26 23:14:56.000000000 +1000
-@@ -2092,6 +2092,43 @@ Ref<TranscodingProfileList> ConfigManage
-                 prof->setAcceptURL(false);
-         }
- 
-+        if (child->getChildByName(_("sample-frequency")) != nil)
-+        {
-+            param = child->getChildText(_("sample-frequency"));
-+            if (param == "source")
-+                prof->setSampleFreq(SOURCE);
-+            else if (param == "off")
-+                prof->setSampleFreq(OFF);
-+            else
-+            {
-+                int freq = param.toInt();
-+                if (freq <= 0)
-+                    throw _Exception(_("Error in config file: incorrect "
-+                                       "parameter for <sample-frequency> "
-+                                       "tag"));
-+
-+                prof->setSampleFreq(freq);
-+            }
-+        }
-+
-+        if (child->getChildByName(_("audio-channels")) != nil)
-+        {
-+            param = child->getChildText(_("audio-channels"));
-+            if (param == "source")
-+                prof->setNumChannels(SOURCE);
-+            else if (param == "off")
-+                prof->setNumChannels(OFF);
-+            else
-+            {
-+                int chan = param.toInt();
-+                if (chan <= 0)
-+                    throw _Exception(_("Error in config file: incorrect "
-+                                       "parameter for <number-of-channels> "
-+                                       "tag"));
-+                prof->setNumChannels(chan);
-+            }
-+        }
-+
-         if (child->getChildByName(_("hide-original-resource")) != nil)
-         {
-             param = child->getChildText(_("hide-original-resource"));
-diff -urpN mediatomb-0.11.0.orig/src/transcoding/transcoding.cc mediatomb-0.11.0/src/transcoding/transcoding.cc
---- mediatomb-0.11.0.orig/src/transcoding/transcoding.cc	2008-05-26 23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/transcoding/transcoding.cc	2008-05-26 23:14:56.000000000 +1000
-@@ -52,6 +52,8 @@ TranscodingProfile::TranscodingProfile()
-     accept_url = true;
-     hide_orig_res = false;
-     thumbnail = false;
-+    sample_frequency = SOURCE; // keep original
-+    number_of_channels = SOURCE;
-     attributes = Ref<Dictionary>(new Dictionary());
-     fourcc_list = Ref<Array<StringBase> >(new Array<StringBase>());
-     fourcc_mode = FCC_None;
-@@ -66,6 +68,8 @@ TranscodingProfile::TranscodingProfile(t
-     accept_url = true;
-     hide_orig_res = false;
-     thumbnail = false;
-+    sample_frequency = SOURCE; // keep original
-+    number_of_channels = SOURCE;
-     buffer_size = 0;
-     chunk_size = 0;
-     initial_fill_size = 0;
-diff -urpN mediatomb-0.11.0.orig/src/transcoding/transcoding.h mediatomb-0.11.0/src/transcoding/transcoding.h
---- mediatomb-0.11.0.orig/src/transcoding/transcoding.h	2008-05-26 23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/transcoding/transcoding.h	2008-05-26 23:14:56.000000000 +1000
-@@ -39,6 +39,9 @@
- #include "dictionary.h"
- #include "object_dictionary.h"
- 
-+#define SOURCE  (-1)
-+#define OFF       0
-+
- typedef enum transcoding_type_t
- {
-     TR_None,
-@@ -164,6 +167,14 @@ public:
-     /// \brief Provides information on the mode of the list
-     avi_fourcc_listmode_t getAVIFourCCListMode() { return fourcc_mode; }
- 
-+    /// \brief Sample frequency handling
-+    void setSampleFreq(int freq) { sample_frequency = freq; }
-+    int getSampleFreq() { return sample_frequency; }
-+
-+    /// \brief Number of channels
-+    void setNumChannels(int chans) { number_of_channels = chans; }
-+    int getNumChannels() { return number_of_channels; }
-+
- protected:
-     zmm::String name;
-     zmm::String tm;
-@@ -178,6 +189,8 @@ protected:
-     size_t chunk_size;
-     size_t initial_fill_size;
-     transcoding_type_t tr_type;
-+    int number_of_channels;
-+    int sample_frequency;
-     zmm::Ref<Dictionary> attributes;
-     zmm::Ref<zmm::Array<zmm::StringBase> > fourcc_list;
-     avi_fourcc_listmode_t fourcc_mode;



More information about the SM-Commit mailing list