[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/

[Alexis Ballier]

commit:     936820fcba0b87dde366a7f4f6580100f54591d1
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 16:43:29 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 16:45:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936820fc

media-sound/aqualung: fix build with ffmpeg git master.

Package-Manager: portage-2.2.20.1

 media-sound/aqualung/aqualung-1.0.ebuild  |  4 ++++
 media-sound/aqualung/files/ffmpeg29.patch | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.0.ebuild 
b/media-sound/aqualung/aqualung-1.0.ebuild
index b39de6c..c6954be 100644
--- a/media-sound/aqualung/aqualung-1.0.ebuild
+++ b/media-sound/aqualung/aqualung-1.0.ebuild
@@ -50,6 +50,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+src_prepare() {
+       epatch "${FILESDIR}/ffmpeg29.patch"
+}
+
 src_configure() {
        econf \
                --enable-nls \

diff --git a/media-sound/aqualung/files/ffmpeg29.patch 
b/media-sound/aqualung/files/ffmpeg29.patch
new file mode 100644
index 0000000..3cd0a01
--- /dev/null
+++ b/media-sound/aqualung/files/ffmpeg29.patch
@@ -0,0 +1,13 @@
+Index: aqualung-1.0/src/decoder/dec_lavc.c
+===================================================================
+--- aqualung-1.0.orig/src/decoder/dec_lavc.c
++++ aqualung-1.0/src/decoder/dec_lavc.c
+@@ -280,7 +280,7 @@ lavc_decoder_open(decoder_t * dec, char
+               return DECODER_OPEN_BADLIB;
+ 
+       pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
+-#if LIBAVCODEC_VERSION_MAJOR >= 53
++#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR < 57
+       pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
+       pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
+ #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */