Version bump wrt #310071. USE="vdpau" wrt #306361 by Fabio Bonfante. Improve python eclass handling wrt #313539 by Arfrever Frehtes Taifersar Arahesis. *magick deps wrt #314295 by Wojciech Porczyk.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 42 insertions, 171 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 5a4d998be874..d9925e4c637d 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.57 2010/03/26 08:47:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.58 2010/04/28 11:19:06 ssuominen Exp $
+
+*mlt-0.5.4 (28 Apr 2010)
+
+  28 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +mlt-0.5.4.ebuild:
+  Version bump wrt #310071. USE="vdpau" wrt #306361 by Fabio Bonfante.
+  Improve python eclass handling wrt #313539 by Arfrever Frehtes Taifersar
+  Arahesis. *magick deps wrt #314295 by Wojciech Porczyk.
 
   26 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> mlt-0.5.0.ebuild:
   Missing pkgconfig depend wrt #311409.
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index b77d299a3497..6eb315b850ca 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="lua">Build SWIG bindings for Lua</flag>
 	<flag name="python">Build SWIG bindings for Python</flag>
 	<flag name="ruby">Build SWIG bindings for Ruby</flag>
+	<flag name="vdpau">Build with vdpau support</flag>
 	<!--
 	<flag name="java">Build SWIG bindings for Java</flag>
 	<flag name="perl">Build SWIG bindings for Perl</flag>
diff --git a/media-libs/mlt/mlt-0.4.6-r1.ebuild b/media-libs/mlt/mlt-0.4.6-r1.ebuild
deleted file mode 100644
index 7c63e06b034d..000000000000
--- a/media-libs/mlt/mlt-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.6-r1.ebuild,v 1.3 2009/12/28 16:50:22 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs multilib python
-
-DESCRIPTION="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 ~x86-fbsd"
-IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt
-mmx qt4 quicktime sdl sse vorbis xine xml lua python ruby" # java perl php tcl
-
-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 )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk?	( x11-libs/gtk+:2
-		  x11-libs/pango )
-	quicktime? ( media-libs/libquicktime )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	qt4? ( x11-libs/qt-gui:4 )
-	!media-libs/mlt++
-	lua? ( >=dev-lang/lua-5.1.4-r4 )
-	python? ( dev-lang/python )
-	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-1.3.38"
-DEPEND="${RDEPEND}
-	compressed-lumas? ( media-gfx/imagemagick )
-	lua? ( ${SWIG_DEPEND} dev-util/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() {
-#    local fail="USE sox needs also USE libsamplerate enabled."
-#
-#    if use sox && ! use libsamplerate; then
-#        eerror "${fail}"
-#        die "${fail}"
-#    fi
-#}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf="	--enable-gpl
-		--enable-motion-est
-		$(use_enable debug)
-		$(use_enable dv)
-		$(use_enable sse)
-		$(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 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 "emake install failed"
-
-	dodoc docs/*.txt ChangeLog README docs/TODO
-
-	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
-		dodoc play.lua
-	fi
-
-	if use python; then
-		python_version
-		cd "${S}"/src/swig/python
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doins mlt.py
-		exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doexe _mlt.so
-		dodoc play.py
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby
-		exeinto $(/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/mlt/mlt-0.5.0.ebuild b/media-libs/mlt/mlt-0.5.4.ebuild
index 80179dfde6b2..25047a896321 100644
--- a/media-libs/mlt/mlt-0.5.0.ebuild
+++ b/media-libs/mlt/mlt-0.5.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.5.0.ebuild,v 1.2 2010/03/26 08:47:00 ssuominen Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.5.4.ebuild,v 1.1 2010/04/28 11:19:06 ssuominen Exp $
 
+EAPI=3
+PYTHON_DEPEND="python? 2:2.6"
 inherit eutils toolchain-funcs multilib python
 
 DESCRIPTION="An open source multimedia framework, designed and developed for television broadcasting"
@@ -14,9 +14,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt
-mmx qt4 quicktime sdl sse sse2 vorbis xine xml lua python ruby" # java perl php tcl
+mmx qt4 quicktime sdl sse sse2 vorbis xine xml lua python ruby vdpau" # java perl php tcl
 
-RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.5 )
+RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.5[vdpau?] )
 	dv? ( >=media-libs/libdv-0.104 )
 	xml? ( >=dev-libs/libxml2-2.5 )
 	vorbis? ( >=media-libs/libvorbis-1.1.2 )
@@ -34,9 +34,7 @@ RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.5 )
 	qt4? ( x11-libs/qt-gui:4 )
 	!media-libs/mlt++
 	lua? ( >=dev-lang/lua-5.1.4-r4 )
-	python? ( dev-lang/python )
-	ruby? ( dev-lang/ruby )
-	"
+	ruby? ( dev-lang/ruby )"
 #	sox? ( media-sound/sox )
 #	java? ( >=virtual/jre-1.5 )
 #	perl? ( dev-lang/perl )
@@ -46,17 +44,23 @@ RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.5 )
 SWIG_DEPEND=">=dev-lang/swig-1.3.38"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	compressed-lumas? ( media-gfx/imagemagick )
+	compressed-lumas? ( || ( media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick] ) )
 	lua? ( ${SWIG_DEPEND} dev-util/pkgconfig )
 	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${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
+}
+
 src_configure() {
+	use vdpau || export MLT_NO_VDPAU=1
+
 	tc-export CC CXX
 
 	local myconf="--enable-gpl
@@ -120,25 +124,36 @@ src_install() {
 	if use lua; then
 		cd "${S}"/src/swig/lua
 		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so
+		doexe mlt.so || die
 		dodoc play.lua
 	fi
 
 	if use python; then
-		python_version
 		cd "${S}"/src/swig/python
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doins mlt.py
-		exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doexe _mlt.so
+		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 $(/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
-		doexe mlt.so
+		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
+}