Fix build with latest ffmpeg

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26.5 x86_64

4 files changed, 63 insertions, 4 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index 0d7e99e0fa18..df55b24b8b5d 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xdtv
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.54 2008/09/22 20:05:51 aballier Exp $
+
+  22 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/xdtv-2.4.0-lavc.patch, xdtv-2.4.0.ebuild:
+  Fix build with latest ffmpeg
 
   01 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   +files/xdtv-2.4.0-ffmpegheaders.patch, xdtv-2.4.0.ebuild:
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index b93944ae5a57..c5a3f1e75f38 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -1,5 +1,9 @@
+-----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
+AUX xdtv-2.4.0-lavc.patch 1189 RMD160 8941548c06769208e2bcd7649dd513003f4e5cd9 SHA1 841d930a12f2dda70dfef06bf7b869aeb221358c SHA256 555940aae37c3e48ac3efb4811c4e6b40c72a41804f1922ab6a3119e343ae469
 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
@@ -58,6 +62,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 5472 RMD160 2650548e41f0f667f4031357407e1cc1cbef37ca SHA1 eaf711e800f3cb9625b94ff07a07ab082e280d75 SHA256 a1085cc96ff3786c1e8aa4d0307b8d47b10e2f3b80ad61982a166d7a9f63cba0
-MISC ChangeLog 8736 RMD160 1f12bba81952782c79f5c06b03c29d79bca7134c SHA1 4693957c2b21a765cccceeac1f9d412ebc58f97c SHA256 31d154d8ff87ddbac3b932aff09e4ff196e8cfb309007cf45a10454b3d250be5
+EBUILD xdtv-2.4.0.ebuild 5510 RMD160 d7ffcfd6e37b223b9712eeb3b8b26078b404a615 SHA1 ebf46f1c8b79a474cf13f9709fb20e329828b549 SHA256 50bf9d021063c8fb3817a7ba20773626e81cdf6d61a1ec791ed729b75fc0223e
+MISC ChangeLog 8871 RMD160 86fc693c1d7c832c56938113181d11289db7791f SHA1 5cb601fa1dcd23ef43dd30ecdcd103857b8d01ad SHA256 554e08429d971465c70c9ade11dd1e8b7fa7500d780dbed01cf034770e90c8b4
 MISC metadata.xml 597 RMD160 ed30da83ed3a6862ca013482334f1cee7999cb53 SHA1 3cd968c01ad397f250e59ac43b1cb4a4dea33415 SHA256 920ff2b569a749b1ff4307c6f4f3ee1dd8cffc7ab3724531f6e1a6e0ed78e84f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjX+qUACgkQvFcC4BYPU0rMKwCeIWeFE4pqopZNgAC5v8Mbal7/
+HacAn0MWRGAZPjPHC0WlXAZo6tj2BJFp
+=2MH+
+-----END PGP SIGNATURE-----
diff --git a/media-tv/xdtv/files/xdtv-2.4.0-lavc.patch b/media-tv/xdtv/files/xdtv-2.4.0-lavc.patch
new file mode 100644
index 000000000000..0397041ac1d0
--- /dev/null
+++ b/media-tv/xdtv/files/xdtv-2.4.0-lavc.patch
@@ -0,0 +1,43 @@
+Index: src/divx.c
+===================================================================
+RCS file: /cvsroot/xawdecode/xawdecode/src/divx.c,v
+retrieving revision 1.216
+diff -u -B -r1.216 divx.c
+--- src/divx.c	11 May 2008 15:34:17 -0000	1.216
++++ src/divx.c	8 Sep 2008 16:31:43 -0000
+@@ -1379,7 +1379,11 @@
+     )
+ #endif
+     {
++#if LIBAVCODEC_BUILD < ((52<<16)+(0<<8)+0)
+       codec_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
++#else
++      codec_context->trellis = 1;
++#endif
+       activated_mess("Trellis Quantization");}
+ #endif
+ 
+@@ -1392,7 +1396,11 @@
+     )
+ #endif
+     {
++#if LIBAVCODEC_BUILD < ((52<<16)+(0<<8)+0)
+       codec_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
++#else
++      codec_context->trellis = 1;
++#endif
+       codec_context->flags |= CODEC_FLAG_CBP_RD;
+       activated_mess("Coded Block Pattern");}
+ #endif
+@@ -1440,7 +1448,11 @@
+ 
+       if (ffmpeg.aic == 1) {
+         if (divx.min_quantizer < 8) codec_context->qmin = 8;
++#if LIBAVCODEC_BUILD < ((52<<16)+(0<<8)+0)
+         codec_context->flags |= CODEC_FLAG_H263P_AIC;
++#else
++        codec_context->flags |= CODEC_FLAG_AC_PRED;
++#endif
+         activated_mess("AIC");}
+ #endif
+ #if LIBAVCODEC_BUILD >= 4694
diff --git a/media-tv/xdtv/xdtv-2.4.0.ebuild b/media-tv/xdtv/xdtv-2.4.0.ebuild
index 0d5db09d05c3..15623f6c772e 100644
--- a/media-tv/xdtv/xdtv-2.4.0.ebuild
+++ b/media-tv/xdtv/xdtv-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2008/04/01 21:06:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.7 2008/09/22 20:05:51 aballier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs autotools
 
@@ -104,6 +104,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-ffmpeg.patch"
 	epatch "${FILESDIR}/${P}-ffmpegheaders.patch"
+	epatch "${FILESDIR}/${P}-lavc.patch"
 
 	eautoreconf
 }