diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-07 02:15:24 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-07 02:15:24 +0000 |
| commit | 7473ce74c03c2680fcdfdfaba630275200b3edd8 (patch) | |
| tree | 0116283e50ec26e9987b22245a9843d167111900 /media-plugins | |
| parent | fix build with ffmpeg2 (diff) | |
| download | gentoo-2-7473ce74c03c2680fcdfdfaba630275200b3edd8.tar.gz gentoo-2-7473ce74c03c2680fcdfdfaba630275200b3edd8.tar.bz2 gentoo-2-7473ce74c03c2680fcdfdfaba630275200b3edd8.zip | |
Fix build with ffmpeg 2.0 due to wrong version check. Bug #478084.
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-plugins')
3 files changed, 21 insertions, 3 deletions
diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog index 430dfd25488b..1cbe50ea81b2 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.174 2013/08/02 11:35:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.175 2013/08/07 02:15:23 aballier Exp $ + + 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> alsa-plugins-1.0.27.ebuild, + +files/alsa-plugins-1.0.27-ffmpeg-version-check.patch: + Fix build with ffmpeg 2.0 due to wrong version check. Bug #478084. 02 Aug 2013; Markus Meier <maekke@gentoo.org> alsa-plugins-1.0.27.ebuild: arm stable, bug #473404 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild index b0258bf11219..56c036799ab2 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.ebuild,v 1.4 2013/08/02 11:35:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild,v 1.5 2013/08/07 02:15:23 aballier Exp $ EAPI=5 inherit autotools eutils flag-o-matic multilib @@ -26,7 +26,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \ - "${FILESDIR}"/${PN}-1.0.23-automagic.patch + "${FILESDIR}"/${PN}-1.0.23-automagic.patch \ + "${FILESDIR}"/${PN}-1.0.27-ffmpeg-version-check.patch epatch_user diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch new file mode 100644 index 000000000000..6b9b698471d2 --- /dev/null +++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch @@ -0,0 +1,13 @@ +Index: alsa-plugins-1.0.27/a52/pcm_a52.c +=================================================================== +--- alsa-plugins-1.0.27.orig/a52/pcm_a52.c ++++ alsa-plugins-1.0.27/a52/pcm_a52.c +@@ -27,7 +27,7 @@ + #include <alsa/pcm_plugin.h> + #include AVCODEC_HEADER + +-#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 34 ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,34,0) + #include <libavutil/audioconvert.h> + #include <libavutil/mem.h> + #define USE_AVCODEC_FRAME |