Tweak ffmpeg header paths, so mediatomb actually enables it.

4 files changed, 77 insertions, 4 deletions

diff --git a/multimedia/mediatomb/Makefile b/multimedia/mediatomb/Makefile
index 55c0c336289..d29594c693d 100644
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/01/05 12:28:32 jmcneill Exp $
+# $NetBSD: Makefile,v 1.8 2009/01/27 04:05:50 jmcneill Exp $
 
 DISTNAME=	mediatomb-0.11.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mediatomb/}
 
@@ -12,7 +12,7 @@ COMMENT=	UPnP MediaServer with a web user interface
 GNU_CONFIGURE=	yes
 
 USE_LANGUAGES+=	c c++
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config automake autoconf autoreconf
 USE_DIRS+=	xdg-1.4
 
 RCD_SCRIPTS=	mediatomb
@@ -46,6 +46,9 @@ post-extract:
 	${CP} ${FILESDIR}/config.xml.in ${WRKSRC}/config.xml
 	${CP} ${FILESDIR}/mediatomb.desktop.in ${WRKSRC}/mediatomb.desktop
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -i
+
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/config.xml ${EGDIR}/config.xml
diff --git a/multimedia/mediatomb/distinfo b/multimedia/mediatomb/distinfo
index 5bf6c2a6774..52cb4096761 100644
--- a/multimedia/mediatomb/distinfo
+++ b/multimedia/mediatomb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/01/09 10:17:35 tron Exp $
+$NetBSD: distinfo,v 1.5 2009/01/27 04:05:50 jmcneill Exp $
 
 SHA1 (mediatomb-0.11.0.tar.gz) = 1d7c86924686f9999a359ba96092aa36d30832a6
 RMD160 (mediatomb-0.11.0.tar.gz) = 11c53d5757da3a689c025107331526c0486befc4
@@ -11,3 +11,5 @@ SHA1 (patch-ae) = dd75f7fd3d2794dd53062d5710285ed96d030c5b
 SHA1 (patch-af) = ec9261d2ec645a07144f8b927fd57a50175903ca
 SHA1 (patch-ag) = 932f8f4d2764c6cb098e0e78e7476527561b198e
 SHA1 (patch-ah) = 9b12a346a61bdeb7d5cc7a7289c0b4046a7a6255
+SHA1 (patch-ai) = e9cad8e72f7e4e9d6eb7448d1380da3bcc8c28df
+SHA1 (patch-aj) = b3893ec5c8fc518673a144cb74a12eaa7e34f008
diff --git a/multimedia/mediatomb/patches/patch-ai b/multimedia/mediatomb/patches/patch-ai
new file mode 100644
index 00000000000..612d768d873
--- /dev/null
+++ b/multimedia/mediatomb/patches/patch-ai
@@ -0,0 +1,46 @@
+$NetBSD: patch-ai,v 1.1 2009/01/27 04:05:50 jmcneill Exp $
+
+--- configure.ac.orig	2009-01-26 22:50:22.000000000 -0500
++++ configure.ac	2009-01-26 22:50:40.000000000 -0500
+@@ -2327,7 +2327,7 @@ AC_LANG_C
+ 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 @@ if test "x$FFMPEG_OK" = xyes; then
+                 ]
+         )
+     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 @@ if test "x$FFMPEG_OK" = xyes; then
+             [
+                 #define __STDC_CONSTANT_MACROS
+                 #include <stdint.h>
+-                #include <ffmpeg/avformat.h>
++                #include <libavformat/avformat.h>
+             ],
+             [
+                 av_register_all();
+@@ -2462,7 +2462,7 @@ if test "x$FFMPEG_OK" = xyes; then
+                     #define __STDC_CONSTANT_MACROS
+                     #include <stdint.h>
+                     extern "C" {
+-                        #include <ffmpeg/avformat.h>
++                        #include <libavformat/avformat.h>
+                     }
+                 ],
+                 [
diff --git a/multimedia/mediatomb/patches/patch-aj b/multimedia/mediatomb/patches/patch-aj
new file mode 100644
index 00000000000..ac96a769cb9
--- /dev/null
+++ b/multimedia/mediatomb/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2009/01/27 04:05:50 jmcneill Exp $
+
+--- src/metadata/ffmpeg_handler.cc.orig	2009-01-26 22:51:12.000000000 -0500
++++ src/metadata/ffmpeg_handler.cc	2009-01-26 22:51:27.000000000 -0500
+@@ -47,7 +47,7 @@
+ #ifdef HAVE_FFMPEG
+ 
+ // ffmpeg needs the following sources
+-// INT64_C is not defined in ffmpeg/avformat.h but is needed
++// INT64_C is not defined in libavformat/avformat.h but is needed
+ #define __STDC_CONSTANT_MACROS
+ #include <stdint.h>
+ 
+@@ -56,7 +56,7 @@ extern "C" 
+ {
+ #endif
+ 
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ 
+ #ifdef FFMPEG_NEEDS_EXTERN_C
+ } // extern "C"