Rev bump: bashism in /bin/sh script fix by Martin Väth <vaeth@mathematik.uni-wuerzburg.de>, bug #216216. Backport a 'fix' from upstream to build with recent ffmpegs, bug #214520. Dont mess up fps type which fixes an issue of a/v sync fix by Ollie Wild <aloysius.wild@gmail.com>, bug #211242. Allow building with new ffmpeg headers layout fix by me.

Package-Manager: portage-2.1.5_rc2

7 files changed, 195 insertions, 3 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index d29ec5b660f2..71221af46f17 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,19 @@
 # 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.17 2007/11/23 10:36:17 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.18 2008/04/10 17:44:22 aballier Exp $
+
+*mlt-0.2.4-r2 (10 Apr 2008)
+
+  10 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/mlt-0.2.4-avdevice.patch, +files/mlt-0.2.4-bashism.patch,
+  +files/mlt-0.2.4-double-fps.patch, +files/mlt-0.2.4-ffmpegheaders.patch,
+  +mlt-0.2.4-r2.ebuild:
+  Rev bump: bashism in /bin/sh script fix by Martin Väth
+  <vaeth@mathematik.uni-wuerzburg.de>, bug #216216. Backport a 'fix' from
+  upstream to build with recent ffmpegs, bug #214520. Dont mess up fps type
+  which fixes an issue of a/v sync fix by Ollie Wild
+  <aloysius.wild@gmail.com>, bug #211242. Allow building with new ffmpeg
+  headers layout fix by me.
 
 *mlt-0.2.4-r1 (23 Nov 2007)
 
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 8553d0ce5ed8..48fc67d88dcc 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,9 +1,24 @@
+-----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
+AUX mlt-0.2.4-avdevice.patch 516 RMD160 496dcb2d74c2afbd2acab4e24becf063afa5113a SHA1 66719bc6c544c10634eeddc7fce3220080368f2c SHA256 72ef9dc507287859072fa80206dff67d94cc1300c8148054020c9c1db7dd31db
+AUX mlt-0.2.4-bashism.patch 349 RMD160 c9ca1037f00e3aceeb4346f5a7ccf9b6a253541d SHA1 7d467038521074af4a2afcf99bdcb73f1d7505af SHA256 1a99f2f8af86291cac144cf6b12eff88320662d28ba2528722847b171f61b367
+AUX mlt-0.2.4-double-fps.patch 636 RMD160 5d18ce31181b18e2273a4ed909aad91836cd01d8 SHA1 5403d6eae4d4c9d7d7c826c29e80b7a1403f3a17 SHA256 bac9f166389eabdcfdf94f59c1f454e8133fe89331dae01152ea298fbec49c10
+AUX mlt-0.2.4-ffmpegheaders.patch 1102 RMD160 df512477d9d2476fa0b5b36f4369c4b57ba93198 SHA1 3b63cdebbd26ba2e0da07813258e55b3b10f3033 SHA256 545e96b5005911b1b5451844c8ba309d27c45ab9403f55eb6c7d49ea98f87336
 AUX mlt-0.2.4-sox1400.patch 5887 RMD160 e67a5e7c354116d88c9799d4c4f9a17e14e0feba SHA1 f8afa9a8cf5aeb52b91135c89e028c0a9fcc8ef3 SHA256 f6bef87691feee43de2db0ffa1801445da50342bc27295f99b08bdb634fd7c7d
 DIST mlt-0.2.4.tar.gz 644406 RMD160 2822c775b397eb426d9f1aabfa515f76eb98aab2 SHA1 4074dab510037ad9f49401bad75c8b78c1ee06b8 SHA256 9d85c1d8d9f4ef7b40ebff8a4301bf3ef34aec6014e22310cb1e408cb4ec2a45
 EBUILD mlt-0.2.4-r1.ebuild 2683 RMD160 c9a14015e8d50cc786c8d07485e16771a6c247f7 SHA1 2d45230a2ef1a442189f2c7513894673cbbf41e0 SHA256 db9f24666ffe2a3e38021186480704ee94ea61dba50cf439c09d23967e1367ce
+EBUILD mlt-0.2.4-r2.ebuild 2861 RMD160 7c3d079d7bf7a769ba535b5f5eba30986269f575 SHA1 4bea56d800d7212cda7e5356a6e9a884c9564f50 SHA256 2678a58fd17e10fda7ce05c85219a090705bf9f119613989086780b1a27eedd7
 EBUILD mlt-0.2.4.ebuild 2488 RMD160 4de0c223b2f97a878f8c38604c2658096d8f194a SHA1 9d9e4dc543daf47be235aafda835949c051e5832 SHA256 6c5920c3dcc78fadb9e892a42d3b35c11a35d72a2210d3d8bed2de1f4aa1cb34
-MISC ChangeLog 2591 RMD160 b50de6892c7a01ec51e169d17ea21d2a47a66a42 SHA1 114210994b65eaeda23fe7f88f0aade2be68543a SHA256 2d48371291c5b71a00c7a8aa11b8f60b7b8d959e319b2851791aa7023abaf968
+MISC ChangeLog 3205 RMD160 8d667d845ce42896bb1343fdd77c2e934c313aec SHA1 708f94d5ecb8dfd8d2d6f332f40d4169c626aa71 SHA256 de4133fa10f1dcf6597d64d366ba3afcd7decce7591848636d6299fe59bcc1b9
 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf+Uf4ACgkQvFcC4BYPU0ootQCgqdS+AmNQAn14k4fKfLnxGumi
+GqAAoLVnxc2S5dxVo8+hI8SsPzxS/18X
+=54aC
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.2.4-avdevice.patch b/media-libs/mlt/files/mlt-0.2.4-avdevice.patch
new file mode 100644
index 000000000000..82611aac150c
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.2.4-avdevice.patch
@@ -0,0 +1,13 @@
+Index: mlt-0.2.4/src/modules/avformat/producer_avformat.c
+===================================================================
+--- mlt-0.2.4.orig/src/modules/avformat/producer_avformat.c
++++ mlt-0.2.4/src/modules/avformat/producer_avformat.c
+@@ -203,7 +203,7 @@ static int producer_open( mlt_producer t
+ 			params->width = 640;
+ 			params->height = 480;
+ 			params->time_base= (AVRational){1,25};
+-			params->device = file;
++			//params->device = file;
+ 			params->channels = 2;
+ 			params->sample_rate = 48000;
+ 		}
diff --git a/media-libs/mlt/files/mlt-0.2.4-bashism.patch b/media-libs/mlt/files/mlt-0.2.4-bashism.patch
new file mode 100644
index 000000000000..0f01aab2a139
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.2.4-bashism.patch
@@ -0,0 +1,11 @@
+--- src/modules/lumas/create_lumas
++++ src/modules/lumas/create_lumas
+@@ -10,7 +10,7 @@
+ 	mkdir -p $i
+ 	rm -f $i/*.pgm $i/*.png
+ 
+-	[ "$i" == "PAL" ] && h=576 || h=480
++	[ "$i" = "PAL" ] && h=576 || h=480
+ 	./luma -h $h -bpp $bpp > $i/luma01.pgm
+ 	./luma -h $h -bpp $bpp -bands $h > $i/luma02.pgm
+ 	./luma -h $h -bpp $bpp -hmirror 1 > $i/luma03.pgm
diff --git a/media-libs/mlt/files/mlt-0.2.4-double-fps.patch b/media-libs/mlt/files/mlt-0.2.4-double-fps.patch
new file mode 100644
index 000000000000..01da74de3fea
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.2.4-double-fps.patch
@@ -0,0 +1,16 @@
+This fixes an audio synchronization bug when exporting videos from
+kdenlive.  See http://www.kdenlive.org/mantis/view.php?id=28.
+
+Ollie Wild <aloysius.wild@gmail.com>
+
+--- mlt-0.2.4/src/modules/avformat/consumer_avformat.c.orig	2008-02-24 01:20:25.000000000 -0800
++++ mlt-0.2.4/src/modules/avformat/consumer_avformat.c	2008-02-24 01:20:38.000000000 -0800
+@@ -623,7 +623,7 @@
+ 	struct timeval ante;
+ 
+ 	// Get the frame rate
+-	int fps = mlt_properties_get_double( properties, "fps" );
++	double fps = mlt_properties_get_double( properties, "fps" );
+ 
+ 	// Get width and height
+ 	int width = mlt_properties_get_int( properties, "width" );
diff --git a/media-libs/mlt/files/mlt-0.2.4-ffmpegheaders.patch b/media-libs/mlt/files/mlt-0.2.4-ffmpegheaders.patch
new file mode 100644
index 000000000000..6fc641ae4a55
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.2.4-ffmpegheaders.patch
@@ -0,0 +1,24 @@
+Index: mlt-0.2.4/src/modules/avformat/configure
+===================================================================
+--- mlt-0.2.4.orig/src/modules/avformat/configure
++++ mlt-0.2.4/src/modules/avformat/configure
+@@ -130,12 +130,19 @@ else
+ 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
+ 			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
+ 			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
++		else if [ -d "$shared_ffmpeg/include/libavformat" -a -d "$shared_ffmpeg/include/libswscale" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
++		then
++			echo "CFLAGS+=-I$shared_ffmpeg/include/libavformat " >> config.mak
++			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
++			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
++			[ "$swscale" != "" ] && echo "CFLAGS+=-I$shared_ffmpeg/include/libswscale " >> config.mak
+ 		else
+ 			echo "avformat: No build environment found. "
+ 			echo "          Try configuring mlt with --avformat-svn."
+ 			touch ../disable-avformat
+ 			exit 0
+ 		fi
++		fi
+ 	fi
+ 
+ 	echo "EXTRA_LIBS=$extra_libs" >> config.mak
diff --git a/media-libs/mlt/mlt-0.2.4-r2.ebuild b/media-libs/mlt/mlt-0.2.4-r2.ebuild
new file mode 100644
index 000000000000..dc1266cba21d
--- /dev/null
+++ b/media-libs/mlt/mlt-0.2.4-r2.ebuild
@@ -0,0 +1,100 @@
+# 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.1 2008/04/10 17:44:22 aballier 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
+	epatch "${FILESDIR}"/${P}-ffmpegheaders.patch
+	epatch "${FILESDIR}"/${P}-avdevice.patch
+	epatch "${FILESDIR}"/${P}-bashism.patch
+	epatch "${FILESDIR}"/${P}-double-fps.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
+}