version bump, bug #271859

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 148 insertions, 5 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 723f4efcf4e1..98ae7cda2505 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.41 2009/05/16 06:56:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.42 2009/06/04 13:49:03 aballier Exp $
+
+*mlt-0.4.2 (04 Jun 2009)
+
+  04 Jun 2009; Alexis Ballier <aballier@gentoo.org> +mlt-0.4.2.ebuild,
+  +files/mlt-0.4.2-nostrip.patch:
+  version bump, bug #271859
 
   16 May 2009; Alexis Ballier <aballier@gentoo.org> -mlt-0.3.4.ebuild,
   -mlt-0.3.6.ebuild, -files/mlt-0.3.6-avutil.patch, -mlt-0.3.8.ebuild:
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index c060e6df89ff..3008f0f75377 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,14 +4,17 @@ Hash: SHA1
 AUX mlt-0.2.3-nostrip.patch 1763 RMD160 958ea322e598e286dc9adcc6ba509c7b2eeae5b2 SHA1 8a24c74980b8cdefb19164a4c6a36217b23244dd SHA256 1e0945b45245c297464e845bf6409a91582d288047b2b511357ead52be70fceb
 AUX mlt-0.3.6-qimage.patch 706 RMD160 b7d2ee57ed6b14678d402d28531d411b1418700a SHA1 4571bfacd0317d8b90244d0343727ab6939815f3 SHA256 8c30ece5d14202867441773ad93c61b2ee84d1afdcb3f009582ce48522c0e527
 AUX mlt-0.3.8-as-needed.patch 2262 RMD160 e98ebf835f23b25297ba97f14eff7ac9dedbedf6 SHA1 836dff43ace64398fbb23c43ae7cf98fb0bc9907 SHA256 9957757c36916e5732bdba1f8787f4ce3b829e25c4f00bdbf7b116c77514959f
+AUX mlt-0.4.2-nostrip.patch 410 RMD160 0046bbbf566eb09e71f63b80a1351546e1ae8deb SHA1 4b572ceb756b087ca9e7d1ad0a409e2ee6c5c9b7 SHA256 fac28677fde3f4d53d2ab7095536e08895525fd2d8c49525b31ce6c8e396eef1
 DIST mlt-0.3.8.tar.gz 765811 RMD160 c8c67f23cd519414f6410ee02c1c37704facf180 SHA1 b3e114b343fb825df292d8343850512d631dea23 SHA256 cea314c08cf2a9256ef50f9cd09202f1c8c778ad278c324112e3c8a9d3b28e24
+DIST mlt-0.4.2.tar.gz 734746 RMD160 120d00d39fd4f6c2450a6fceddc7273e4216b4cb SHA1 1db97316f9d3dc0fead9ac94fd036c1399a7a4d2 SHA256 069abee48f9400ad8af0b63a55811d666a2e049221523e434b59d53908619b04
 EBUILD mlt-0.3.8-r1.ebuild 3322 RMD160 c3b2c09aa17b26b4f6db623bad3af75d2a75470f SHA1 3bf50eb849ed08003503419715e6bf059d39d425 SHA256 137de4bc429670058fe8873edd3571f6751f3fd8902920845ec1f77f345a3706
-MISC ChangeLog 6798 RMD160 79b214222ae15d9419b0a7ef682f1ca28bd9380a SHA1 e4b9f4126c81f26b8cfda18da1f2e491b3b7a7d1 SHA256 7f9f8062e0e5b4fbee51cbf4c4cc2b0cd70697ce9b0af392c36f1172c3042de7
+EBUILD mlt-0.4.2.ebuild 3288 RMD160 a73afc4bec3e19c05334d2e927e953a32d67a462 SHA1 82dfb0141cc40495a24bd6421ea8761d01b5086f SHA256 23a3e05402fca6e0ff741d020c853bd1696feb073c21bb6c72a0e371b1c5091d
+MISC ChangeLog 6958 RMD160 3ac2055ebd78cacd72f692f67c56016fe6bb88fd SHA1 da9caa91c5f6ed2812095bdf90e025c83fe0a916 SHA256 911aa19ec83b414d7375d9c8d2f54932d5b959a7e56092a2edaaccaffab7b591
 MISC metadata.xml 309 RMD160 eda168c8e7d4d6351c0d68920f9a16fc7be98faa SHA1 75c4b1dacecba9d2b7613a25b9477d8bc0c19631 SHA256 dfe032959539b7a48f33ab6520dde1814e062ce636efc4be8795cc480b90ead7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoOY6QACgkQvFcC4BYPU0rzXgCgwlP5KA0OT3ySgUXxaLZRd4rf
-TAMAniFZnY32qONS9Tn6O3+vAzFT4ayg
-=GMVp
+iEYEARECAAYFAkon0NQACgkQvFcC4BYPU0r4ZgCgpIVM7p7q6ZM0n6HoHOkPRFTj
+D9EAnRtsTNGd7vHr8DSUg+54JPsN8svZ
+=Tugx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.4.2-nostrip.patch b/media-libs/mlt/files/mlt-0.4.2-nostrip.patch
new file mode 100644
index 000000000000..d7e90beab090
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.4.2-nostrip.patch
@@ -0,0 +1,13 @@
+Index: mlt-0.4.2/src/melt/Makefile
+===================================================================
+--- mlt-0.4.2.orig/src/melt/Makefile
++++ mlt-0.4.2/src/melt/Makefile
+@@ -27,7 +27,7 @@ clean:	
+ 
+ install:	all
+ 	install -d "$(DESTDIR)$(bindir)"
+-	install -c -s -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
++	install -c -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
+ 
+ uninstall:
+ 	rm -f "$(DESTDIR)$(bindir)/$(TARGET)"
diff --git a/media-libs/mlt/mlt-0.4.2.ebuild b/media-libs/mlt/mlt-0.4.2.ebuild
new file mode 100644
index 000000000000..1d8ce526d32e
--- /dev/null
+++ b/media-libs/mlt/mlt-0.4.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.4.2.ebuild,v 1.1 2009/06/04 13:49:03 aballier Exp $
+
+EAPI=1
+
+inherit kde-functions eutils toolchain-funcs multilib
+
+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 compressed-lumas ffmpeg gtk jack kde libsamplerate mmx qt3 qt4 quicktime sdl sox sse vorbis xine xml"
+
+RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	dv?	( >=media-libs/libdv-0.104 )
+	xml?	( >=dev-libs/libxml2-2.5 )
+	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 )
+	qt3? ( x11-libs/qt:3
+		kde? ( kde-base/kdelibs:3.5 ) )
+	!qt3?   ( qt4? ( x11-libs/qt-gui:4 ) )
+	!media-libs/mlt++"
+
+DEPEND="${RDEPEND}
+	compressed-lumas? ( media-gfx/imagemagick )"
+
+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.4.2-nostrip.patch
+	epatch "${FILESDIR}"/${PN}-0.3.6-qimage.patch
+}
+
+src_compile() {
+	tc-export CC
+
+	local myconf="	--enable-gpl
+			--enable-motion-est
+			$(use_enable dv)
+			$(use_enable mmx)
+			$(use_enable sse)
+			$(use_enable gtk gtk2)
+			$(use_enable vorbis)
+			$(use_enable sdl)
+			$(use_enable jack jackrack)
+			$(use_enable sox)
+			$(use_enable ffmpeg avformat)
+			$(use_enable libsamplerate resample)
+			$(use_enable xml westley)
+			$(use_enable xine)"
+
+	use ffmpeg && has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" &&
+		myconf="${myconf} --avformat-swscale"
+
+	(use quicktime && use dv) ||  myconf="${myconf} --disable-kino"
+
+	use compressed-lumas && myconf="${myconf} --luma-compress"
+
+	# Waiting for media-plugins/frei0r (bug 255321)
+	myconf="${myconf} --disable-frei0r"
+
+	if use qt3; then
+		myconf="${myconf} --disable-kdenlive"
+	else
+		myconf="${myconf} $(use_enable kde kdenlive)"
+	fi
+
+	if use qt3; then
+		myconf="${myconf} --qimage-libdir=$QTDIR/$(get_libdir)
+			--qimage-includedir=$QTDIR/include"
+		if use kde; then
+			# compile extra image formats using kde
+			set-kdedir 3.5
+			myconf="${myconf} --kde-libdir=$KDEDIR/$(get_libdir)
+				--kde-includedir=$KDEDIR/include"
+		fi
+	elif use qt4; then
+		myconf="${myconf} --qimage-libdir=/usr/$(get_libdir)/qt4
+			--qimage-includedir=/usr/include/qt4"
+	else
+		myconf="${myconf} --disable-qimage"
+	fi
+
+	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
+}