fix build with ffmpeg git

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

4 files changed, 43 insertions, 10 deletions

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index 6935d281ad7a..9bfc981030a5 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2011/11/10 12:18:56 aballier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.24 2012/02/26 13:49:46 aballier Exp $
+
+  26 Feb 2012; Alexis Ballier <aballier@gentoo.org>
+  aqualung-0.9_beta11-r1.ebuild,
+  +files/aqualung-0.9_beta11-libavformat54.patch:
+  fix build with ffmpeg git
 
   10 Nov 2011; Alexis Ballier <aballier@gentoo.org>
   aqualung-0.9_beta11-r1.ebuild, +files/aqualung-0.9_beta11-ffmpeg.patch:
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index fba63ad9bf74..e85cd7ff27be 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA1
 
 AUX aqualung-0.9_beta11-ffmpeg.patch 880 RMD160 5e6fcc8cd1a73962cc60cc63551f9b607a7eddd7 SHA1 37d277aa05eb125a874d3e00823d58087d0d61fd SHA256 8f4083e2b2b6a54bb7c0da4eb91e3a1ca96fb17a30907b26f6d2384878fe4377
+AUX aqualung-0.9_beta11-libavformat54.patch 1170 RMD160 8bd810105b4b9f3b78c86d3d9f85a05543d1dd72 SHA1 4dae076200fb641a8ad711477044fb7b1b232b8f SHA256 1e0d189c36e70ba8e9d49afa4051f8417560c1e016fefcf6027a5622d4931d09
 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 2654 RMD160 3c0084d4bf01daed04a32109504d1a418190bd22 SHA1 f07a642b45bbe59187130a547c0710d0cebf08de SHA256 1240d85f1b4dbb1e08f7bcb59ee59ed3ea3fb2693f67fd9dd315dbd011b1bf34
-MISC ChangeLog 4434 RMD160 913bc9a08e761f2a33a2a0e1d62dcd8cc7684bf8 SHA1 c0826ca4c21f6469af811dc777ea47acfd538f14 SHA256 bb24864c5ffc4af15c15866df367e73e2934404418f4bc70d2743b5347cf70fb
+EBUILD aqualung-0.9_beta11-r1.ebuild 2698 RMD160 2da7acf6a4780ab8fe1321ad63e9289b1838beed SHA1 589d80cfce42218a26a624bf872623a001809338 SHA256 98ceb70588da79c9f6d24ba0a18e47c8ae2581e6fe8e4fe82436f1724cce80b6
+MISC ChangeLog 4598 RMD160 d9be73b0f0b5759a97f8920212b8c268fea800e0 SHA1 2e5601cbdaa4d1ea4748c912a3ba03d618520632 SHA256 5d448f6dae8d44e31f0c8c56e50c02ba3098deca5874c5cb8a862d3aab9ba00e
 MISC metadata.xml 663 RMD160 f62e66e7b9c130ea967c3f82bc59c24b43194cf9 SHA1 1841f9a0738b59214aa523f8240af8ed98737f34 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk67wTUACgkQvFcC4BYPU0r/awCeKlU5OFM6nefi0SySFBD9bXui
-os4AoLJamERb4Ml2vcZZQy/+PbqWhGS7
-=x1vF
+iEYEARECAAYFAk9KOIAACgkQvFcC4BYPU0oi8wCdHWAx46ieskZP1i+gFmQ0pPar
+I6AAoM4Ybm5e08DAk1v2c7d0aYEAf5x/
+=FbIc
 -----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 d46acb7509b8..7f13bcf57d52 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
+# Copyright 1999-2012 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.9 2011/11/10 12:18:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.10 2012/02/26 13:49:46 aballier Exp $
 
 EAPI=4
 
@@ -48,7 +48,8 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-libavformat54.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-libavformat54.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-libavformat54.patch
new file mode 100644
index 000000000000..103f3f28c5b1
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-libavformat54.patch
@@ -0,0 +1,26 @@
+Index: aqualung-0.9beta11/configure.ac
+===================================================================
+--- aqualung-0.9beta11.orig/configure.ac
++++ aqualung-0.9beta11/configure.ac
+@@ -660,7 +660,7 @@ else
+ 		fi
+ 	fi
+ 
+-	AC_CHECK_LIB(avformat, av_open_input_file, [avf_lib=yes], [avf_lib=no], [-lavcodec -lavutil -lz])
++	AC_CHECK_LIB(avformat, avformat_open_input, [avf_lib=yes], [avf_lib=no], [-lavcodec -lavutil -lz])
+ 	AC_CHECK_LIB(avcodec, avcodec_open, [avc_lib=yes], [avc_lib=no], [-lavformat -lavutil -lz])
+ 
+ 	if test "$avc_hdr" = "yes" -a "$avf_hdr" = "yes" -a "$avc_lib" = "yes" -a "$avf_lib" = "yes" ; then
+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
+@@ -111,7 +111,7 @@ lavc_decoder_open(decoder_t * dec, char
+ 	file_decoder_t * fdec = dec->fdec;
+ 	int i;
+ 
+-	if (av_open_input_file(&pd->avFormatCtx, filename, NULL, 0, NULL) != 0)
++	if (avformat_open_input(&pd->avFormatCtx, filename, NULL, NULL) != 0)
+ 		return DECODER_OPEN_BADLIB;
+ 
+ 	if (av_find_stream_info(pd->avFormatCtx) < 0)