Fix build with ffmpeg-0.11 / git master, bug #407621

Package-Manager: portage-2.2.0_alpha117/cvs/Linux x86_64

4 files changed, 127 insertions, 19 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 2865f63dcd09..7ed224e6ce73 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.141 2012/05/05 08:54:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.142 2012/07/13 10:58:10 aballier Exp $
+
+  13 Jul 2012; Alexis Ballier <aballier@gentoo.org> sox-14.4.0.ebuild,
+  +files/sox-14.4.0-avcodec54.patch:
+  Fix build with ffmpeg-0.11 / git master, bug #407621
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> sox-14.3.2-r1.ebuild,
   sox-14.4.0.ebuild:
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 5a8332ad1de8..71a2072e5588 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX sox-14.3.2-ffmpeg.patch 1679 RMD160 d0fc2740cf24a18b5ee5aa1d73d8dab4344b85fe SHA1 86caa6aa86a0bf7a048522114d4efd11acbbda70 SHA256 91ad4e2ef5c308cd08f336123f636d4aabfba5cdd519ee82ee53866af75a9330
-AUX sox-14.3.2-uclibc.patch 762 RMD160 995c96325306fcc3f10e7c401d3a4fad59bdf20d SHA1 3a2a5798dc054d5b25bd3dd3bbfbb3bfdfd43607 SHA256 2f76765afd5eede020be9ddd539b4cd3dcce68dd73096bf07b30c4f613cc4d21
-AUX sox-14.4.0-ffmpeg.patch 223 RMD160 eb7ce75a639bb1619a0613042bb7d6d4eb765b5a SHA1 398b3ace4c47359f967affa8b06161b154fecd31 SHA256 105b18a061e741acf2fcd5ae176d60c07cfffdeb9e45ac36a2f8975098e19506
-DIST sox-14.3.2.tar.gz 1110175 RMD160 5b8e86bd64ade2d9534993317474c33b41090183 SHA1 ad462114ff47b094078f18148bc9e29e31b42b92 SHA256 0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f
-DIST sox-14.4.0.tar.gz 1105756 RMD160 af1b6c02d29c988f9b0dfec9ca9ebb30949b0663 SHA1 d809cab382c7a9d015491c69051a9d1c1a1a44f1 SHA256 3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3
-EBUILD sox-14.3.2-r1.ebuild 2363 RMD160 65ac5d1ed7f942ff2ba5b8dda3d50496c703ac66 SHA1 c56138c19778c15409af90113e278e2808aa545a SHA256 724deab4677e60b91f91f846641546b88c99eccb36c8407b15dfcb841f4ba61b
-EBUILD sox-14.4.0.ebuild 2441 RMD160 50651e8d5bdc47ca675493f3dbef2946662ed3e9 SHA1 34816cc7ec2a4aaf74eed65b68a9125bd0214f1d SHA256 99f0e5fd20985a52e47c67d25fa8ef478011dd71816c21b218f6705aac782f66
-MISC ChangeLog 18639 RMD160 be0ab3cce9c19765c272ab3ebea5a88636ef676b SHA1 4e0988a3f84996f9f3f54f4446094e3b51b3bb7a SHA256 2de858957ab28eaa4d4982bcbdbf3419ca7ef64beb80db57bac1413f7da89255
-MISC metadata.xml 403 RMD160 0c8b8ff5e0500a83ed44dc2d5ad23593a7f8e395 SHA1 7be57fe2797e32261cc69cbb75baaa3315ead06a SHA256 b8616ecbe870e639f77d5c8d81010143f26bef678d8a5f3823bfa5bffc3874e3
+AUX sox-14.3.2-ffmpeg.patch 1679 SHA256 91ad4e2ef5c308cd08f336123f636d4aabfba5cdd519ee82ee53866af75a9330 SHA512 74c63e12c8a0d970528538908862e98df72d413f1f973acdd5c1917a0a0c1ab1bc8ddb65586bc11b6860e17efe2977be919263ae1494468b5fab61f330cdeb06 WHIRLPOOL 7d204145127599982ecc3e09d8ff213488e13f73fa33342a677b57768f81636c6e697c53b60805b089ea751a795f44b6e7c906242816a9995d11d55a81434e5b
+AUX sox-14.3.2-uclibc.patch 762 SHA256 2f76765afd5eede020be9ddd539b4cd3dcce68dd73096bf07b30c4f613cc4d21 SHA512 bdf925841516550a465a34fc42eb4444f706ecc4c987e544f1812a161edd245cbfe704fa1610f880d13e3a6171bdf1d8cc3f620e601a2ac29ab3ad7cc391a711 WHIRLPOOL fbe4a97d33def95c5fbf56151df14bdcf7f43050d1f95e6fa54484666c5371e5715a67f5ff77f0e9232b122d5560b599d56fcf9a44e5bcc031cea8d9c1f7914a
+AUX sox-14.4.0-avcodec54.patch 3608 SHA256 dc6cca09785d4783621b31f338a3280233f1842cc299501711140daecb7ac044 SHA512 35a41f808f0d80fd8c7957f4b47494afa9bd29a7039fa7639c2504b1b17170fd23f00434c33e5a8c3a8b46fde7513f9f6a4afa4091bf2eeccd3e6536d49f0166 WHIRLPOOL 61da76d00ed8b58dc088af0aa97ac0bfacbc96d9138e44b1ff09e83ca880c3e8f2887e4ef22e4748879c11ec834656bc6ce09358cb82228fafcdc54bde183a68
+AUX sox-14.4.0-ffmpeg.patch 223 SHA256 105b18a061e741acf2fcd5ae176d60c07cfffdeb9e45ac36a2f8975098e19506 SHA512 7ca313da3e40850c412b765f040a1931d7657d8c038e0c31da8bcf09e06ff7745ac002def7be9f424d85ba90329308f86d3fc14d47ca749e18fb995056b3ec46 WHIRLPOOL d07a64e6a330194de66c13e9a4cfcb3b113664012ee8dfc3513fe032a011dda0aa524608815a6e3d89d79f2e2e71bdc115b0db466a4fc32a0395814a4ac1fc07
+DIST sox-14.3.2.tar.gz 1110175 SHA256 0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f
+DIST sox-14.4.0.tar.gz 1105756 SHA256 3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3 SHA512 cecd24fb2c8cfd3d4046d4a83ef42ae86e4c063fa94803f09f9eb07eb273234f47eed60b16c4341eca19476e3f4c2b88f6c23cdceda5d647d5a0db058877d9c5 WHIRLPOOL e6df8dc5b2421c53c3f602a949d35313f37edb870176b756d9fcc15e8d6f739021a411b777a10db8282d972b3a47c452568d289ea23a0991f095ac3d166ee2f7
+EBUILD sox-14.3.2-r1.ebuild 2363 SHA256 724deab4677e60b91f91f846641546b88c99eccb36c8407b15dfcb841f4ba61b SHA512 bcdc4202ed493da1548693cbe317c8d692a806e0f2938cadb79a65a2fddd69fc1ab0cb0f06f29ff1f54712f2c59261496cbaa9945954a4112778a065b58448db WHIRLPOOL 7f9856c397b184d9f5ef001a7fe1a273627c4660f0deb52f0ee7ae4cd8ea2a678472db71345e43ada8e8f800d854ad2b0be2f8f61e882cfddaac08f99bcb2914
+EBUILD sox-14.4.0.ebuild 2511 SHA256 52dc8bb4c3bd04cd3deb966fa0a2a5c9626670dd328eb3b9c30993f36187ce92 SHA512 b179739dd27a1b43ee88f4f80d3eea707d1ae418ec9cfba6140e81da54060ef1e6fc18507fcf335b38ea1bdf10a2161991876ec4871fab2b24e9b765eeeef57f WHIRLPOOL 5653d9c0091985a0435bcc9fd3fbfb85268606d0728f3d563cf82cea4ff8a25949b50d04f7c7cf6ab9b5fd3fa355142a4912671c573815e053e68a4dde9bb6e1
+MISC ChangeLog 18805 SHA256 295e58a70f3619e790dc842aede7a67b48e638dab80ea572289d912783642290 SHA512 737df1991e24d7ffc14c32e726829e248f1a137636b7b44d4912d159da0cb1ed3961df9b108e9d3d1f1687cefe06c7eca0d936eac080e20bb2fe25f0a9f0e124 WHIRLPOOL 18afc7836fc60bf720a8c914cfa6b276285dfaabbf3bb5a10cd935d45cde4a96e207e706804cdcd13241c9cfe8ed8d62f785139e1369df33f4ddb25b6f3ed5ff
+MISC metadata.xml 403 SHA256 b8616ecbe870e639f77d5c8d81010143f26bef678d8a5f3823bfa5bffc3874e3 SHA512 490c0914fed4e7985018e1e29476737194fadeec6b5c8893c9ff775481308cb5847635be65301cf1bdcd8af178a8a6dfbf5f489ce746e47be29caf3e018b3ce2 WHIRLPOOL 21da28c6dafe3384b9a2f7f6b5be8782f1547201db136d06d81732173580a5e0cac33e901d4b6e27ff371af67df6656b4f6a17ccfac964f36d37c5c6bb06fc37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k6t4ACgkQfXuS5UK5QB3/FwP+KIJyzyP2vybcTuAOzvE4vq9R
-U4j5uUqdaN5tJro9O6fD9Y/OjGBiwJE1WvsKzyN9m5SBb1jivlSAl0NAi5RkpkZS
-kiAIqLp1wh5nqYi5tIiYkXv0KDZgShXMnBq4bEva/EFZx+RotEyMZLnf6oaSRiWG
-w93qXlciGMf4WEAXxL8=
-=+56/
+iEYEAREIAAYFAk///0gACgkQvFcC4BYPU0rTIwCePX6j23MTyfk3DvDTaD4pghkR
+WFYAn0J5yGfD9Oct2pJlhfkSIdhwgS9X
+=GwN/
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sox/files/sox-14.4.0-avcodec54.patch b/media-sound/sox/files/sox-14.4.0-avcodec54.patch
new file mode 100644
index 000000000000..a9551f8e945d
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.0-avcodec54.patch
@@ -0,0 +1,103 @@
+Fix build with ffmpeg 0.11.
+https://bugs.gentoo.org/show_bug.cgi?id=407621
+
+Index: sox-14.4.0/m4/ffmpeg.m4
+===================================================================
+--- sox-14.4.0.orig/m4/ffmpeg.m4
++++ sox-14.4.0/m4/ffmpeg.m4
+@@ -49,7 +49,7 @@ then
+   LIBS="$LIBS $FFMPEG_LIBS"
+   have_ffmpeg="no"
+   AC_CHECK_HEADERS([libavformat/avformat.h ffmpeg/avformat.h],
+-    [AC_CHECK_LIB(avformat, av_open_input_file,
++    [AC_CHECK_LIB(avformat, avformat_open_input,
+       [AC_CHECK_HEADERS([libavcodec/avcodec.h ffmpeg/avcodec.h],
+         [AC_CHECK_LIB(avcodec, avcodec_decode_audio3, have_ffmpeg=yes)])])
+     break])
+Index: sox-14.4.0/src/ffmpeg.c
+===================================================================
+--- sox-14.4.0.orig/src/ffmpeg.c
++++ sox-14.4.0/src/ffmpeg.c
+@@ -92,8 +92,10 @@ static int stream_component_open(priv_t
+   enc->workaround_bugs = 1;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   enc->error_resilience = 1;
+-#else
++#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
+   enc->error_recognition = 1;
++#else
++  ic->error_recognition = 1;
+ #endif
+ 
+   if (!codec || avcodec_open(enc, codec) < 0)
+@@ -157,7 +159,7 @@ static int audio_decode_frame(priv_t * f
+ static int startread(sox_format_t * ft)
+ {
+   priv_t * ffmpeg = (priv_t *)ft->priv;
+-  AVFormatParameters params;
++  AVDictionary *params;
+   int ret;
+   int i;
+ 
+@@ -172,7 +174,7 @@ static int startread(sox_format_t * ft)
+ 
+   /* Open file and get format */
+   memset(&params, 0, sizeof(params));
+-  if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, &params)) < 0) {
++  if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, &params)) < 0) {
+     lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);
+     return SOX_EOF;
+   }
+@@ -231,7 +233,7 @@ static size_t read_samples(sox_format_t
+     /* If input buffer empty, read more data */
+     if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
+       if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
+-	  (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
++	  (ret == AVERROR_EOF || ( ffmpeg->ctxt->pb && ffmpeg->ctxt->pb->error)))
+ 	break;
+       ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+       ffmpeg->audio_buf_index = 0;
+@@ -373,13 +375,6 @@ static int startwrite(sox_format_t * ft)
+       return SOX_EOF;
+   }
+ 
+-  /* set the output parameters (must be done even if no
+-     parameters). */
+-  if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
+-    lsx_fail("ffmpeg invalid output format parameters");
+-    return SOX_EOF;
+-  }
+-
+   /* Next line for debugging */
+   /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
+ 
+@@ -391,14 +386,14 @@ static int startwrite(sox_format_t * ft)
+ 
+   /* open the output file, if needed */
+   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
+-    if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
++    if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
+       lsx_fail("ffmpeg could not open `%s'", ft->filename);
+       return SOX_EOF;
+     }
+   }
+ 
+   /* write the stream header, if any */
+-  av_write_header(ffmpeg->ctxt);
++  avformat_write_header(ffmpeg->ctxt, NULL);
+ 
+   return SOX_SUCCESS;
+ }
+@@ -475,11 +470,7 @@ static int stopwrite(sox_format_t * ft)
+ 
+   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
+     /* close the output file */
+-#if (LIBAVFORMAT_VERSION_INT < 0x340000)
+-    url_fclose(&ffmpeg->ctxt->pb);
+-#else
+-    url_fclose(ffmpeg->ctxt->pb);
+-#endif
++    avio_close(ffmpeg->ctxt->pb);
+   }
+ 
+   /* Free the output context */
diff --git a/media-sound/sox/sox-14.4.0.ebuild b/media-sound/sox/sox-14.4.0.ebuild
index 13c1372e2a04..8ed64b30b203 100644
--- a/media-sound/sox/sox-14.4.0.ebuild
+++ b/media-sound/sox/sox-14.4.0.ebuild
@@ -1,9 +1,9 @@
 # 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.2 2012/05/05 08:54:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.0.ebuild,v 1.3 2012/07/13 10:58:10 aballier Exp $
 
 EAPI=4
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
@@ -21,7 +21,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	amr? ( media-libs/opencore-amr )
 	ao? ( media-libs/libao )
 	encode? ( >=media-sound/lame-3.98.4 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( >=virtual/ffmpeg-0.9 )
 	flac? ( media-libs/flac )
 	id3tag? ( media-libs/libid3tag )
 	ladspa? ( media-libs/ladspa-sdk )
@@ -42,7 +42,9 @@ src_prepare() {
 
 	epatch \
 		"${FILESDIR}"/${PN}-14.3.2-uclibc.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-avcodec54.patch
+	eautoreconf
 }
 
 src_configure() {