[48239] trunk/dports/net/mediatomb

[devans at macports.org]

Revision: 48239
          http://trac.macports.org/changeset/48239
Author:   devans at macports.org
Date:     2009-03-17 07:43:40 -0700 (Tue, 17 Mar 2009)
Log Message:
-----------
mediatomb: maintainer update with minor fixes, see #18850 for details.  Also closes #16756.

Modified Paths:
--------------
    trunk/dports/net/mediatomb/Portfile

Added Paths:
-----------
    trunk/dports/net/mediatomb/files/patch-configure.ac.diff
    trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff

Modified: trunk/dports/net/mediatomb/Portfile
===================================================================
--- trunk/dports/net/mediatomb/Portfile	2009-03-17 09:20:47 UTC (rev 48238)
+++ trunk/dports/net/mediatomb/Portfile	2009-03-17 14:43:40 UTC (rev 48239)
@@ -4,6 +4,7 @@
 
 name			mediatomb
 version			0.11.0
+revision		1
 categories		net multimedia
 platforms       darwin
 maintainers		yattenator at gmail.com
@@ -22,8 +23,12 @@
 depends_lib	port:libiconv port:zlib port:spidermonkey \
 	port:file port:curl port:libexif port:expat
 
-patchfiles  patch-src_url.cc.diff
+use_autoreconf	yes
 
+patchfiles  patch-src_url.cc.diff \
+	patch-configure.ac.diff \
+	patch-src-metadata-ffmpeg_handler.cc.diff
+
 configure.args	\
 	--enable-libjs --with-js-h=${prefix}/include/js --enable-libexif \
 	--disable-sqlite3 --disable-mysql \

Added: trunk/dports/net/mediatomb/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/net/mediatomb/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/net/mediatomb/files/patch-configure.ac.diff	2009-03-17 14:43:40 UTC (rev 48239)
@@ -0,0 +1,62 @@
+--- configure.ac.orig	2008-03-02 07:48:54.000000000 +0900
++++ configure.ac	2009-03-17 10:56:51.000000000 +0900
+@@ -946,8 +946,7 @@
+         AC_MSG_NOTICE([You are running OSX, assuming threadsafe gethostbyname version])
+ elif test $CYGWIN_OS -eq 1; then
+         AC_MSG_NOTICE([Your are building under Cygwin, assuming threadsafe gethostbyname implementation])
+-fi
+-
++else
+ AC_CHECK_FUNCS([gethostbyname_r],[],
+         [
+             AC_CHECK_HEADERS([lwres/netdb.h],
+@@ -960,6 +959,7 @@
+                     fi
+                 ])
+         ])
++fi
+ 
+ AC_CHECK_FUNCS([if_nameindex],[],
+         [
+@@ -2327,7 +2327,7 @@
+ if test "x$FFMPEG_OK" = xyes; then
+     if test -n "$FFMPEG_SEARCH_HEADERS" ; then
+         CPPFLAGS="-I$FFMPEG_SEARCH_HEADERS"
+-        AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h,
++        AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/libavformat/avformat.h,
+                 [
+                     FFMPEG_CXXFLAGS="-I$FFMPEG_SEARCH_HEADERS"
+                 ],
+@@ -2340,12 +2340,12 @@
+                 ]
+         )
+     else 
+-        AC_CHECK_HEADER(ffmpeg/avformat.h,
++        AC_CHECK_HEADER(libavformat/avformat.h,
+             [],
+             [
+                 CPPFLAGS="-I$SEARCH_DIR_HEADERS"
+                 unset ac_cv_header_ffmpeg_avformat_h
+-                AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
++                AC_CHECK_HEADER($SEARCH_DIR_HEADERS/libavformat/avformat.h,
+                     [
+                         FFMPEG_CXXFLAGS="-I$SEARCH_DIR_HEADERS"
+                     ],
+@@ -2447,7 +2447,7 @@
+             [
+                 #define __STDC_CONSTANT_MACROS
+                 #include <stdint.h>
+-                #include <ffmpeg/avformat.h>
++                #include <libavformat/avformat.h>
+             ],
+             [
+                 av_register_all();
+@@ -2462,7 +2462,7 @@
+                     #define __STDC_CONSTANT_MACROS
+                     #include <stdint.h>
+                     extern "C" {
+-                        #include <ffmpeg/avformat.h>
++                        #include <libavformat/avformat.h>
+                     }
+                 ],
+                 [

Added: trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff
===================================================================
--- trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff	                        (rev 0)
+++ trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff	2009-03-17 14:43:40 UTC (rev 48239)
@@ -0,0 +1,11 @@
+--- src/metadata/ffmpeg_handler.cc.orig	2009-03-15 10:22:54.000000000 -0700
++++ src/metadata/ffmpeg_handler.cc	2009-03-15 10:23:44.000000000 -0700
+@@ -56,7 +56,7 @@
+ {
+ #endif
+ 
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ 
+ #ifdef FFMPEG_NEEDS_EXTERN_C
+ } // extern "C"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090317/a738a49e/attachment.html>