diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2013-02-17 11:42:03 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-02-17 11:42:03 +0000 |
| commit | b15512714ae214a7fa25426c7dd9924c154fae46 (patch) | |
| tree | 04b95789c54aa797a75581664fda2877c72e62bb /media-video/libav | |
| parent | sci-biology/phylip: Respect LDFLAGS, #337921 (diff) | |
| download | gentoo-2-b15512714ae214a7fa25426c7dd9924c154fae46.tar.gz gentoo-2-b15512714ae214a7fa25426c7dd9924c154fae46.tar.bz2 gentoo-2-b15512714ae214a7fa25426c7dd9924c154fae46.zip | |
Import upstream fix for bug #457938
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
Diffstat (limited to 'media-video/libav')
| -rw-r--r-- | media-video/libav/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/libav/files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch | 29 | ||||
| -rw-r--r-- | media-video/libav/libav-9.1.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog index 147037f5a6de..0f21ba647d09 100644 --- a/media-video/libav/ChangeLog +++ b/media-video/libav/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/libav # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.140 2013/02/09 18:03:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.141 2013/02/17 11:42:02 lu_zero Exp $ + + 17 Feb 2013; Luca Barbato <lu_zero@gentoo.org> + +files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch, + libav-9.1.ebuild: + Import upstream fix for bug #457938 09 Feb 2013; Agostino Sarubbo <ago@gentoo.org> libav-0.8.5.ebuild: Stable for ia64, wrt bug #452202 diff --git a/media-video/libav/files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch b/media-video/libav/files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch new file mode 100644 index 000000000000..de2369f46656 --- /dev/null +++ b/media-video/libav/files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch @@ -0,0 +1,29 @@ +From 6c62098827d3020c852a975f88084945867bf029 Mon Sep 17 00:00:00 2001 +From: Diego Biurrun <diego@biurrun.de> +Date: Sat, 16 Feb 2013 23:05:05 +0100 +Subject: [PATCH] build: The libopencore-amrnb encoder depends on + audio_frame_queue + +CC: libav-stable@libav.org +Signed-off-by: Luca Barbato <lu_zero@gentoo.org> +(cherry picked from commit d0fd1dd559b8362bdbca3405f739e0cc202d62e7) +--- + libavcodec/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/Makefile b/libavcodec/Makefile +index 1ae17cd..0f55b80 100644 +--- a/libavcodec/Makefile ++++ b/libavcodec/Makefile +@@ -574,7 +574,7 @@ OBJS-$(CONFIG_LIBILBC_ENCODER) += libilbc.o + OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodecheader.o \ + audio_frame_queue.o + OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o +-OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o ++OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o audio_frame_queue.o + OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o + OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o + OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o +-- +1.8.1.2 + diff --git a/media-video/libav/libav-9.1.ebuild b/media-video/libav/libav-9.1.ebuild index 36ad02358cb7..710909b535ae 100644 --- a/media-video/libav/libav-9.1.ebuild +++ b/media-video/libav/libav-9.1.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-video/libav/libav-9.1.ebuild,v 1.3 2013/01/17 10:38:24 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.1.ebuild,v 1.4 2013/02/17 11:42:03 lu_zero Exp $ EAPI=5 @@ -126,6 +126,7 @@ src_prepare() { sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die fi epatch "${FILESDIR}"/0001-libcdio-support-recent-cdio-paranoia.patch + epatch "${FILESDIR}"/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch } src_configure() { |