add a patch to allow building against latest ffmpeg

Package-Manager: portage-2.1.4.4

4 files changed, 104 insertions, 7 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/Manifest b/media-tv/xdtv/Manifest
index 002ce623483e..9a8d06a9b950 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xdtv-2.4.0-ffmpeg.patch 4069 RMD160 fa0c1c926cabf65bd4996e53f1f85fc81e709546 SHA1 bdfc8db21546ba188f5b781e743f671d305fa5f5 SHA256 a8126adac7bb8506bfd8daf2327bc805f3884a87b3d87c5f0f988a885e9b86d8
+AUX xdtv-2.4.0-ffmpegheaders.patch 2190 RMD160 de2ddecba8f12679cacfb34e2cba1b298526bf18 SHA1 92499141c69871d35c96aae5660dfa8e19325ee2 SHA256 1de4e96244f9369fc66c7c36757520a24e3d38bf8177ad91a03191338e608d06
 DIST libxdtv-i18n-ca-1.2.0.tar.gz 561158 RMD160 27b46861a1979254f313ff60ce0312c1cf383a09 SHA1 847863b33224ffc87336727db369b5e6cfe929c4 SHA256 dc8cdeda683054d035f0596484b65e2ebd9bbecca7490661e050280742423f5c
 DIST libxdtv-i18n-ca-2.4.0.tar.gz 673690 RMD160 f8e82962b6c08c145cb730661c6f422102360912 SHA1 b90285e055812827f7a0185d02d89d014e12403f SHA256 7a7970dfa6049b472974754fa962dd2810efff17c1e93b250c407c4d9207da96
 DIST libxdtv-i18n-cs-2.4.0.tar.gz 677383 RMD160 69d4619e4ac330eda2dd46c0c814b276e6846a29 SHA1 9f2ea85b6ad840cc10896fb8782d60941734ed0d SHA256 34108e279f39cc02e8364f24486baf66436edda4de164f66bfd018c7af24c9a0
@@ -57,6 +61,13 @@ DIST xdtv-2.2.0-gcc4-amd64.patch.tar.gz 6027 RMD160 eeab9185747eae8f7887d65e5035
 DIST xdtv-2.2.0.tar.gz 905162 RMD160 ff002f07cbba6d076e73142eb5b1cd1ba97448c3 SHA1 8a7f4e92e1d1604541aed9689cc701bdef9822f1 SHA256 a7828bc963133184f27df78e9c2d23c2b5f75e130801a114b85fbf137d2780c4
 DIST xdtv-2.4.0.tar.gz 3230154 RMD160 b481a4d65b3fe34d4790f4e0851919588974fa90 SHA1 5176111f781c54b1374093855a407f89639b31ad SHA256 54d36552284f17aadc4b7455aed91d5efdbbba64827e369b3d8a80ec00543c3e
 EBUILD xdtv-2.2.0-r1.ebuild 7062 RMD160 a6ff52d99043cec767f79d9e77dd6042da28e964 SHA1 07b6938b90da4d4e9af4037eea06e6f63d3463f2 SHA256 f7e37b43ee98ffb007c580dc41034f5aae904a9b6a9a79d2317643dd17b4aa83
-EBUILD xdtv-2.4.0.ebuild 5283 RMD160 e24e273a1716f7e3a75d84e8834ddcc006bbd710 SHA1 683a8891cf7ff8599f9bc6849a670ec2244819db SHA256 52153ff4bd79caa65fe4d9e1ce11a15372a24f0918dea1ff158894a78ad76323
-MISC ChangeLog 8565 RMD160 c597089d39b8f01c5a65312a355d0939c3718173 SHA1 e0b3d8ff2878ef555befebe32391d5c40d3c6def SHA256 0dd8e4458efa06e65bf655dea1b37b116bf5a964edb029c481cf0614855f06ec
+EBUILD xdtv-2.4.0.ebuild 5472 RMD160 2650548e41f0f667f4031357407e1cc1cbef37ca SHA1 eaf711e800f3cb9625b94ff07a07ab082e280d75 SHA256 a1085cc96ff3786c1e8aa4d0307b8d47b10e2f3b80ad61982a166d7a9f63cba0
+MISC ChangeLog 8736 RMD160 1f12bba81952782c79f5c06b03c29d79bca7134c SHA1 4693957c2b21a765cccceeac1f9d412ebc58f97c SHA256 31d154d8ff87ddbac3b932aff09e4ff196e8cfb309007cf45a10454b3d250be5
 MISC metadata.xml 251 RMD160 5a95bc58fcda94b2d82b3040b6730442e120f8ea SHA1 06b6e03f61417e4af6428787da39f3e5f76b6bf1 SHA256 27a61643c6fa329d9ffed2f5517d4f142d60b94836413a2fdfe3cfdc085a9d38
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkfyo+4ACgkQvFcC4BYPU0rF/gCgoT/poy68qH6lobLwz7PCuYuj
+csIAoLlG4k4Da4dKPHO81p3gmaOfTuMs
+=gu0r
+-----END PGP SIGNATURE-----
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() {