add a patch to allow building against latest ffmpeg

(Portage version: 2.1.4.4)

3 files changed, 91 insertions, 5 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index 753de5d92515..0d7e99e0fa18 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xdtv
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.52 2007/11/27 10:14:40 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.53 2008/04/01 21:06:46 aballier Exp $
+
+  01 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/xdtv-2.4.0-ffmpegheaders.patch, xdtv-2.4.0.ebuild:
+  add a patch to allow building against latest ffmpeg
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> xdtv-2.2.0-r1.ebuild,
   xdtv-2.4.0.ebuild:
diff --git a/media-tv/xdtv/files/xdtv-2.4.0-ffmpegheaders.patch b/media-tv/xdtv/files/xdtv-2.4.0-ffmpegheaders.patch
new file mode 100644
index 000000000000..64e1d7c4fec6
--- /dev/null
+++ b/media-tv/xdtv/files/xdtv-2.4.0-ffmpegheaders.patch
@@ -0,0 +1,78 @@
+Index: xdtv-2.4.0/configure.in
+===================================================================
+--- xdtv-2.4.0.orig/configure.in
++++ xdtv-2.4.0/configure.in
+@@ -1035,6 +1035,11 @@ if test "x$enable_ffmpeg" != "xno"; then
+   if test "x$with_external_ffmpeg" = "xyes"; then
+ 
+      PKG_CHECK_MODULES([FFMPEG], [libavcodec libavformat], enable_ffmpeg=yes, enable_ffmpeg=no)
++     AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
++     AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
++     AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h)
++     AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])
++
+ 
+      if test "x$enable_ffmpeg" = "xyes"; then
+        echo "*** A modern and external ffmpeg library was found: we use it ***"
+Index: xdtv-2.4.0/src/container-ffmpeg.c
+===================================================================
+--- xdtv-2.4.0.orig/src/container-ffmpeg.c
++++ xdtv-2.4.0/src/container-ffmpeg.c
+@@ -23,8 +23,16 @@
+ 
+ #ifdef HAVE_FFMPEG
+ #if LIBAVCODEC_BUILD >= 4754
++#if HAVE_LIBAVCODEC_AVCODEC_H
++#include <libavcodec/avcodec.h>
++#else
+ # include "avcodec.h"
++#endif
++#if HAVE_LIBAVFORMAT_AVFORMAT_H
++#include <libavformat/avformat.h>
++#else
+ # include "avformat.h"
++#endif
+ 
+ static AVOutputFormat *av_output_fmt = NULL;
+ static AVFormatContext *oc=NULL; 
+Index: xdtv-2.4.0/src/container.h
+===================================================================
+--- xdtv-2.4.0.orig/src/container.h
++++ xdtv-2.4.0/src/container.h
+@@ -14,8 +14,12 @@
+ #include "strtab.h"
+ 
+ #ifdef HAVE_FFMPEG
++#if HAVE_LIBAVCODEC_AVCODEC_H
++# include <libavcodec/avcodec.h>
++#else
+ # include "avcodec.h"
+ #endif
++#endif
+ 
+ enum {
+ AVI_BUILTIN,
+Index: xdtv-2.4.0/src/divx.h
+===================================================================
+--- xdtv-2.4.0.orig/src/divx.h
++++ xdtv-2.4.0/src/divx.h
+@@ -31,11 +31,19 @@
+ #include "container.h"
+ 
+ #ifdef HAVE_FFMPEG
++#if HAVE_LIBAVCODEC_AVCODEC_H
++#include <libavcodec/avcodec.h>
++#else
+ # include "avcodec.h"
++#endif
+ #if LIBAVCODEC_BUILD >= 4754
++#if HAVE_LIBAVFORMAT_AVFORMAT_H
++#include <libavformat/avformat.h>
++#else
+ # include "avformat.h"
+ #endif
+ #endif
++#endif
+ 
+ #ifdef HAVE_XVID
+ # include <xvid.h>
diff --git a/media-tv/xdtv/xdtv-2.4.0.ebuild b/media-tv/xdtv/xdtv-2.4.0.ebuild
index 30a38895474c..0d5db09d05c3 100644
--- a/media-tv/xdtv/xdtv-2.4.0.ebuild
+++ b/media-tv/xdtv/xdtv-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.5 2007/11/27 10:14:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.6 2008/04/01 21:06:46 aballier Exp $
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs autotools
 
 IUSE="alsa jpeg encode ffmpeg xvid lirc xinerama neXt Xaw3d mmx zvbi aqua_theme
 carbone_theme xv debug ogg png nls schedule"
@@ -99,9 +99,13 @@ extension_install() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	einfo "Cleaning up included ffmpeg to not interfere with headers inclusion"
+	rm -rf libav* libswscale libpostproc
 
 	epatch "${FILESDIR}/${P}-ffmpeg.patch"
+	epatch "${FILESDIR}/${P}-ffmpegheaders.patch"
 
+	eautoreconf
 }
 
 src_compile() {