fix build with sox 14.2.0

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27.5 x86_64

4 files changed, 32 insertions, 7 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 9cefcecf8563..f1ac55490c06 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.29 2008/11/04 19:07:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.30 2008/11/10 12:09:10 aballier Exp $
+
+  10 Nov 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/mlt-0.3.0-sox1420.patch, mlt-0.3.0.ebuild:
+  fix build with sox 14.2.0
 
   04 Nov 2008; Alexis Ballier <aballier@gentoo.org> mlt-0.2.4-r2.ebuild:
   fix ffmpeg deps for bug #245467
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 733ecdd8bef4..4309535d9cc0 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -14,16 +14,17 @@ AUX mlt-0.2.4-sox1400.patch 5887 RMD160 e67a5e7c354116d88c9799d4c4f9a17e14e0feba
 AUX mlt-0.2.4-sox1410.patch 2163 RMD160 fcc7e01f96606f80ebb271915bad348736f7beec SHA1 26b9df720005b836afc0926f63032e787f39a105 SHA256 dfec4d2336cee044f0b80af74b0928f5d7378ec7a5e435066e27a30e4abb5f79
 AUX mlt-0.3.0-avcodec.patch 956 RMD160 9ee52011c904f9891746ca8af2ce1a6c6805d497 SHA1 f8221ff84445f87b5f4b94a72f5b3000fccbb16f SHA256 c965a3e7e667b5a1a910d57256ec4e7eedf6bcc9db9fd378571026c7ca00c548
 AUX mlt-0.3.0-sox1410.patch 2777 RMD160 28c148451d825a198d21c18007f21b98a2c217a0 SHA1 17bb8b879159b63e4111fdc5de11f27f9b2771df SHA256 abfe873c806b59baf4253fd770d03b76fb809673837e4752bd0a3e2c09c3ff6d
+AUX mlt-0.3.0-sox1420.patch 742 RMD160 79f12acdf2feb230d39c3624ee68a6126d8781a2 SHA1 63f9455b2b2300d7146ad6e33cfe7aae0882c5c2 SHA256 7774fd36f17cec9cf2544f3692454f589bce6c4b5bae62f74254e6f29517f30a
 DIST mlt-0.2.4.tar.gz 644406 RMD160 2822c775b397eb426d9f1aabfa515f76eb98aab2 SHA1 4074dab510037ad9f49401bad75c8b78c1ee06b8 SHA256 9d85c1d8d9f4ef7b40ebff8a4301bf3ef34aec6014e22310cb1e408cb4ec2a45
 DIST mlt-0.3.0.tar.gz 699304 RMD160 a5b114b2b28180486f38658d315bf6d52321bd11 SHA1 c54886e4618df68dc8f6a50f90086aae1b92c4fd SHA256 889a2c7cec26f97b4d507c91709f4de0fc7de42d278ae393da74d6892ea3d267
 EBUILD mlt-0.2.4-r2.ebuild 3051 RMD160 9206221fa4b689fc743f34e696e5601e28ff795b SHA1 8eb529622fe7e1d9b0e0003610e108a2da43e9f8 SHA256 ae869d360898e8456cce248968e72b9ab377cadedbbf2ac4c70c4d004b5fe026
-EBUILD mlt-0.3.0.ebuild 2746 RMD160 d70f34b17e034be4d60021e7dd1e5a76f4ba0575 SHA1 05c0f657bb87c189b05f49b660ae99a68466f30e SHA256 a5df3fc750cf0c354f05856335dfc73df2d51c47f8c698094a331b62860eba4d
-MISC ChangeLog 4887 RMD160 5b2db3626580ed3d7fc86fc1842ded1716945d17 SHA1 2c1f88d5830c6168fef8909ab63e531daeeda353 SHA256 0b8b8b7e9c3f99e8299af3dd74b02f5017be5b8097638bb22218fc106ac246fa
+EBUILD mlt-0.3.0.ebuild 2787 RMD160 33607743e1be54a7f3018f222f605777b7b110f6 SHA1 011109642b5b6549646721443eefccc3b983ea92 SHA256 d97f52d95042030cdb5c8a0c89ab1a3d3498487c3a6929300167c66ae62dc14b
+MISC ChangeLog 5020 RMD160 6372ac7ac5948d786bbc68b0688aea80ce320ba7 SHA1 e8bc33daefbaa922f0312ae32f8db93cb2da1628 SHA256 90f8b14a4fd9abee2e250509b0ec8c679bc38c51bf0eb8c8830a36ce3b3a4341
 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkQnX4ACgkQvFcC4BYPU0q60ACeJYEw6i8nIzeFTCQ6j4E7/uIZ
-OK8Anjk+DQXauQZULsp8IMVC2AcY8ywo
-=vVxq
+iEYEARECAAYFAkkYJGsACgkQvFcC4BYPU0p+QgCfXnSkmFeUS42tj2xEtxHYkvG+
+lvAAn3dUuypnZltEVqSjfg9qdlXlOm4V
+=RSHW
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch
new file mode 100644
index 000000000000..3421ab2b82ef
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch
@@ -0,0 +1,19 @@
+Index: mlt-0.3.0/src/modules/sox/filter_sox.c
+===================================================================
+--- mlt-0.3.0.orig/src/modules/sox/filter_sox.c
++++ mlt-0.3.0/src/modules/sox/filter_sox.c
+@@ -33,9 +33,13 @@
+ #	define ST_SUCCESS SOX_SUCCESS
+ #	define st_sample_t sox_sample_t
+ #	define eff_t sox_effect_t*
+-#	define st_size_t sox_size_t
+ #	define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
+ #	define ST_LIB_VERSION SOX_LIB_VERSION
++#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
++#	define st_size_t size_t
++#else
++#	define st_size_t sox_size_t
++#endif
+ #	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_SAMPLE_MIN
diff --git a/media-libs/mlt/mlt-0.3.0.ebuild b/media-libs/mlt/mlt-0.3.0.ebuild
index 038fe44b8a38..0725ab2d346a 100644
--- a/media-libs/mlt/mlt-0.3.0.ebuild
+++ b/media-libs/mlt/mlt-0.3.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-libs/mlt/mlt-0.3.0.ebuild,v 1.2 2008/10/18 08:37:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.3.0.ebuild,v 1.3 2008/11/10 12:09:10 aballier Exp $
 
 EAPI=1
 
@@ -54,6 +54,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/mlt-0.2.3-nostrip.patch
 	epatch "${FILESDIR}"/${P}-sox1410.patch
 	epatch "${FILESDIR}"/${P}-avcodec.patch
+	epatch "${FILESDIR}"/${P}-sox1420.patch
 }
 
 src_compile() {