add patch merged upstream fo fix build with latest ffmpeg

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26.5 x86_64

4 files changed, 41 insertions, 4 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 6b5b68a38b5a..cb3eacf79105 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.89 2008/08/05 11:14:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.90 2008/10/01 08:05:33 aballier Exp $
+
+  01 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/sox-14.1.0-lavc.patch, sox-14.1.0.ebuild:
+  add patch merged upstream fo fix build with latest ffmpeg
 
 *sox-14.1.0 (05 Aug 2008)
 
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index ebf44be1d8d7..a340b57ea19e 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sox-13.0.0-flac113.patch 19319 RMD160 952b00a3f12c01b9f36f703eeebad3852bc7f34e SHA1 e25b6e87131e21d4e75ac54154ceb7037a320010 SHA256 71898675ddf57d04638cf28336b929636f09eef019d3e57593934efc5a942053
 AUX sox-13.0.0-oggautomagic.patch 820 RMD160 b4cc247ad85c6c46378fdc44dc22de1f18cb8907 SHA1 1edb55e8b8163435bdcec0a699c09c3d608aba56 SHA256 fd65d7d75ec4b0418451486b02bef5fea90da087f4f11285d6f533da1c91951b
 AUX sox-14.0.1-cross.patch 427 RMD160 a4597f73560b4013e7ea26b58d6e79a41d3e5b40 SHA1 85618d48fc98236079939ef930cabc63d8b3a416 SHA256 16c3effde09823c8550594b545e635b3db5d39af6fe8e6841b062ddd5fe2a14b
 AUX sox-14.0.1-ffmpegheaders.patch 1655 RMD160 8ed54b523e16f6a0b1b978f2b584c43ff469b16b SHA1 db09ff70d6503dcc8055ee6cfcf2268347f3ac9a SHA256 3a0286f3c752e1d414517f7f422f187edae9de8ce18564e64021d1670bbec9f8
+AUX sox-14.1.0-lavc.patch 534 RMD160 9088ed507a43c3e0edc97f502a76099e2c425b1f SHA1 d635b8c413c969056c78cf05ba768c8e247bcfe7 SHA256 5713fcbb50c681d7026387d92bfb1a1940e515518b4f57d00b1225addc63ab16
 DIST sox-13.0.0.tar.gz 725259 RMD160 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2 SHA1 db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4 SHA256 c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e
 DIST sox-14.0.1.tar.gz 859538 RMD160 b614c3006e9490876c299d768009656704ecfbc8 SHA1 b4b07e9905728209d3c97b9fb0fc65e75b4c45a1 SHA256 52398a49bef64aa6e06b158cb59b3e1790fa1bf94262b896688bcfdcf539ca73
 DIST sox-14.1.0.tar.gz 912057 RMD160 df4067b874b0ff1df594f1986aa350cf40fe5a3f SHA1 897cb68b2b4159f979e6ba33fabaa31b967a1c7e SHA256 319cf07ee06fcbfbcaced7307e23ca567739c278f76bc143a9258a9a23e42101
 EBUILD sox-13.0.0.ebuild 1634 RMD160 557c72a16eadc4b9f14139ccd51821cbce3ed2f8 SHA1 3085199ef73f69e603f9d9802d3561ba530d23b9 SHA256 4e1584cdb9b9051b0424e5708030ad505c323fc6b3edc50396bf75ee408e8c0e
 EBUILD sox-14.0.1.ebuild 1999 RMD160 246a5a7a5c5a958726e3c626a52f6bdd79a5ddea SHA1 36135d2360eac323be162bd33abf988db9e3c091 SHA256 84bd0c2dae1b70c82f1887e5362eaf0aa8b9f566dfc694c30e27629138b51644
-EBUILD sox-14.1.0.ebuild 1875 RMD160 7b2425d99488f8c9e2761e2b20c58105a5757d15 SHA1 95e663d944bf247ff2c00f98f5cfef36088d12a2 SHA256 9286adf1cbb242cf7559f88215f2fdf84ae1a72ecefaef761cee3b097513a035
-MISC ChangeLog 12047 RMD160 bfca4d3682d7d37f906d9e6a17a9f59578812c21 SHA1 db71ef3a6d2f02ec630637c08bd4a75c9c6fbebf SHA256 60b01f46161ec1e34f1b4393b8fdd9560c564171be4156969f49bef962ad3d3a
+EBUILD sox-14.1.0.ebuild 1955 RMD160 b272809f6b0089ae82616d74e45daf9c2bb2a46c SHA1 17cec9ce12e007ad94be41b64e4cecb80bcc2162 SHA256 0f9cbbe3984c49baa804631115039d82e961b223f89bd809e8faac86fc684a30
+MISC ChangeLog 12211 RMD160 159f9d71279dbc2a2fcd8731a80e4b75b782cd15 SHA1 a82cca4b1d86743746d3449beee4f522413d4770 SHA256 069fb9981688be62562dfef6070280b905a6f543452b790486f66b0f7c4c7160
 MISC metadata.xml 418 RMD160 1f3867aa79178df758b99750e4a3b7e59f4be0ed SHA1 86e119a86fdcbee68766895c75337677d1e5dc40 SHA256 0548fffd025ccc348006d12685ff30dc59ba6b8f1a2a3e39baf9a2bd8dacf530
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjjL1MACgkQvFcC4BYPU0oXXACglZXUCNIRts6c++ZYQu2oloKi
+FMcAoJBf8FpOLQqoB38uoTiruAqdniEo
+=ZdAe
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sox/files/sox-14.1.0-lavc.patch b/media-sound/sox/files/sox-14.1.0-lavc.patch
new file mode 100644
index 000000000000..e9359fc11860
--- /dev/null
+++ b/media-sound/sox/files/sox-14.1.0-lavc.patch
@@ -0,0 +1,16 @@
+Index: sox-14.1.0/src/ffmpeg.c
+===================================================================
+--- sox-14.1.0.orig/src/ffmpeg.c
++++ sox-14.1.0/src/ffmpeg.c
+@@ -86,7 +86,11 @@ static int stream_component_open(priv_t 
+ 
+   codec = avcodec_find_decoder(enc->codec_id);
+   enc->workaround_bugs = 1;
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   enc->error_resilience = 1;
++#else
++  enc->error_recognition = 1;
++#endif
+   if (!codec || avcodec_open(enc, codec) < 0)
+     return -1;
+   if (enc->codec_type != CODEC_TYPE_AUDIO) {
diff --git a/media-sound/sox/sox-14.1.0.ebuild b/media-sound/sox/sox-14.1.0.ebuild
index 94e5112297ce..2a4e8eb75304 100644
--- a/media-sound/sox/sox-14.1.0.ebuild
+++ b/media-sound/sox/sox-14.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.1.0.ebuild,v 1.1 2008/08/05 11:14:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.1.0.ebuild,v 1.2 2008/10/01 08:05:33 aballier Exp $
 
 inherit flag-o-matic eutils
 
@@ -30,6 +30,12 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 	png? ( media-libs/libpng )
 	wavpack? ( media-sound/wavpack )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-lavc.patch"
+}
+
 src_compile () {
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char