Support libav-9

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

4 files changed, 54 insertions, 9 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/Manifest b/media-sound/sox/Manifest
index 71a2072e5588..bedefaf21963 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -5,16 +5,17 @@ AUX sox-14.3.2-ffmpeg.patch 1679 SHA256 91ad4e2ef5c308cd08f336123f636d4aabfba5cd
 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
+AUX sox-14.4.0-libav-9.patch 1185 SHA256 a43522567725542140f08f156d85fc9034f16de1e9142cb5797d177d342e7432 SHA512 1aac0a538bedfdd9723f12a1f2b7c055904aa44204519e703f30b5fb3c03537393a49a722c729bf7f8c0e0344383ae33a24814b4f94f241b74a2e50501658fa4 WHIRLPOOL 56dd190ba89d1234199cbe8cdcc47ce85ef18402b306832511c754d507804e924daa6e02ba3509eeba8729f86b957c5106f61f85c6f8ccd421e898a2df89bc72
 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
+EBUILD sox-14.4.0.ebuild 2547 SHA256 8fdb8c0380adb93138ce4ec848c708a69cc82e1e8beb82404427919b6e0d4e05 SHA512 85cb5e4f9ec0f9ef9c298e7c413164a546b96628bf332d8145ffb82f1db7444efaf1fccf935a45adaf52baaa10b27394f3c37d80ecf92d2f6084a215cb3521fb WHIRLPOOL 80e04bddfc65f698a6d1c458dcfa387d78d53f8de7149413705f179ebf95d3987f622100052ac8af42989fc5e3f1bb259718c017e847b9ea1702adbaa44f2334
+MISC ChangeLog 18926 SHA256 fc716230ea37c9cc82efd060fe7c1ff4cd5f0680a356187062c33c0b1879c2b4 SHA512 00bb356fc29d9aab5f4f827625683fe5de6f427cd6702fefa4597aa8e089d4df32b0bb56b580f723a99b6225701fc0a4aeb043c76f91897cecc48496cb6c1eaf WHIRLPOOL 0166b248907e0e1a54dbeb85d111de1da1df281e88143390c54f760e303ecbd2dbbd5a689108e52f8b3ac0dc4a56bdddbe063a9d4232f63f87e552e1ef5ac582
 MISC metadata.xml 403 SHA256 b8616ecbe870e639f77d5c8d81010143f26bef678d8a5f3823bfa5bffc3874e3 SHA512 490c0914fed4e7985018e1e29476737194fadeec6b5c8893c9ff775481308cb5847635be65301cf1bdcd8af178a8a6dfbf5f489ce746e47be29caf3e018b3ce2 WHIRLPOOL 21da28c6dafe3384b9a2f7f6b5be8782f1547201db136d06d81732173580a5e0cac33e901d4b6e27ff371af67df6656b4f6a17ccfac964f36d37c5c6bb06fc37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREIAAYFAk///0gACgkQvFcC4BYPU0rTIwCePX6j23MTyfk3DvDTaD4pghkR
-WFYAn0J5yGfD9Oct2pJlhfkSIdhwgS9X
-=GwN/
+iF4EAREIAAYFAlCyiigACgkQcXOrnRGRc45pUwEArbIWVAU6R7BIilPkq1z7Ee3q
+mp8VqLoGwILP2Qtx9iABAIy5cpGIgof7WKVB/JRbFx1FUrSrRPNOD4l3pmyuBB39
+=WWUR
 -----END PGP SIGNATURE-----
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
 }