add upstream patch to fix build against ffmpeg trunk

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

4 files changed, 53 insertions, 4 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 758b107b80fd..b54fcc86cf6c 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.573 2008/09/28 15:12:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.574 2008/10/06 22:03:02 aballier Exp $
+
+  06 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/xine-lib-1.1.15-ffmpeg.patch, xine-lib-1.1.15-r1.ebuild:
+  add upstream patch to fix build against ffmpeg trunk
 
   28 Sep 2008; Raúl Porcel <armin76@gentoo.org> xine-lib-1.1.15-r1.ebuild:
   arm stable wrt #211464
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index b3a7b0b2ff00..d8dd83a9d353 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.8-dxr3.patch 543 RMD160 4fc1c9ae238c416f097e85b47a8ba4e04fb1c14f SHA1 d5d1ad4ad4a88dda30207d67f3e5e2b6b174fabd SHA256 d6cd3a848de564ccaa82f92e32983ce3a444db357c56b9312be226eac7a81aff
 DIST xine-lib-1.1.15.tar.bz2 7478750 RMD160 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f SHA1 bcb567ea2a11c5f26b2384d5400b8466ea9048c6 SHA256 07ddf2a9f521417dd2f097534a52ddd9d2883679932f965ae7e7b0125d3c9dcc
 DIST xine-lib-1.1.8.tar.bz2 7284933 RMD160 b926caa13d5b3f3c74eee681aa6c47c6083c1349 SHA1 48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf SHA256 6c9f11bdec714f8df36b5140a7c8cc6ec81dd8a7673f4756e940cee4f4833c0e
-EBUILD xine-lib-1.1.15-r1.ebuild 5658 RMD160 cbebe6af734150db8056e77904b1cf7808d7c7be SHA1 091abd1b7dfb42ac54347efbed80f0d8e36ca2e2 SHA256 6378475260d2d0a4a7c131edcea24d184909364de3767f9e1f455437275cb515
+EBUILD xine-lib-1.1.15-r1.ebuild 5698 RMD160 1bb9cb8f121751304fffe644b766d4921b587462 SHA1 cf3133b20769e670b6dae4d4b8b98d7fe999ee3f SHA256 94a8cc0d0359667cccfd2cd5e233bcd8d6cdbe12886c52447a75dc2f15def4e3
 EBUILD xine-lib-1.1.8.ebuild 5632 RMD160 81524b906917dda749ffdfdf9c0247169671a4d0 SHA1 7887cca7aaca9bb011a218e824082c26f00e9c0e SHA256 383ddc76254be422550559fe8b5495ba9768e188e1bddcba55806edf0756989e
-MISC ChangeLog 65078 RMD160 d3748b652b0cecf53612bc2bc775cf6aa6190ba3 SHA1 4fb336c10ed19206dc599c1d650a6ae66afab61c SHA256 44f85e59618b4f60e85ca8259ea293e24be28c01a8e4444dfc7dae1ab4621bd2
+MISC ChangeLog 65253 RMD160 a0c5fa87c0d81be9d36bb3f8080b3567c9ab0d73 SHA1 917eccb47e64ee3e139948c5b764e6e482d1989b SHA256 419424ec4068afa2172a097fd5642a96b17f3a02d18f8939358e74ff521e6444
 MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjqixwACgkQvFcC4BYPU0psUQCeMn1DANZAz3KzHn6OYeXbL6WW
+SQQAn1tzPaEnKrPC7pBSZ6pTQn3fpoiS
+=miKi
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch
new file mode 100644
index 000000000000..27279be377d6
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Darren Salt <linux@youmustbejoking.demon.co.uk>
+# Date 1221306490 -3600
+# Node ID f5ff69fc65d3229ac9908b13c5bb0b9317adf80c
+# Parent  89c3e23896babb1fc6fe0f4299fa645a47297d4c
+Compilation fixes for ffmpeg API & ABI changes.
+
+diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ff_audio_decoder.c
+--- a/src/combined/ffmpeg/ff_audio_decoder.c	Fri Sep 05 21:26:59 2008 +0200
++++ b/src/combined/ffmpeg/ff_audio_decoder.c	Sat Sep 13 12:48:10 2008 +0100
+@@ -322,7 +322,7 @@
+ 
+     if (!this->output_open) {
+       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
+-        avcodec_decode_audio (this->context,
++        avcodec_decode_audio2 (this->context,
+                               (int16_t *)this->decode_buffer,
+                               &decode_buffer_size,
+                               &this->buf[0],
+diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ffmpeg_decoder.h
+--- a/src/combined/ffmpeg/ffmpeg_decoder.h	Fri Sep 05 21:26:59 2008 +0200
++++ b/src/combined/ffmpeg/ffmpeg_decoder.h	Sat Sep 13 12:48:10 2008 +0100
+@@ -33,6 +33,10 @@
+ #  include "../../libffmpeg/libavcodec/avcodec.h"
+ #endif
+ 
++#if LIBAVCODEC_VERSION_MAJOR > 51
++#define bits_per_sample bits_per_coded_sample
++#endif
++
+ typedef struct ff_codec_s {
+   uint32_t          type;
+   enum CodecID      id;
diff --git a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
index d8c6420810b8..cce3619c3ce6 100644
--- a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.15-r1.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-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.9 2008/09/28 15:12:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $
 
 EAPI=1
 
@@ -90,6 +90,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "$FILESDIR"/${P}-libmpeg2-vis.patch
 	epatch "$FILESDIR"/${P}-buffer_h_ansi.patch
+	epatch "$FILESDIR"/${P}-ffmpeg.patch
 }
 
 src_compile() {