diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2012-11-25 21:12:32 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-11-25 21:12:32 +0000 |
| commit | 6c7e48395df03af38ed80bc29a95acb2f7dc5b8f (patch) | |
| tree | a749c48f45765b4caa697d9a94a5eb1eceaf5a7e /media-sound | |
| parent | Remove DB and OracleDB, unused duplicates of Sleepycat, bug 300426. (diff) | |
| download | gentoo-2-6c7e48395df03af38ed80bc29a95acb2f7dc5b8f.tar.gz gentoo-2-6c7e48395df03af38ed80bc29a95acb2f7dc5b8f.tar.bz2 gentoo-2-6c7e48395df03af38ed80bc29a95acb2f7dc5b8f.zip | |
Support libav-9
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/sox/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/sox/files/sox-14.4.0-libav-9.patch | 39 | ||||
| -rw-r--r-- | media-sound/sox/sox-14.4.0.ebuild | 5 |
3 files changed, 47 insertions, 3 deletions
diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog index 7ed224e6ce73..6caa88e57d6b 100644 --- a/media-sound/sox/ChangeLog +++ b/media-sound/sox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/sox # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.142 2012/07/13 10:58:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.143 2012/11/25 21:12:32 lu_zero Exp $ + + 25 Nov 2012; Luca Barbato <lu_zero@gentoo.org> sox-14.4.0.ebuild, + +files/sox-14.4.0-libav-9.patch: + Support libav-9 13 Jul 2012; Alexis Ballier <aballier@gentoo.org> sox-14.4.0.ebuild, +files/sox-14.4.0-avcodec54.patch: diff --git a/media-sound/sox/files/sox-14.4.0-libav-9.patch b/media-sound/sox/files/sox-14.4.0-libav-9.patch new file mode 100644 index 000000000000..d969cbc1b32c --- /dev/null +++ b/media-sound/sox/files/sox-14.4.0-libav-9.patch @@ -0,0 +1,39 @@ +diff -burN sox-14.4.0.old//src/ffmpeg.c sox-14.4.0/src/ffmpeg.c +--- sox-14.4.0.old//src/ffmpeg.c 2012-11-25 21:59:45.990825656 +0100 ++++ sox-14.4.0/src/ffmpeg.c 2012-11-25 22:07:06.436809624 +0100 +@@ -98,7 +98,7 @@ + ic->error_recognition = 1; + #endif + +- if (!codec || avcodec_open(enc, codec) < 0) ++ if (!codec || avcodec_open2(enc, codec, NULL) < 0) + return -1; + if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { + lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); +@@ -180,7 +180,7 @@ + } + + /* Get CODEC parameters */ +- if ((ret = av_find_stream_info(ffmpeg->ctxt)) < 0) { ++ if ((ret = avformat_find_stream_info(ffmpeg->ctxt, NULL)) < 0) { + lsx_fail("ffmpeg could not find CODEC parameters for %s", ft->filename); + return SOX_EOF; + } +@@ -274,7 +274,7 @@ + AVCodecContext *c; + AVStream *st; + +- st = av_new_stream(oc, 1); ++ st = avformat_new_stream(oc, NULL); + if (!st) { + lsx_fail("ffmpeg could not alloc stream"); + return NULL; +@@ -308,7 +308,7 @@ + } + + /* open it */ +- if (avcodec_open(c, codec) < 0) { ++ if (avcodec_open2(c, codec, NULL) < 0) { + lsx_fail("ffmpeg could not open CODEC"); + return SOX_EOF; + } diff --git a/media-sound/sox/sox-14.4.0.ebuild b/media-sound/sox/sox-14.4.0.ebuild index 8ed64b30b203..514a92b54db1 100644 --- a/media-sound/sox/sox-14.4.0.ebuild +++ b/media-sound/sox/sox-14.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.0.ebuild,v 1.3 2012/07/13 10:58:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.0.ebuild,v 1.4 2012/11/25 21:12:32 lu_zero Exp $ EAPI=4 inherit eutils flag-o-matic autotools @@ -43,7 +43,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-14.3.2-uclibc.patch \ "${FILESDIR}"/${P}-ffmpeg.patch \ - "${FILESDIR}"/${P}-avcodec54.patch + "${FILESDIR}"/${P}-avcodec54.patch \ + "${FILESDIR}"/${P}-libav-9.patch eautoreconf } |