[65379] trunk/dports/net/mediatomb

ryandesign at macports.org ryandesign at macports.org
Thu Mar 25 14:52:14 PDT 2010


Revision: 65379
          http://trac.macports.org/changeset/65379
Author:   ryandesign at macports.org
Date:     2010-03-25 14:52:13 -0700 (Thu, 25 Mar 2010)
Log Message:
-----------
mediatomb: update to 0.12.0; fixes universal build (see #23058)

Modified Paths:
--------------
    trunk/dports/net/mediatomb/Portfile
    trunk/dports/net/mediatomb/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff
    trunk/dports/net/mediatomb/files/patch-src_url.cc.diff

Modified: trunk/dports/net/mediatomb/Portfile
===================================================================
--- trunk/dports/net/mediatomb/Portfile	2010-03-25 21:50:49 UTC (rev 65378)
+++ trunk/dports/net/mediatomb/Portfile	2010-03-25 21:52:13 UTC (rev 65379)
@@ -3,8 +3,7 @@
 PortSystem		1.0
 
 name			mediatomb
-version			0.11.0
-revision		1
+version			0.12.0
 categories		net multimedia
 platforms       darwin
 maintainers		gmail.com:yattenator
@@ -17,17 +16,17 @@
 
 homepage	http://mediatomb.cc/
 master_sites	sourceforge
-checksums	md5 661f08933830d920de21436fe122fb15 \
-		sha1 1d7c86924686f9999a359ba96092aa36d30832a6
 
+checksums		md5     d822a3f33ee109f799d7a6b76d394e05 \
+			sha1    50333464ce42e14488f9c63243ab0ab34e36c762 \
+			rmd160  5d46fa16d8614f853ec52212cd5df00a204c6e47
+
 depends_lib	port:libiconv port:zlib port:spidermonkey \
 	port:file port:curl port:libexif port:expat
 
 use_autoreconf	yes
 
-patchfiles  patch-src_url.cc.diff \
-	patch-configure.ac.diff \
-	patch-src-metadata-ffmpeg_handler.cc.diff
+patchfiles	patch-configure.ac.diff
 
 configure.args	\
 	--enable-libjs --with-js-h=${prefix}/include/js --enable-libexif \

Modified: trunk/dports/net/mediatomb/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/net/mediatomb/files/patch-configure.ac.diff	2010-03-25 21:50:49 UTC (rev 65378)
+++ trunk/dports/net/mediatomb/files/patch-configure.ac.diff	2010-03-25 21:52:13 UTC (rev 65379)
@@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig	2010-03-25 10:47:02.000000000 -0500
++++ configure.ac	2010-03-25 16:11:28.000000000 -0500
+@@ -692,8 +692,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])
@@ -10,7 +10,7 @@
  AC_CHECK_FUNCS([gethostbyname_r],[],
          [
              AC_CHECK_HEADERS([lwres/netdb.h],
-@@ -960,6 +959,7 @@
+@@ -712,6 +711,7 @@
                      fi
                  ])
          ])
@@ -18,45 +18,3 @@
  
  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>
-                     }
-                 ],
-                 [

Deleted: trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff
===================================================================
--- trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff	2010-03-25 21:50:49 UTC (rev 65378)
+++ trunk/dports/net/mediatomb/files/patch-src-metadata-ffmpeg_handler.cc.diff	2010-03-25 21:52:13 UTC (rev 65379)
@@ -1,11 +0,0 @@
---- 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"

Deleted: trunk/dports/net/mediatomb/files/patch-src_url.cc.diff
===================================================================
--- trunk/dports/net/mediatomb/files/patch-src_url.cc.diff	2010-03-25 21:50:49 UTC (rev 65378)
+++ trunk/dports/net/mediatomb/files/patch-src_url.cc.diff	2010-03-25 21:52:13 UTC (rev 65379)
@@ -1,11 +0,0 @@
---- src/url.cc	2008/03/01 17:33:21	1714
-+++ src/url.cc	2008/04/09 10:32:57	1775
-@@ -75,7 +75,7 @@
- 
-     if (only_header)
-     {
--        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
-                          (void *)buffer.getPtr());
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100325/3cd5a47e/attachment-0001.html>


More information about the macports-changes mailing list