Version bump wrt #310071. USE="vdpau" wrt #306361 by Fabio Bonfante. Improve python...
authorSamuli Suominen <ssuominen@gentoo.org>
Wed, 28 Apr 2010 11:19:06 +0000 (11:19 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Wed, 28 Apr 2010 11:19:06 +0000 (11:19 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

media-libs/mlt/ChangeLog
media-libs/mlt/Manifest
media-libs/mlt/metadata.xml
media-libs/mlt/mlt-0.4.6-r1.ebuild [deleted file]
media-libs/mlt/mlt-0.5.4.ebuild [moved from media-libs/mlt/mlt-0.5.0.ebuild with 80% similarity]

index 5a4d998be8746eb8b42fbb6413e06d9c32be6b97..d9925e4c637d5e60f511dfec6e54f4813fd027d5 100644 (file)
@@ -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.
index 5c19eab9fb59bf2f1a82a0562295342a846cc7cf..fb6970be850e4ee09ef3f7557d188fa7dc5f9b1e 100644 (file)
@@ -1,7 +1,6 @@
 DIST mlt-0.4.6.tar.gz 759717 RMD160 e0fcffcfb157576a6757fd953294efdc21f77def SHA1 978da7b578bc919c4cecda708b563b02ab31aa9c SHA256 df0339d98ffc2244a558933b91457c6bc1b2555c4f1f5f4f94a9dce597377dff
-DIST mlt-0.5.0.tar.gz 796572 RMD160 912de93f7b234f39c94af3bcb26a09eeafcdf1e0 SHA1 d9279112cc3b58bd98248ac8ec6daa1524270878 SHA256 6741488a067a79f0149b3e4f9fc81706017b1d0db8415c0b1a9ae2264882c6bf
-EBUILD mlt-0.4.6-r1.ebuild 4062 RMD160 3f80472fbb0a07323290756bb32af1b8d6420418 SHA1 55603a7fdde517f65d1cc043ac830bfb8841893b SHA256 8f49cc77d3eb2df5b082532c905c2c1b093c27082b697b21e4a949e5b6997e11
+DIST mlt-0.5.4.tar.gz 802138 RMD160 429ba2a2d30da29d9f92cd1f80ab75ff48773731 SHA1 8c38f78e99f9eb1b8e06961aebee7213b995144a SHA256 12ea1f2fc8adeda7db0d31c1270e843d9036a65a81fbeac7c885605397fd458b
 EBUILD mlt-0.4.6.ebuild 2699 RMD160 8aca165febc743c3ec0e84f685019310c859548c SHA1 747a2bdd857d04a1850487db150ece4a3acb9931 SHA256 8ee09bebdf0f466d174bbd204d18a7b196980d44566f2e26f6a28bdc46c413e3
-EBUILD mlt-0.5.0.ebuild 3882 RMD160 57ff375c59beb2678769368210d7839a0b1616f8 SHA1 baeab5affded3eaa494dadf8b1e3cde34fceb94e SHA256 9015fab179f1c9fc3838ddd5ee5cef108d7fa52ff1938f30e0b3b49cc3c27373
-MISC ChangeLog 8996 RMD160 ea55b909c173139fb7ed184914c6f1cab5ea0eae SHA1 742f20ae9ee6be5d0c602b196e341450fe71d831 SHA256 020917ca34c276c4ceaa548e156006058a4d2ec9d449d78b3cff49b29b3c6728
-MISC metadata.xml 850 RMD160 113c2c47a3a52f58c2efad7ea9b3eb8e07a5d3f4 SHA1 66a6a4910bdbdedd6e56f06dfe0bf2938b5c710f SHA256 6fc203018ae30c09c4ba181ee1531ef25d63e6a741caf9ac9cfd3861802eaed6
+EBUILD mlt-0.5.4.ebuild 4125 RMD160 9500976ff619f312f9d28b722c380c645c9b62e6 SHA1 419a03cd6d89fabd0a6a01f575466f067c6609b6 SHA256 c775059d98cbc1fbc14fa7c993b4720ab50944ecc3ce0692292f45a613632a78
+MISC ChangeLog 9300 RMD160 873a8c25a9a7084d9e45f7ad7c45803bc831f6ef SHA1 464142300f04ebf703f7d718eb8b2ac48ef628d9 SHA256 f08dafccd35804989ee4caedd1369d56a1d5e1de84a7267024cd01a5fb6e389d
+MISC metadata.xml 902 RMD160 9cbaf3b801eeda6ba3733ffdc947eec947c9c905 SHA1 564c50101ea02bc5b3adc1c94a59962e8652e4f5 SHA256 42ad9c42cec4fbde252f7bfb7656012f7b452525679de4a644697bcbea73b7e6
index b77d299a349750fad73b7f61147e804515b36582..6eb315b850ca6e79ae968c2435abe857b0be2ca1 100644 (file)
@@ -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 (file)
index 7c63e06..0000000
+++ /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
-}
similarity index 80%
rename from media-libs/mlt/mlt-0.5.0.ebuild
rename to media-libs/mlt/mlt-0.5.4.ebuild
index 80179dfde6b2f9415e422c117e567bf9c33e15a5..25047a896321b837f8b918cfa345fd508caf2f6b 100644 (file)
@@ -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
+}