Include upstream patch for newer libav support wrt #501524 by Renato Gallo

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 49 insertions, 7 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 498619ae4f11..1d73c15363de 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.181 2014/02/15 10:22:50 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.182 2014/02/17 19:31:12 ssuominen Exp $
+
+  17 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/alsa-plugins-1.0.27-ffmpeg.patch, alsa-plugins-1.0.27-r1.ebuild:
+  Include upstream patch for newer libav support wrt #501524 by Renato Gallo
 
   15 Feb 2014; Akinori Hattori <hattya@gentoo.org> alsa-plugins-1.0.27.ebuild:
   ia64 stable wrt bug #473404
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
index 5cd9952cab33..3067e1b70920 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild,v 1.1 2013/11/30 22:02:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild,v 1.2 2014/02/17 19:31:12 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib
@@ -14,12 +14,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
 
-RDEPEND=">=media-libs/alsa-lib-${PV}
+RDEPEND=">=media-libs/alsa-lib-${PV}:=
 	ffmpeg? ( virtual/ffmpeg )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	libsamplerate? ( media-libs/libsamplerate )
+	libsamplerate? ( media-libs/libsamplerate:= )
 	pulseaudio? ( media-sound/pulseaudio )
-	speex? ( media-libs/speex )"
+	speex? ( media-libs/speex:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -27,7 +27,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \
 		"${FILESDIR}"/${PN}-1.0.23-automagic.patch \
-		"${FILESDIR}"/${PN}-1.0.27-ffmpeg-version-check.patch
+		"${FILESDIR}"/${P}-{ffmpeg,ffmpeg-version-check}.patch
 
 	epatch_user
 
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch
new file mode 100644
index 000000000000..56f51e35a9c9
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch
@@ -0,0 +1,38 @@
+From 367e208954711fabe159070d242927246ed821cd Mon Sep 17 00:00:00 2001
+From: Anton Khirnov <anton@khirnov.net>
+Date: Thu, 9 Jan 2014 21:14:17 +0100
+Subject: [PATCH] a52: switch to AV_CODEC_ID identifiers
+
+Fixes build with latest libavcodec versions.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ a52/pcm_a52.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
+index 359608f..b467ec8 100644
+--- a/a52/pcm_a52.c
++++ b/a52/pcm_a52.c
+@@ -58,6 +58,9 @@
+ #endif
+ #endif
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
++#define AV_CODEC_ID_AC3 CODEC_ID_AC3
++#endif
+ 
+ struct a52_ctx {
+ 	snd_pcm_ioplug_t io;
+@@ -916,7 +919,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52)
+ 	if (rec->codec == NULL)
+ 		rec->codec = avcodec_find_encoder_by_name("ac3");
+ 	if (rec->codec == NULL) 
+-		rec->codec = avcodec_find_encoder(CODEC_ID_AC3);
++		rec->codec = avcodec_find_encoder(AV_CODEC_ID_AC3);
+ 	if (rec->codec == NULL) {
+ 		SNDERR("Cannot find codec engine");
+ 		err = -EINVAL;
+-- 
+1.7.11.7
+