fix building against latest sox

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 80 insertions, 4 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index abb2046c72dc..435639cc20b3 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.25 2008/07/27 20:57:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.26 2008/08/06 21:09:55 aballier Exp $
+
+  06 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/mlt-0.2.4-sox1410.patch, mlt-0.2.4-r2.ebuild:
+  fix building against latest sox
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> mlt-0.2.4-r2.ebuild:
   QA: Get rid of deprecated qt_min_version().
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 268986e26600..56d93489dd3b 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mlt-0.2.2-motion-est-amd64.patch 6161 RMD160 3302e660ba2f9723d1881e49ca9f783d5cc31b08 SHA1 43ac8ffe2af0fcfc10b0430fd287a73ebcdaf716 SHA256 0387e9cbc5de63758852d3182af79020cf500338370672359110b6b6154f4dba
 AUX mlt-0.2.2-motion-est-nonx86.patch 954 RMD160 d769358a03155c4a16db47b5a31fe42aa5aa9d72 SHA1 1307542624b007dba19c13264fc04d1563ed8332 SHA256 28ae719bb0721d1250e14f143c823966e7be362ab1f20d4571d241cc86dfdd68
 AUX mlt-0.2.3-nostrip.patch 1763 RMD160 958ea322e598e286dc9adcc6ba509c7b2eeae5b2 SHA1 8a24c74980b8cdefb19164a4c6a36217b23244dd SHA256 1e0945b45245c297464e845bf6409a91582d288047b2b511357ead52be70fceb
@@ -8,7 +11,15 @@ AUX mlt-0.2.4-double-fps.patch 636 RMD160 5d18ce31181b18e2273a4ed909aad91836cd01
 AUX mlt-0.2.4-ffmpegheaders.patch 1102 RMD160 df512477d9d2476fa0b5b36f4369c4b57ba93198 SHA1 3b63cdebbd26ba2e0da07813258e55b3b10f3033 SHA256 545e96b5005911b1b5451844c8ba309d27c45ab9403f55eb6c7d49ea98f87336
 AUX mlt-0.2.4-gcc-4.3.patch 609 RMD160 db2c9d43ee984d9c9ec2b309b53da24a9b58c862 SHA1 51291b48dea4d7f2078cfa3669afac120e024d72 SHA256 1d193e6623d166ec46cd7b8b041d02a227b7ffc9c0cd766f75defaeaa4ba5c39
 AUX mlt-0.2.4-sox1400.patch 5887 RMD160 e67a5e7c354116d88c9799d4c4f9a17e14e0feba SHA1 f8afa9a8cf5aeb52b91135c89e028c0a9fcc8ef3 SHA256 f6bef87691feee43de2db0ffa1801445da50342bc27295f99b08bdb634fd7c7d
+AUX mlt-0.2.4-sox1410.patch 2163 RMD160 fcc7e01f96606f80ebb271915bad348736f7beec SHA1 26b9df720005b836afc0926f63032e787f39a105 SHA256 dfec4d2336cee044f0b80af74b0928f5d7378ec7a5e435066e27a30e4abb5f79
 DIST mlt-0.2.4.tar.gz 644406 RMD160 2822c775b397eb426d9f1aabfa515f76eb98aab2 SHA1 4074dab510037ad9f49401bad75c8b78c1ee06b8 SHA256 9d85c1d8d9f4ef7b40ebff8a4301bf3ef34aec6014e22310cb1e408cb4ec2a45
-EBUILD mlt-0.2.4-r2.ebuild 2969 RMD160 1e0a6217205b6fc77ed8d21034996738017d2598 SHA1 495a27eed4cf372ba24ce6282d465c0aeda3ea5f SHA256 a52862b6e25c5267d72e50a229e711a94617982cdfa5937dda9e9c9be1be1a90
-MISC ChangeLog 4273 RMD160 7f1f7c570915d34c83df3709acbd2e502e029770 SHA1 bc90faee2c4333f311179d15ec1fd0208f0b617e SHA256 b7c3df73a450cbe6e2af86952f12dc5871ec43b439ae057eb55dea2afc1f8da3
+EBUILD mlt-0.2.4-r2.ebuild 3013 RMD160 cd5d70106621e5d9e3db56a09404cecafa6771e5 SHA1 2d1d6eee9ac956be1c4bcaa6d69c943e37732e4c SHA256 13b91156215b5ad91b578e8a3a59a2ed8363abd7d250923151fb4bfd56c50b6f
+MISC ChangeLog 4418 RMD160 eab5607b6a61d1173cb0c49712676eddbf85cd20 SHA1 0a653d3d9e44328856b6a7e46ce2aab9c83da6f3 SHA256 b726936cc4bad332515d4b0ddb4cfd60575258bc24dd4b3852691dceaae7fd3f
 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiaEykACgkQvFcC4BYPU0o8agCeO5oa/70F2JufBKf2xQDvMbE3
+158AoMbpYmglqmteWM9pTDL+AEFuPtok
+=+6LP
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.2.4-sox1410.patch b/media-libs/mlt/files/mlt-0.2.4-sox1410.patch
new file mode 100644
index 000000000000..04de618ec935
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.2.4-sox1410.patch
@@ -0,0 +1,60 @@
+Index: mlt-0.2.4/src/modules/sox/filter_sox.c
+===================================================================
+--- mlt-0.2.4.orig/src/modules/sox/filter_sox.c
++++ mlt-0.2.4/src/modules/sox/filter_sox.c
+@@ -38,7 +38,11 @@
+ #	define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
+ #	define ST_LIB_VERSION SOX_LIB_VERSION
+ #	define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
++#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0)
+ #	define ST_SSIZE_MIN SOX_SSIZE_MIN
++#else
++#	define ST_SSIZE_MIN (SOX_SIZE_MAX/2)
++#endif
+ #	define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
+ #else
+ #	include <st.h>
+@@ -91,7 +95,11 @@ static int create_effect( mlt_filter thi
+ 	// Locate the effect
+ #ifdef SOX14
+ 	//fprintf(stderr, "%s: effect %s count %d\n", __FUNCTION__, tokeniser->tokens[0], tokeniser->count );
++#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0)
+ 	sox_create_effect( eff, sox_find_effect( tokeniser->tokens[0] ) );
++#else
++	eff = sox_create_effect( sox_find_effect( tokeniser->tokens[0] ) );
++#endif
+ 	int opt_count = tokeniser->count - 1;
+ #else
+ 	int opt_count = st_geteffect_opt( eff, tokeniser->count, tokeniser->tokens );
+@@ -108,10 +116,17 @@ static int create_effect( mlt_filter thi
+ #endif
+ 		{
+ 			// Set the sox signal parameters
++#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0)
+ 			eff->ininfo.rate = frequency;
+ 			eff->outinfo.rate = frequency;
+ 			eff->ininfo.channels = 1;
+ 			eff->outinfo.channels = 1;
++#else
++			eff->in_signal.rate = frequency;
++			eff->out_signal.rate = frequency;
++			eff->in_signal.channels = 1;
++			eff->out_signal.channels = 1;
++#endif
+ 			
+ 			// Start the effect
+ #ifdef SOX14
+@@ -214,8 +229,13 @@ static int filter_get_audio( mlt_frame f
+ 		eff_t e = mlt_properties_get_data( filter_properties, id, NULL );
+ 		
+ 		// Validate the existing effect state
++#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0)
+ 		if ( e != NULL && ( e->ininfo.rate != *frequency || 
+ 							e->outinfo.rate != *frequency ) )
++#else
++		if ( e != NULL && ( e->in_signal.rate != *frequency || 
++							e->out_signal.rate != *frequency ) )
++#endif
+ 			e = NULL;
+ 		
+ 		// (Re)Create the effect state
diff --git a/media-libs/mlt/mlt-0.2.4-r2.ebuild b/media-libs/mlt/mlt-0.2.4-r2.ebuild
index ed51f1c657ba..e9d46fc30da6 100644
--- a/media-libs/mlt/mlt-0.2.4-r2.ebuild
+++ b/media-libs/mlt/mlt-0.2.4-r2.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-libs/mlt/mlt-0.2.4-r2.ebuild,v 1.6 2008/07/27 20:57:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.2.4-r2.ebuild,v 1.7 2008/08/06 21:09:55 aballier Exp $
 
 EAPI=1
 
@@ -59,6 +59,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-double-fps.patch
 	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
 	epatch "${FILESDIR}"/${P}-avfreestatic.patch
+	epatch "${FILESDIR}"/${P}-sox1410.patch
 }
 
 src_compile() {