Packman Build Service PMBS

Changes of Revision 26

mediatomb.spec Changed

mediatomb-0.12.1-mp4v2_2.0.0.patch Changed

@@ -1,7 +1,65 @@
-diff -Naur mediatomb-0.12.1.svn2103.orig/src/metadata/libmp4v2_handler.cc mediatomb-0.12.1.svn2103/src/metadata/libmp4v2_handler.cc
---- mediatomb-0.12.1.svn2103.orig/src/metadata/libmp4v2_handler.cc	2012-11-09 03:02:02.283176882 +0100
-+++ mediatomb-0.12.1.svn2103/src/metadata/libmp4v2_handler.cc	2013-08-09 14:34:00.262756277 +0200
-@@ -62,28 +62,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1541,52 +1541,10 @@ fi
+ ######## ffmpeg
+ 
+ if test "x$FFMPEG_OPTION_ENABLED" = xyes; then
+-    AC_LANG_SAVE
+-    AC_LANG_C
+-
+-
+-    FFMPEG_EXTRA_CFLAGS=""
+-
+-    # the header location of the older and newer ffmpeg version is different
+-    MT_CHECK_HEADER(avformat, ffmpeg/avformat, pass)
+-    if test "x$AVFORMAT_STATUS" != xyes; then
+-        MT_CHECK_HEADER(avformat, libavformat/avformat, pass)
+-        if test "x$AVFORMAT_STATUS" = xyes; then
+-            AC_DEFINE_UNQUOTED(AVFORMAT_INCLUDE, <libavformat/avformat.h>, libavformat/avformat.h)
+-        else
+-            CFLAGS="$CFLAGS -I/usr/include/ffmpeg"
+-            CPPFLAGS="$CPPFLAGS -I/usr/include/ffmpeg"
+-            MT_CHECK_HEADER(avformat, libavformat/avformat, pass)
+-            if test "x$AVFORMAT_STATUS" = xyes; then
+-              AC_DEFINE_UNQUOTED(AVFORMAT_INCLUDE, <libavformat/avformat.h>, libavformat/avformat.h)
+-              FFMPEG_EXTRA_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/ffmpeg"
+-            else
+-                CFLAGS="$CFLAGS_SAVE"
+-                CPPFLAGS="$CPPFLAGS_SAVE"
+-                CFLAGS="$CFLAGS -I/usr/local/include/ffmpeg"
+-                CPPFLAGS="$CPPFLAGS -I/usr/local/include/ffmpeg"
+-                MT_CHECK_HEADER(avformat, libavformat/avformat)
+-                if test "x$AVFORMAT_STATUS" = xyes; then
+-                    FFMPEG_EXTRA_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/ffmpeg"
+-                    AC_DEFINE_UNQUOTED(AVFORMAT_INCLUDE, <libavformat/avformat.h>, libavformat/avformat.h)
+-                fi
+-            fi
+-        fi
+-    else
+-       AC_DEFINE_UNQUOTED(AVFORMAT_INCLUDE, <ffmpeg/avformat.h>, ffmpeg/avformat.h)
+-    fi
+-
+-    if test "x$AVFORMAT_STATUS" = xyes; then
+-        MT_CHECK_LIBRARY(avformat, avformat, av_register_all)
+-        MT_CHECK_LIBRARY(avutil, avutil, av_log_set_callback)
+-    fi
+-    AC_LANG_RESTORE
+-
+-    if ((test "x$AVFORMAT_STATUS" = xyes) && (test "x$AVUTIL_STATUS" = xyes)); then
+-        FFMPEG_STATUS=yes
+-    else
+-        FFMPEG_STATUS=missing
+-    fi
++    FFMPEG_STATUS=yes
++    AC_DEFINE_UNQUOTED(AVFORMAT_INCLUDE, <libavformat/avformat.h>, libavformat/avformat.h)
++    AVFORMAT_CFLAGS="`pkg-config --cflags libavformat libavutil`"
++    AVFORMAT_LDFLAGS="`pkg-config --libs libavformat libavutil`"
+ fi
+ 
+ if test "x$FFMPEG_STATUS" = xyes; then
+--- a/src/metadata/libmp4v2_handler.cc
++++ b/src/metadata/libmp4v2_handler.cc
+@@ -62,28 +62,26 @@ LibMP4V2Handler::LibMP4V2Handler() : Met
  {
  }
  
@@ -35,7 +93,7 @@
              if (mp4_retval)
              {
                  value = mp4_retval;
-@@ -95,17 +93,16 @@
+@@ -95,17 +93,16 @@ static void addMetaField(metadata_fields
              }
              break;
          case M_GENRE:
@@ -58,7 +116,7 @@
              }
              else
                  return;
-@@ -128,6 +125,7 @@
+@@ -128,6 +125,7 @@ static void addMetaField(metadata_fields
          item->setMetadata(MT_KEYSfield.upnp, sc->convert(value));
          log_debug("mp4 handler: setting metadata on item: %d, %s\n", field, sc->convert(value).c_str());
      }
@@ -66,7 +124,7 @@
  }
  
  void LibMP4V2Handler::fillMetadata(Ref<CdsItem> item)
-@@ -145,8 +143,13 @@
+@@ -145,8 +143,13 @@ void LibMP4V2Handler::fillMetadata(Ref<C
  
      try
      {
@@ -81,7 +139,7 @@
  
          Ref<ConfigManager> cm = ConfigManager::getInstance();
  
-@@ -190,32 +193,35 @@
+@@ -190,32 +193,35 @@ void LibMP4V2Handler::fillMetadata(Ref<C
          }
  
  #if defined(HAVE_MAGIC)
@@ -126,7 +184,7 @@
                  if (art_mimetype != _(MIMETYPE_DEFAULT))
                  {
                      Ref<CdsResource> resource(new CdsResource(CH_MP4));
-@@ -226,6 +232,7 @@
+@@ -226,6 +232,7 @@ void LibMP4V2Handler::fillMetadata(Ref<C
              }
          }
  #endif
@@ -134,7 +192,7 @@
          MP4Close(mp4);
      }
      catch (Exception ex)
-@@ -247,24 +254,30 @@
+@@ -247,24 +254,30 @@ Ref<IOHandler> LibMP4V2Handler::serveCon
  
      String ctype = res->getParameters()->get(_(RESOURCE_CONTENT_TYPE));