fix build with ffmpeg/libav trunk, bug #379075

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 38 insertions, 10 deletions

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index ccb7466893d7..6935d281ad7a 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/aqualung
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.22 2011/09/11 19:34:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.23 2011/11/10 12:18:56 aballier Exp $
+
+  10 Nov 2011; Alexis Ballier <aballier@gentoo.org>
+  aqualung-0.9_beta11-r1.ebuild, +files/aqualung-0.9_beta11-ffmpeg.patch:
+  fix build with ffmpeg/libav trunk, bug #379075
 
   11 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
   -aqualung-0.9_beta11.ebuild:
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index aadc2a632b2b..fba63ad9bf74 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX aqualung-0.9_beta11-ffmpeg.patch 880 RMD160 5e6fcc8cd1a73962cc60cc63551f9b607a7eddd7 SHA1 37d277aa05eb125a874d3e00823d58087d0d61fd SHA256 8f4083e2b2b6a54bb7c0da4eb91e3a1ca96fb17a30907b26f6d2384878fe4377
 AUX aqualung-0.9_beta11-use_lrdf_cflags.patch 1190 RMD160 d98a06cabaf6db7ed9a8450a0bde59e8117bd4bc SHA1 f2ed98c644fbe89d033d99c989cb48faaf1473c9 SHA256 1bd61fae33bbd2bc36e551dac73757258765de28b17cefa33f70474947197e66
 DIST aqualung-0.9beta11.tar.gz 1584700 RMD160 3ff28f7611db89290baa1b0b8528c0ba5e79a762 SHA1 7a52a82ced0554acad56bd18f5ec707bf9fa85a0 SHA256 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd
-EBUILD aqualung-0.9_beta11-r1.ebuild 2607 RMD160 3ae7b3ce25836557923bcf63fec038db1a1d02d3 SHA1 3eb9fc5a9aeb950a6fea50b1eda26712c634b300 SHA256 f146c3e8c775055cfd95becb9ac193b47e4b1b291b34eadb5771defac0a62f9f
-MISC ChangeLog 4259 RMD160 af6a5864b800303caa871151743918398dcf8764 SHA1 0bff2039085bd93461c540abff6d2014082853d5 SHA256 2f6b92656fcee10606b8b49d63f96495ecb16c3b4dda4c0af51fe270cff62397
+EBUILD aqualung-0.9_beta11-r1.ebuild 2654 RMD160 3c0084d4bf01daed04a32109504d1a418190bd22 SHA1 f07a642b45bbe59187130a547c0710d0cebf08de SHA256 1240d85f1b4dbb1e08f7bcb59ee59ed3ea3fb2693f67fd9dd315dbd011b1bf34
+MISC ChangeLog 4434 RMD160 913bc9a08e761f2a33a2a0e1d62dcd8cc7684bf8 SHA1 c0826ca4c21f6469af811dc777ea47acfd538f14 SHA256 bb24864c5ffc4af15c15866df367e73e2934404418f4bc70d2743b5347cf70fb
 MISC metadata.xml 663 RMD160 f62e66e7b9c130ea967c3f82bc59c24b43194cf9 SHA1 1841f9a0738b59214aa523f8240af8ed98737f34 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5tDV4ACgkQXkR9YqOcLPEQuwD+PDzy36pbSfvKK3za6ox9LOEv
-yavq1ooqeGotLFJ62vIA/0Rb1uYi2h7x9oh3oFYVGwEI7M1WBbuJS6qookF+AexQ
-=K12W
+iEYEARECAAYFAk67wTUACgkQvFcC4BYPU0r/awCeKlU5OFM6nefi0SySFBD9bXui
+os4AoLJamERb4Ml2vcZZQy/+PbqWhGS7
+=x1vF
 -----END PGP SIGNATURE-----
diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
index 4636eb80efe8..d46acb7509b8 100644
--- a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.8 2011/08/07 15:26:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.9 2011/11/10 12:18:56 aballier Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	cdda? ( dev-libs/libcdio[-minimal] )
 	cddb? ( media-libs/libcddb )
 	flac? ( media-libs/flac )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( >=virtual/ffmpeg-0.6.90 )
 	ifp? ( media-libs/libifp )
 	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( media-libs/liblrdf )
@@ -47,7 +47,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch
+	epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch
 	sed -i \
 		-e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \
 		doc/Makefile.am || die
diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch
new file mode 100644
index 000000000000..c8c3ad003be9
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch
@@ -0,0 +1,22 @@
+Index: aqualung-0.9beta11/src/decoder/dec_lavc.c
+===================================================================
+--- aqualung-0.9beta11.orig/src/decoder/dec_lavc.c
++++ aqualung-0.9beta11/src/decoder/dec_lavc.c
+@@ -53,7 +53,7 @@ decode_lavc(decoder_t * dec) {
+ 
+ 	if (packet.stream_index == pd->audioStream) {
+ 
+-		avcodec_decode_audio2(pd->avCodecCtx, samples, &n_bytes, packet.data, packet.size);
++		avcodec_decode_audio3(pd->avCodecCtx, samples, &n_bytes, &packet);
+ 		if (n_bytes > 0) {
+ 			int i;
+ 			for (i = 0; i < n_bytes/2; i++) {
+@@ -124,7 +124,7 @@ lavc_decoder_open(decoder_t * dec, char
+ 
+ 	pd->audioStream = -1;
+ 	for (i = 0; i < pd->avFormatCtx->nb_streams; i++) {
+-		if (pd->avFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) {
++		if (pd->avFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ 			pd->audioStream = i;
+ 			break;
+ 		}