Revision bump for SOX 14.0.0 compability and pkg setup check for USE libsamplerate if USE sox is defined.

Package-Manager: portage-2.1.4_rc1

5 files changed, 312 insertions, 15 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 74e7562265e0..d29ec5b660f2 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.16 2007/08/21 08:59:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.17 2007/11/23 10:36:17 drac Exp $
+
+*mlt-0.2.4-r1 (23 Nov 2007)
+
+  23 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/mlt-0.2.4-sox1400.patch, +mlt-0.2.4-r1.ebuild:
+  Revision bump for SOX 14.0.0 compability and pkg setup check for USE
+  libsamplerate if USE sox is defined.
 
 *mlt-0.2.4 (21 Aug 2007)
 
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 976ce162c866..57634656b035 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mlt-0.2.2-motion-est-amd64.patch 6161 RMD160 3302e660ba2f9723d1881e49ca9f783d5cc31b08 SHA1 43ac8ffe2af0fcfc10b0430fd287a73ebcdaf716 SHA256 0387e9cbc5de63758852d3182af79020cf500338370672359110b6b6154f4dba
 MD5 9235136e496887e8803a68655f9b8664 files/mlt-0.2.2-motion-est-amd64.patch 6161
 RMD160 3302e660ba2f9723d1881e49ca9f783d5cc31b08 files/mlt-0.2.2-motion-est-amd64.patch 6161
@@ -13,6 +10,10 @@ AUX mlt-0.2.3-nostrip.patch 1763 RMD160 958ea322e598e286dc9adcc6ba509c7b2eeae5b2
 MD5 742133fa08f505156a328a6b7ac1d757 files/mlt-0.2.3-nostrip.patch 1763
 RMD160 958ea322e598e286dc9adcc6ba509c7b2eeae5b2 files/mlt-0.2.3-nostrip.patch 1763
 SHA256 1e0945b45245c297464e845bf6409a91582d288047b2b511357ead52be70fceb files/mlt-0.2.3-nostrip.patch 1763
+AUX mlt-0.2.4-sox1400.patch 5887 RMD160 e67a5e7c354116d88c9799d4c4f9a17e14e0feba SHA1 f8afa9a8cf5aeb52b91135c89e028c0a9fcc8ef3 SHA256 f6bef87691feee43de2db0ffa1801445da50342bc27295f99b08bdb634fd7c7d
+MD5 a5726b1edd8ad9ee8b6ff32c3f4640e9 files/mlt-0.2.4-sox1400.patch 5887
+RMD160 e67a5e7c354116d88c9799d4c4f9a17e14e0feba files/mlt-0.2.4-sox1400.patch 5887
+SHA256 f6bef87691feee43de2db0ffa1801445da50342bc27295f99b08bdb634fd7c7d files/mlt-0.2.4-sox1400.patch 5887
 DIST mlt-0.2.2.tar.gz 581746 RMD160 29ae2f0800f31fd82c6809efbfe5c85b1a72a0c9 SHA1 9d4db5162e810f118dd69544a4e475c59bcceff1 SHA256 9be0ed8756825b83f0747d6d926172db08fd4406a869ccd4995ed56bf1fe6a22
 DIST mlt-0.2.3.tar.gz 595256 RMD160 fa8ad6603ecbf0aae96d7b8ecc1cdb81323e03f4 SHA1 ba4685600d8bf2df3ed5058c4dea1aaed5493941 SHA256 c7b3201d661bfd44c8e3962afb7f3145675b3efa7dfdededdadd266d4d838f03
 DIST mlt-0.2.4.tar.gz 644406 RMD160 2822c775b397eb426d9f1aabfa515f76eb98aab2 SHA1 4074dab510037ad9f49401bad75c8b78c1ee06b8 SHA256 9d85c1d8d9f4ef7b40ebff8a4301bf3ef34aec6014e22310cb1e408cb4ec2a45
@@ -24,14 +25,18 @@ EBUILD mlt-0.2.3.ebuild 2370 RMD160 4be1e9657f3614e43051d78945462b92cf6dbc4f SHA
 MD5 71ad86f4c91d7fefb61e468b1bf8168b mlt-0.2.3.ebuild 2370
 RMD160 4be1e9657f3614e43051d78945462b92cf6dbc4f mlt-0.2.3.ebuild 2370
 SHA256 c69399b60283a457206926baad7ac5f4c79a4a5269e1dba16cb0ec536aa52a17 mlt-0.2.3.ebuild 2370
+EBUILD mlt-0.2.4-r1.ebuild 2683 RMD160 c9a14015e8d50cc786c8d07485e16771a6c247f7 SHA1 2d45230a2ef1a442189f2c7513894673cbbf41e0 SHA256 db9f24666ffe2a3e38021186480704ee94ea61dba50cf439c09d23967e1367ce
+MD5 374c93e77bcafa8b33e06e198b42b239 mlt-0.2.4-r1.ebuild 2683
+RMD160 c9a14015e8d50cc786c8d07485e16771a6c247f7 mlt-0.2.4-r1.ebuild 2683
+SHA256 db9f24666ffe2a3e38021186480704ee94ea61dba50cf439c09d23967e1367ce mlt-0.2.4-r1.ebuild 2683
 EBUILD mlt-0.2.4.ebuild 2488 RMD160 4de0c223b2f97a878f8c38604c2658096d8f194a SHA1 9d9e4dc543daf47be235aafda835949c051e5832 SHA256 6c5920c3dcc78fadb9e892a42d3b35c11a35d72a2210d3d8bed2de1f4aa1cb34
 MD5 65142e6efea68377155f72caf119a230 mlt-0.2.4.ebuild 2488
 RMD160 4de0c223b2f97a878f8c38604c2658096d8f194a mlt-0.2.4.ebuild 2488
 SHA256 6c5920c3dcc78fadb9e892a42d3b35c11a35d72a2210d3d8bed2de1f4aa1cb34 mlt-0.2.4.ebuild 2488
-MISC ChangeLog 2350 RMD160 b87306cadeb41916377e4dfeed3eee8677a1ee9f SHA1 968ff9a26c7679c29d352cbb0f0ef58293f96c8c SHA256 cdd2847a12a690dfa4dd9059deeb467b988946c1075c1285ba44a1e8f446edc6
-MD5 7c0b471feca7767f86d2412eb91860af ChangeLog 2350
-RMD160 b87306cadeb41916377e4dfeed3eee8677a1ee9f ChangeLog 2350
-SHA256 cdd2847a12a690dfa4dd9059deeb467b988946c1075c1285ba44a1e8f446edc6 ChangeLog 2350
+MISC ChangeLog 2591 RMD160 b50de6892c7a01ec51e169d17ea21d2a47a66a42 SHA1 114210994b65eaeda23fe7f88f0aade2be68543a SHA256 2d48371291c5b71a00c7a8aa11b8f60b7b8d959e319b2851791aa7023abaf968
+MD5 711bca3b5dbb1d01751fb3a16c8882bd ChangeLog 2591
+RMD160 b50de6892c7a01ec51e169d17ea21d2a47a66a42 ChangeLog 2591
+SHA256 2d48371291c5b71a00c7a8aa11b8f60b7b8d959e319b2851791aa7023abaf968 ChangeLog 2591
 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64
 MD5 29bc3f4b41337cb51a64ea89a3957657 metadata.xml 226
 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 metadata.xml 226
@@ -45,10 +50,6 @@ SHA256 e01fcdb00c381b68e72f500ac224faa0ceea82f4a40ad295dda5bbaed6c26019 files/di
 MD5 002c2d10942ef686b79a31600ff93508 files/digest-mlt-0.2.4 229
 RMD160 9b0b42f5d83bd84583eefae9c1f5ab37df99b15d files/digest-mlt-0.2.4 229
 SHA256 b236ceeda334f808cc82b895b81b50c577210d546080c85416af531b4018890a files/digest-mlt-0.2.4 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFGyqlbvFcC4BYPU0oRAtwcAJ9zOu0xofR8tI83DC/dBzqasQfMeACeN9yC
-3c9EmwKjaJMk1ztBCODu9sw=
-=4QOw
------END PGP SIGNATURE-----
+MD5 002c2d10942ef686b79a31600ff93508 files/digest-mlt-0.2.4-r1 229
+RMD160 9b0b42f5d83bd84583eefae9c1f5ab37df99b15d files/digest-mlt-0.2.4-r1 229
+SHA256 b236ceeda334f808cc82b895b81b50c577210d546080c85416af531b4018890a files/digest-mlt-0.2.4-r1 229
diff --git a/media-libs/mlt/files/digest-mlt-0.2.4-r1 b/media-libs/mlt/files/digest-mlt-0.2.4-r1
new file mode 100644
index 000000000000..12a5851d6896
--- /dev/null
+++ b/media-libs/mlt/files/digest-mlt-0.2.4-r1
@@ -0,0 +1,3 @@
+MD5 6606d8be848a10efef929e2b6de3cf61 mlt-0.2.4.tar.gz 644406
+RMD160 2822c775b397eb426d9f1aabfa515f76eb98aab2 mlt-0.2.4.tar.gz 644406
+SHA256 9d85c1d8d9f4ef7b40ebff8a4301bf3ef34aec6014e22310cb1e408cb4ec2a45 mlt-0.2.4.tar.gz 644406
diff --git a/media-libs/mlt/files/mlt-0.2.4-sox1400.patch b/media-libs/mlt/files/mlt-0.2.4-sox1400.patch
new file mode 100644
index 000000000000..d682ea72488e
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.2.4-sox1400.patch
@@ -0,0 +1,190 @@
+diff -ur mlt-0.2.4.orig/src/modules/sox/configure mlt-0.2.4/src/modules/sox/configure
+--- mlt-0.2.4.orig/src/modules/sox/configure	2005-05-04 22:37:08.000000000 +0300
++++ mlt-0.2.4/src/modules/sox/configure	2007-11-23 12:18:59.000000000 +0200
+@@ -4,7 +4,36 @@
+ then
+ 
+ 	which libst-config > /dev/null 2>&1
+-	disable_sox=$?
++	if [ $? -eq 0 ]
++	then
++		disable_sox=0
++		echo "CFLAGS += $(libst-config --cflags) -I../../" > config.mak
++		echo "LDFLAGS += -lst $(libst-config --libs)" >> config.mak
++	else
++		sox --version 2> /dev/null | grep 'v14.' > /dev/null
++		disable_sox=$?
++		if [ $disable_sox -eq 0 ]
++		then
++			LIBDIR=lib
++			#bits=$(uname -m)
++			#case $bits in
++			#x86_64)
++			#	export LIBDIR=lib64
++			#	;;
++			#*)
++			#	export LIBDIR=lib
++			#	;;
++			#esac
++
++			sox=$(which sox)
++			# chop sox
++			soxdir=$(dirname $sox)
++			# chop bin
++			soxdir=$(dirname $soxdir)
++			echo "CFLAGS += -DSOX14 -I$soxdir/include" > config.mak
++			echo "LDFLAGS += -L$soxdir/$LIBDIR -lsox -lsfx -lsamplerate" >> config.mak
++		fi
++	fi
+ 
+ 	if [ "$disable_sox" = "0" ]
+ 	then
+diff -ur mlt-0.2.4.orig/src/modules/sox/filter_sox.c mlt-0.2.4/src/modules/sox/filter_sox.c
+--- mlt-0.2.4.orig/src/modules/sox/filter_sox.c	2007-03-31 03:29:56.000000000 +0300
++++ mlt-0.2.4/src/modules/sox/filter_sox.c	2007-11-23 12:18:57.000000000 +0200
+@@ -28,7 +28,21 @@
+ #include <string.h>
+ #include <math.h>
+ 
+-#include <st.h>
++#ifdef SOX14
++#	include <sox.h>
++#	define ST_EOF SOX_EOF
++#	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
++#	define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
++#	define ST_SSIZE_MIN SOX_SSIZE_MIN
++#	define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
++#else
++#	include <st.h>
++#endif
+ 
+ #define BUFFER_LEN 8192
+ #define AMPLITUDE_NORM 0.2511886431509580 /* -12dBFS */
+@@ -61,21 +75,37 @@
+ static int create_effect( mlt_filter this, char *value, int count, int channel, int frequency )
+ {
+ 	mlt_tokeniser tokeniser = mlt_tokeniser_init();
++#ifdef SOX14
++	eff_t eff = mlt_pool_alloc( sizeof( sox_effect_t ) );
++#else
+ 	eff_t eff = mlt_pool_alloc( sizeof( struct st_effect ) );
++#endif
+ 	char id[ 256 ];
+ 	int error = 1;
+ 
+ 	// Tokenise the effect specification
+ 	mlt_tokeniser_parse_new( tokeniser, value, " " );
++	if ( tokeniser->count < 1 )
++		return error;
+ 
+ 	// Locate the effect
++#ifdef SOX14
++	//fprintf(stderr, "%s: effect %s count %d\n", __FUNCTION__, tokeniser->tokens[0], tokeniser->count );
++	sox_create_effect( eff, sox_find_effect( tokeniser->tokens[0] ) );
++	int opt_count = tokeniser->count - 1;
++#else
+ 	int opt_count = st_geteffect_opt( eff, tokeniser->count, tokeniser->tokens );
++#endif
+ 	
+ 	// If valid effect
+ 	if ( opt_count != ST_EOF )
+ 	{
+ 		// Supply the effect parameters
++#ifdef SOX14
++		if ( ( * eff->handler.getopts )( eff, opt_count, &tokeniser->tokens[ tokeniser->count > 1 ? 1 : 0  ] ) == ST_SUCCESS )
++#else
+ 		if ( ( * eff->h->getopts )( eff, opt_count, &tokeniser->tokens[ tokeniser->count - opt_count ] ) == ST_SUCCESS )
++#endif
+ 		{
+ 			// Set the sox signal parameters
+ 			eff->ininfo.rate = frequency;
+@@ -84,7 +114,11 @@
+ 			eff->outinfo.channels = 1;
+ 			
+ 			// Start the effect
++#ifdef SOX14
++			if ( ( * eff->handler.start )( eff ) == ST_SUCCESS )
++#else
+ 			if ( ( * eff->h->start )( eff ) == ST_SUCCESS )
++#endif
+ 			{
+ 				// Construct id
+ 				sprintf( id, "_effect_%d_%d", count, channel );
+@@ -123,7 +157,7 @@
+ 	st_sample_t *output_buffer = mlt_properties_get_data( filter_properties, "output_buffer", NULL );
+ 	int channels_avail = *channels;
+ 	int i; // channel
+-	int count = mlt_properties_get_int( filter_properties, "effect_count" );
++	int count = mlt_properties_get_int( filter_properties, "_effect_count" );
+ 
+ 	// Get the producer's audio
+ 	mlt_frame_get_audio( frame, buffer, format, frequency, &channels_avail, samples );
+@@ -211,7 +245,7 @@
+ 			}
+ 			
+ 			// Save the number of filters
+-			mlt_properties_set_int( filter_properties, "effect_count", count );
++			mlt_properties_set_int( filter_properties, "_effect_count", count );
+ 			
+ 		}
+ 		if ( *samples > 0 && count > 0 )
+@@ -295,7 +329,11 @@
+ 					float saved_gain = 1.0;
+ 					
+ 					// XXX: hack to apply the normalised gain level to the vol effect
++#ifdef SOX14
++					if ( normalise && strcmp( e->handler.name, "vol" ) == 0 )
++#else
+ 					if ( normalise && strcmp( e->name, "vol" ) == 0 )
++#endif
+ 					{
+ 						float *f = ( float * )( e->priv );
+ 						saved_gain = *f;
+@@ -303,7 +341,11 @@
+ 					}
+ 					
+ 					// Apply the effect
++#ifdef SOX14
++					if ( ( * e->handler.flow )( e, input_buffer, output_buffer, &isamp, &osamp ) == ST_SUCCESS )
++#else
+ 					if ( ( * e->h->flow )( e, input_buffer, output_buffer, &isamp, &osamp ) == ST_SUCCESS )
++#endif
+ 					{
+ 						// Swap input and output buffer pointers for subsequent effects
+ 						p = input_buffer;
+@@ -312,7 +354,11 @@
+ 					}
+ 					
+ 					// XXX: hack to restore the original vol gain to prevent accumulation
++#ifdef SOX14
++					if ( normalise && strcmp( e->handler.name, "vol" ) == 0 )
++#else
+ 					if ( normalise && strcmp( e->name, "vol" ) == 0 )
++#endif
+ 					{
+ 						float *f = ( float * )( e->priv );
+ 						*f = saved_gain;
+diff -ur mlt-0.2.4.orig/src/modules/sox/Makefile mlt-0.2.4/src/modules/sox/Makefile
+--- mlt-0.2.4.orig/src/modules/sox/Makefile	2005-12-05 13:35:55.000000000 +0200
++++ mlt-0.2.4/src/modules/sox/Makefile	2007-11-23 12:19:00.000000000 +0200
+@@ -1,12 +1,13 @@
+ include ../../../config.mak
++include config.mak
+ 
+ TARGET = ../libmltsox$(LIBSUF)
+ 
+ OBJS = factory.o \
+ 	   filter_sox.o 
+ 
+-CFLAGS += `libst-config --cflags` -I../../ 
+-LDFLAGS += -lst `libst-config --libs`
++CFLAGS += -I../../
++
+ LDFLAGS += -L../../framework -lmlt
+ 
+ SRCS := $(OBJS:.o=.c)
diff --git a/media-libs/mlt/mlt-0.2.4-r1.ebuild b/media-libs/mlt/mlt-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..96e7d0c00ffd
--- /dev/null
+++ b/media-libs/mlt/mlt-0.2.4-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/11/23 10:36:18 drac Exp $
+
+inherit eutils toolchain-funcs qt3
+
+DESCRIPTION="MLT is an open source multimedia framework, designed and developed
+for television broadcasting"
+HOMEPAGE="http://mlt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dv xml jack gtk sdl vorbis sox quicktime mmx lame xine lame ogg theora
+xine ffmpeg libsamplerate qt3"
+
+DEPEND="ffmpeg? ( media-video/ffmpeg )
+	dv?	( >=media-libs/libdv-0.104 )
+	xml?	( >=dev-libs/libxml2-2.5 )
+	ogg?	( >=media-libs/libogg-1.1.3 )
+	vorbis?	( >=media-libs/libvorbis-1.1.2 )
+	sdl?	( >=media-libs/libsdl-1.2.10
+		  >=media-libs/sdl-image-1.2.4 )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	jack?	( media-sound/jack-audio-connection-kit
+			  media-libs/ladspa-sdk
+			  >=dev-libs/libxml2-2.5 )
+	gtk?	( >=x11-libs/gtk+-2
+		  x11-libs/pango )
+	sox? ( media-sound/sox )
+	quicktime? ( media-libs/libquicktime )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	lame? ( >=media-sound/lame-3.97_beta2 )
+	qt3? ( $(qt_min_version 3) )
+	theora? ( >=media-libs/libtheora-1.0_alpha5 )"
+RDEPEND=${DEPEND}
+
+pkg_setup() {
+	local fail="USE sox needs also USE libsamplerate enabled."
+
+	if use sox && ! use libsamplerate; then
+		eerror "${fail}"
+		die "${fail}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/mlt-0.2.2-motion-est-nonx86.patch
+	epatch "${FILESDIR}"/mlt-0.2.3-nostrip.patch
+	epatch "${FILESDIR}"/${P}-sox1400.patch
+}
+
+src_compile() {
+	tc-export CC
+
+	local myconf="	--enable-gpl --enable-shared
+			--enable-pp --enable-shared-pp
+			--enable-motion-est
+			$(use_enable dv)
+			$(use_enable mmx)
+			$(use_enable gtk gtk2)
+			$(use_enable vorbis)
+			$(use_enable ogg)
+			$(use_enable sdl)
+			$(use_enable jack jackrack)
+			$(use_enable sox)
+			$(use_enable theora)
+			$(use_enable lame mp3lame)
+			$(use_enable ffmpeg avformat)
+			$(use_enable libsamplerate resample)
+			$(use_enable qt3 qimage)
+			$(use_enable xml westley)
+			$(use_enable xine)"
+
+	use ffmpeg && has_version ">=media-video/ffmpeg-0.4.9_p20070616-r1" &&
+		myconf="${myconf} --avformat-swscale"
+
+	(use quicktime || use dv) ||  myconf="${myconf} --disable-kino"
+
+	econf ${myconf} || die "econf failed"
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc docs/*.txt ChangeLog README docs/TODO
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+}