Add a patch from upstream to fix build with latest libavutil

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 55 insertions, 4 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index fa73953e4b2a..b8c87fb165b5 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.585 2009/02/28 10:56:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.586 2009/03/08 21:28:40 aballier Exp $
+
+  08 Mar 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/xine-lib-1.1.16.2-avutil.patch, xine-lib-1.1.16.2.ebuild:
+  Add a patch from upstream to fix build with latest libavutil
 
   28 Feb 2009; Raúl Porcel <armin76@gentoo.org> xine-lib-1.1.16.2.ebuild:
   alpha/arm/ia64 stable wrt #260069
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index a5efe25fad82..6b11ca0eedbe 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,14 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xine-lib-1.1.15-GetImagePixels.patch 1209 RMD160 32f9ca2c96ede51238119899520ea1c2a2915654 SHA1 24e2741f1bd6df6c04a0d204966219c63c18e9bf SHA256 8f4d93765f8610117af8fe98fc915d0ef7c6a6373bc126f06be3d3f1d27fb7d1
 AUX xine-lib-1.1.15-buffer_h_ansi.patch 556 RMD160 d6607e3319a1fe0d6f88a40dd775d3064ce8fb5e SHA1 f96f76c22267d3a814caf6db080f81df5070bd5d SHA256 d5aa882549203e56f9f15225e051f2aabc06302396f07aa2a2306cba62451d9b
 AUX xine-lib-1.1.15-ffmpeg.patch 1346 RMD160 a15b850afa2169a4f2cffc551eda067b5290e1b0 SHA1 de8d2d3f755ed87bb9650749ba339974f57a7538 SHA256 6bd74e3646a7bed6bbb8449de25995006d7a011b3e3abdfbf8791334a00b8d85
 AUX xine-lib-1.1.15-libmpeg2-vis.patch 405 RMD160 896298250884a9e3a1b168fe7140835a7112bc53 SHA1 3a3212a629c630e52327f25b3df3c5ecef5b5bbb SHA256 90af2c9a50db6dc358df59c9ab3e4aaed4bc8a8686f2b512e1dffa97b64825fe
+AUX xine-lib-1.1.16.2-avutil.patch 1146 RMD160 eca8f43139e5d5bd6ea6ae0fb22c2ed564a2684f SHA1 831fbfcceaf81e68e31a73adca97379e8b95bb6f SHA256 26d64b3df1f711ed76e4a44adc47361559d185456f17e06748aafc3e8142b59d
 DIST xine-lib-1.1.15.tar.bz2 7478750 RMD160 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f SHA1 bcb567ea2a11c5f26b2384d5400b8466ea9048c6 SHA256 07ddf2a9f521417dd2f097534a52ddd9d2883679932f965ae7e7b0125d3c9dcc
 DIST xine-lib-1.1.16.1.tar.bz2 7382381 RMD160 3c76b12fae8cba87e6d3bceafcbf2fb3ef94e164 SHA1 82709254a0603e3971058aacf8578926b75d4a20 SHA256 9fc252d06e5db24265c83076676bd1f1d0e0935732b9f21ec7fcaac35bf80a36
 DIST xine-lib-1.1.16.2.tar.bz2 7407399 RMD160 80da6bf2127bc349dbbc9da0f5529869110678b4 SHA1 faa3d9207d911a535161a3cd5660aa9e6b904c28 SHA256 67f2469faee964b75f43459547b5e2f9a407b8dc30cbeffa989cce312e16b2c1
 DIST xine-lib-1.1.16.tar.bz2 7383219 RMD160 2fc35e0c5f6dc3f00be0396fecd40e5a2fb388f5 SHA1 b7a8d159ac81befe2a2cc0df20a4c0a00cef4ad7 SHA256 27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be
 EBUILD xine-lib-1.1.15-r1.ebuild 5744 RMD160 ab22cf093acea91869dc04659af362a2ca967c91 SHA1 af8903fedde98afe26bf12dbfe312a2163d5f69f SHA256 3c41ba2b91f53333f099008bfddedcb2fa9667a7975587daf81ec4cc1dc72b18
 EBUILD xine-lib-1.1.16.1.ebuild 5536 RMD160 4c59c273a2377723aa801e788eed85d2e64ac1ce SHA1 672bb0b9b11403299f37abe279a098426741e1f3 SHA256 dea8e66e517052101e3c6f668d148a86fd15a1910c67a72b1952b48e737e6d95
-EBUILD xine-lib-1.1.16.2.ebuild 5474 RMD160 23d70a28572e686c9861274cf7189acb93eabb85 SHA1 a3d3f8275d00e09e99dcc88cd359f35e93ad1638 SHA256 c712676c56c99ab4f677b18da4356406484636182634693cdeebf765179e7243
+EBUILD xine-lib-1.1.16.2.ebuild 5557 RMD160 263d5bc8d77c1e19d147c17f342756bcc2643aa2 SHA1 d067768fba3671daa7c2db40b0ec888019fa3550 SHA256 e5bc7a30b0509461d8348717a8b0d2e6dd58494696d0c11cb3b7cf58e61fd64a
 EBUILD xine-lib-1.1.16.ebuild 5628 RMD160 d7cab73ebfa4f1f3ea68eebf9904290e5c96d8d6 SHA1 80d21efc7a1b854f4a72b538f58ca3905ebde665 SHA256 802d73a87019b2b42eda2dba68dd75322cdabadf5967c2c3dae2a1840a0145d6
-MISC ChangeLog 66915 RMD160 bc8f63ab992d9c12447f26324b7d0616f06dbb78 SHA1 04a3dc8bbc021f91270ad37480eb208404d87cba SHA256 64fa0e167b03b188140192f46a09624e3171bb84a76a828fc0a9ff9b9076d6a5
+MISC ChangeLog 67099 RMD160 c6bfdf3bce319eefb7613bb687287d22c385a6a8 SHA1 2b3ec965c868cdab7245e1220c713fc21c93de12 SHA256 ec6d9fca63a499f5989396244b14f8806d6bf6dc79bc8d7701184a6597c70f3a
 MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm0OJMACgkQvFcC4BYPU0qo1gCgjUPFb6rTJATOO3KGUu9kDeqg
+oYEAniSBX+EVZww7X49Dp/WC4jGl/xyc
+=n08S
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch b/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch
new file mode 100644
index 000000000000..3e92db9136b8
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Alexis Ballier <aballier@gentoo.org>
+# Date 1236540650 -3600
+# Node ID 044a503f894304328c991f6495f9e14c4c4e5ecb
+# Parent  ba642133c0c8b4ece4cb4d2a98355afde7264900
+Fix build with libavutil >= 50.0.0
+
+PIX_FMT_RGBA32 was #defined to PIX_FMT_RGB32 since 2006.
+
+diff -r ba642133c0c8 -r 044a503f8943 src/combined/ffmpeg/ff_video_decoder.c
+--- a/src/combined/ffmpeg/ff_video_decoder.c	Sun Mar 08 16:33:02 2009 +0000
++++ b/src/combined/ffmpeg/ff_video_decoder.c	Sun Mar 08 20:30:50 2009 +0100
+@@ -588,7 +588,7 @@
+       img->width,
+       this->bih.biHeight);
+ 
+-  } else if (this->context->pix_fmt == PIX_FMT_RGBA32) {
++  } else if (this->context->pix_fmt == PIX_FMT_RGB32) {
+           
+     int x, plane_ptr = 0;
+     uint32_t *argb_pixels;
+@@ -1304,7 +1304,7 @@
+ 
+ 	  /* initialize the colorspace converter */
+ 	  if (!this->cs_convert_init) {
+-	    if ((this->context->pix_fmt == PIX_FMT_RGBA32) ||
++	    if ((this->context->pix_fmt == PIX_FMT_RGB32) ||
+ 	        (this->context->pix_fmt == PIX_FMT_RGB565) ||
+ 	        (this->context->pix_fmt == PIX_FMT_RGB555) ||
+ 	        (this->context->pix_fmt == PIX_FMT_BGR24) ||
diff --git a/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild b/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild
index ad37301aff47..150d1736d2f5 100644
--- a/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild,v 1.5 2009/02/28 10:56:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild,v 1.6 2009/03/08 21:28:41 aballier Exp $
 
 EAPI=1
 
@@ -85,6 +85,12 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-avutil.patch"
+}
+
 src_compile() {
 	#prevent quicktime crashing
 	append-flags -frename-registers -ffunction-sections