Version bump. Drop libavcodec54 patch which has been applied upstream.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

3 files changed, 185 insertions, 2 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 8563170af076..2a8fc93ce877 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.92 2012/07/19 07:15:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.93 2012/08/31 03:39:11 yngwin Exp $
+
+*mlt-0.8.2 (31 Aug 2012)
+
+  31 Aug 2012; Ben de Groot <yngwin@gentoo.org> +mlt-0.8.2.ebuild:
+  Version bump. Drop libavcodec54 patch which has been applied upstream.
 
   19 Jul 2012; Ben de Groot <yngwin@gentoo.org> mlt-0.8.0.ebuild:
   Add use dependency on libsdl[X,opengl], bug #426964
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 42e5a46fa39d..fbcd0eab1b42 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -2,7 +2,9 @@ AUX mlt-0.7.2-ruby-link.patch 680 SHA256 fbcf41da78bc150afd2fcc5394eda2022d2c19d
 AUX mlt-0.7.8-libavcodec54.patch 677 SHA256 ad720784b728699eada59f44be2f63a834b16ce076acce36f7f74bba1b55b125 SHA512 79a2b3b22841d137b4add9b15437f11f6a8e66d2d3aad41f2ddcfd16c30571f54c2cfea7865b291232a8e047295202321b3a75dd5007ba361cd43958ab6c0f1d WHIRLPOOL fb337266f91f0d71790ba5815bf74fd3a49080f9c9b95f362ab3d48224c3dd5afaacf25fdb69e56ad63e7e1fefa000af62e3c9c8217f7a18364eb4f1542b4bd9
 DIST mlt-0.7.8.tar.gz 1106625 SHA256 95833b2746e2d71dd42f6163e1a5d863c7d4772cc344a840f5555d0dc1946e43
 DIST mlt-0.8.0.tar.gz 1143227 SHA256 7bd07b392663b33a0408c900117b2e431c93e5f29394578cfbeff7b26a0cc6dd SHA512 532a408895e2b8d9647306777e304536073ae43d1a14b8392b6220186f94cd29a11079917dcb28a981fefa5d7e0e3cc1e0dddda448ef0a2994afc5084d560514 WHIRLPOOL 0d2e4a42a5af847164fd280145dd89a7368e4d5d2f19050f787d39cc5c643770f174bb053e132b7b04e3ff23707162a106c2f28a1000cd63e1b529d37b680517
+DIST mlt-0.8.2.tar.gz 1161293 SHA256 36c743d2abc68ce737ac526507fc2caf71b3d6a53a2bf31d22e8193a8b899577 SHA512 ab71018e5a188b95d91b4aceeb4ca0dfc59d0dd981ec3e4fa220b91ce812e2c98ebad1d51998005c6bc98999c7478444c8bfd398d61bd2084ff732a1638ca6aa WHIRLPOOL 4d72efbffd2f7c77041065c948c18ccbb4a65eb7f4ec7209ccde15e142fee84c70324390bc921c0302c30ad7673336c8cf00be8c710154fe31c8a3063987622b
 EBUILD mlt-0.7.8.ebuild 4811 SHA256 ef8a2b0e420860011264cb640ae23e1c0cd8ba84325e86815a816610bda7cdcf SHA512 404bc35fc20f15d7d47224d236a713324f6ef67f11a8933ce3cd9b2a1138de009ac263b47647a367ccc1e67918c212263c11602d19d722619cb3c38ed653d4a4 WHIRLPOOL 5d80b630c7e762768ffaa38e27fdbb6f9a107b1d56c25cb641f1bc6e5eff5eb9a0c0cabcfcfd4666b35ec1955929407a62281b0ea7b677883a7c98c9ea4ccb50
 EBUILD mlt-0.8.0.ebuild 4820 SHA256 63c181f04a09cc810397422bc110d86ebb62ade858ea4eee7e28e5ae27a5a548 SHA512 250c68f221dc08009b92e513f7fc4394e4d02d77c08b6545597e971392753b4ce60bd7ed764adea33bcf9c0521746225e538aa2c7c519eaddbcbeae85e3bffd3 WHIRLPOOL b150d6629b5f76af8a7a6c38734a424290bc5dddec7a85f2a7101b5d49d0b5e6bc0fcda3ef60e886e07854ba06b0b26c34d00fb1af214ec764b1df3a56db4a89
-MISC ChangeLog 14318 SHA256 5f3b3981f0f7efcaad2e8a61ec31cae8036c5508bbc785cc28ef7e1670d5f814 SHA512 f23741e1f14af5d0de1f67cd26990f6bbddff96956fdeddcecaa660cb5e6b99e8a20d9d9b9cc083d4d1c71bec23c4f2d01fa98b19efac6c9bfd92c04ec13c7c9 WHIRLPOOL f202ab1358cc4c57a9d318c4778bd9d2abf481a18074bb5f634d38236c44691b13de2b1bb7ad231b85dbc3317fb0a2df2d1a2d8156c6a784087cfed28ec8b697
+EBUILD mlt-0.8.2.ebuild 4772 SHA256 be9cf02c08a60b427c4faafbac438068488c03d6cfc6ad2710c4708e7f489108 SHA512 503c7ee55413f5d7992ba8c4c498b646fd4c983485df0767932f1229492167c391c27f9fd32a28d3a08e2b98fe818a2f06f53a99298dbcf7642961a813c6b444 WHIRLPOOL 068537472c7d5f8fa0b57cd09a78b1009c7ee02f847fabff0b48638c5908b15813364055eb1d6dd65756a11a2c2294d092b308a12774e37aa76765463d57744c
+MISC ChangeLog 14485 SHA256 ef70b9bab32813185b320bf21073fbc9bf0bf4460acc8e38e7d6e6493741f1a6 SHA512 12e76dbf358ef173fb6b64100d75dbdd78ea85705c6cc2c451291c7b9d558fd926450716278945a2fad499859d65c127490caa7974715ef385f45ac7c02bd5f3 WHIRLPOOL 153e5daca66ec3fa6495065fdf69c75aedc9bb05415c02ef9a9a4be30d4cd681e3a04a71b5a8066797e8366177a61b6d186d5e3c173b454a906d66ac42b4b6df
 MISC metadata.xml 1130 SHA256 fbd5e5c1f43b4e3729ffb08a460281d9214e2ce42b2ff0b24f6ace960e65f48a SHA512 38addd8066df26e66b903c70f87fa48309024abde4373b3539ea2f98344b42f9d57fe4f313d83962f010858e51a4f9cfa6ca2b35f441a5b6280cd24877be2411 WHIRLPOOL cbe57172a822b724d0d9a2fcb9c2a88df1de8fdbcb79941664cf0925203cfe29f2a156a815629708319bd23b0f8f28c533bdc6d8b0c91d41f95b38d6758e42c8
diff --git a/media-libs/mlt/mlt-0.8.2.ebuild b/media-libs/mlt/mlt-0.8.2.ebuild
new file mode 100644
index 000000000000..55e3c0271f0c
--- /dev/null
+++ b/media-libs/mlt/mlt-0.8.2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.8.2.ebuild,v 1.1 2012/08/31 03:39:11 yngwin Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.6"
+inherit eutils toolchain-funcs multilib python
+
+DESCRIPTION="An open source multimedia framework, designed and developed for television broadcasting"
+HOMEPAGE="http://www.mltframework.org/"
+SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt
+mmx qt4 quicktime rtaudio sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau" # java perl php tcl
+IUSE="${IUSE} kernel_linux"
+
+#rtaudio will use OSS on non linux OSes
+RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
+	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[X,opengl]
+		 >=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 )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? ( x11-libs/gtk+:2
+		media-libs/libexif
+		x11-libs/pango )
+	quicktime? ( media-libs/libquicktime )
+	rtaudio? ( kernel_linux? ( media-libs/alsa-lib ) )
+	swfdec? ( media-libs/swfdec )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 media-libs/libexif )
+	!media-libs/mlt++
+	lua? ( >=dev-lang/lua-5.1.4-r4 )
+	ruby? ( dev-lang/ruby )"
+#	sox? ( media-sound/sox )
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	tcl? ( dev-lang/tcl )
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	compressed-lumas? ( || ( media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[imagemagick,png] ) )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.2-ruby-link.patch
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+	done
+	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf="--enable-gpl
+		--enable-motion-est
+		$(use_enable debug)
+		$(use_enable dv)
+		$(use_enable sse)
+		$(use_enable sse2)
+		$(use_enable swfdec)
+		$(use_enable gtk gtk2)
+		$(use_enable vorbis)
+		$(use_enable sdl)
+		$(use_enable jack jackrack)
+		$(use_enable ffmpeg avformat)
+		$(use_enable frei0r)
+		$(use_enable melt)
+		$(use_enable libsamplerate resample)
+		$(use_enable rtaudio)
+		$(use vdpau && echo ' --avformat-vdpau')
+		$(use_enable xml)
+		$(use_enable xine)
+		$(use_enable kde kdenlive)
+		$(use_enable qt4 qimage)
+		--disable-sox"
+		#$(use_enable sox)  FIXME
+
+	use ffmpeg && myconf="${myconf} --avformat-swscale"
+
+	(use quicktime && use dv) ||  myconf="${myconf} --disable-kino"
+
+	use compressed-lumas && myconf="${myconf} --luma-compress"
+
+	( use x86 || use amd64 ) && \
+		myconf="${myconf} $(use_enable mmx)" ||
+		myconf="${myconf} --disable-mmx"
+
+	use melt || sed -i -e "s;src/melt;;" Makefile
+
+	# TODO: add swig language bindings
+	# see also http://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang="${swig_lang} $i"
+	done
+	[ -z "${swig_lang}" ] && swig_lang="none"
+
+	econf ${myconf} --swig-languages="${swig_lang}"
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README docs/*.txt
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so || die
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python
+		insinto $(python_get_sitedir)
+		doins mlt.py || die
+		exeinto $(python_get_sitedir)
+		doexe _mlt.so || die
+		dodoc play.py
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby
+		exeinto $("${EPREFIX}"/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		doexe mlt.so || die
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize mlt.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup mlt.py
+	fi
+}