version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 216 insertions, 2 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index ce4c1f09547d..c1b5871ab71a 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.97 2012/11/20 20:07:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.98 2012/11/21 00:48:52 aballier Exp $
+
+*mlt-0.8.6 (21 Nov 2012)
+
+  21 Nov 2012; Alexis Ballier <aballier@gentoo.org> +mlt-0.8.6.ebuild,
+  +files/mlt-0.8.6-ruby-link.patch:
+  version bump
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> mlt-0.8.2.ebuild:
   Stable for x86, wrt bug #441382
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 52b596632b3c..727627fc4fb9 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mlt-0.7.2-ruby-link.patch 680 SHA256 fbcf41da78bc150afd2fcc5394eda2022d2c19d7b1cb788910b443b64d0cdd56 SHA512 ef0dceab4355e56eeb2b812d05a9a9c4855b3af2d6a8a27f8b0ee63ea0158a31c187858dc6c7a5e570711322e62adde9d86bcb6c361d55862ebeacedc60cb287 WHIRLPOOL 4474b009e35b30c20f206bf2ae6d06d5eac694768dead867b03ff3b9ddab8f6884959e8c3a730c8068c9cce783dc6dee227b9ead890df5bde531210e7321fcc0
 AUX mlt-0.7.8-libavcodec54.patch 677 SHA256 ad720784b728699eada59f44be2f63a834b16ce076acce36f7f74bba1b55b125 SHA512 79a2b3b22841d137b4add9b15437f11f6a8e66d2d3aad41f2ddcfd16c30571f54c2cfea7865b291232a8e047295202321b3a75dd5007ba361cd43958ab6c0f1d WHIRLPOOL fb337266f91f0d71790ba5815bf74fd3a49080f9c9b95f362ab3d48224c3dd5afaacf25fdb69e56ad63e7e1fefa000af62e3c9c8217f7a18364eb4f1542b4bd9
 AUX mlt-0.8.2-av_codec_is_encoder.patch 1480 SHA256 823199f9a0090d0076a3131c3fa6a6854986fa16b472e022aa6edacff2b2e901 SHA512 5c1d9081b651246bfce8fef8d109a633a7c2997de5fb6f3c3bf08a7ff4b614a6646b48e30a70ae211e3af0e10232c87aa67bfd6a3b11ca4489b127d8e67d7ea9 WHIRLPOOL 4a5798e7d430dfd23e337a693f5b47094aa668fd3cfb888870da8a0863c319c32164abb59c0af1de4578c944485520625ea2b0f57869df30dcee44d2da677001
+AUX mlt-0.8.6-ruby-link.patch 682 SHA256 2a0b7cadd8f37e2052392435ce8709e121601bf2a34afe2d6c1b6c1b5bb6a6a7 SHA512 a0d847cf07a3f65f1ed68074bd1306219d89463aa4abe5b0285b09d6da3f495b234bf946f868406ce4a9305377a60ac707c5d326fc579529aa96173c834048c6 WHIRLPOOL ab58a4fc0fe575673d9bbc05280e928e6cbeefac1994fefa0dbc2e2d5091d361cfd1d29f57aa8641f662c222bc05d2795a2c620681ff8864c5ac2205aea782a6
 DIST mlt-0.7.8.tar.gz 1106625 SHA256 95833b2746e2d71dd42f6163e1a5d863c7d4772cc344a840f5555d0dc1946e43 SHA512 c0a91852d060cb643da488d5cb8a02b6fa10473a0adf9651446c3c3fd8c47f6dc7f615a124bed3a89dafd81dea2ecd4a0071a8068296002cec0457d61deb3b64 WHIRLPOOL b31a39a80a653f5e9f4793a163c4ae8e4dd94e59593b13eaf7ceb706ae1ff3a3e4c3b83f75ce50abd4060626b42f4488b6e9335fa42a9e3027b6704c43677576
 DIST mlt-0.8.2.tar.gz 1161293 SHA256 36c743d2abc68ce737ac526507fc2caf71b3d6a53a2bf31d22e8193a8b899577 SHA512 ab71018e5a188b95d91b4aceeb4ca0dfc59d0dd981ec3e4fa220b91ce812e2c98ebad1d51998005c6bc98999c7478444c8bfd398d61bd2084ff732a1638ca6aa WHIRLPOOL 4d72efbffd2f7c77041065c948c18ccbb4a65eb7f4ec7209ccde15e142fee84c70324390bc921c0302c30ad7673336c8cf00be8c710154fe31c8a3063987622b
+DIST mlt-0.8.6.tar.gz 1104163 SHA256 8323e546a661942c5bb880886a949e8243f9b53082cb3464a54009280c5bbb3f SHA512 b02fb7265ec29189c8927a2f6c2b6bfdce6dba8883248d654fa422dae88b153e4493b7915f2eedfda4fe0630d64554775f176aa544dd7281ca79494ac9edf1da WHIRLPOOL 2033634ed9c53d21ae9235061310d721fbb42d946842621f6043aaea809a61cf8945b426e4677d0edac11e42d20ab30a811ce70cf2509ed551f5e25afd6bb2d2
 EBUILD mlt-0.7.8.ebuild 4811 SHA256 ef8a2b0e420860011264cb640ae23e1c0cd8ba84325e86815a816610bda7cdcf SHA512 404bc35fc20f15d7d47224d236a713324f6ef67f11a8933ce3cd9b2a1138de009ac263b47647a367ccc1e67918c212263c11602d19d722619cb3c38ed653d4a4 WHIRLPOOL 5d80b630c7e762768ffaa38e27fdbb6f9a107b1d56c25cb641f1bc6e5eff5eb9a0c0cabcfcfd4666b35ec1955929407a62281b0ea7b677883a7c98c9ea4ccb50
 EBUILD mlt-0.8.2.ebuild 4827 SHA256 1071e8d3642b3d454ba6dc404a1300d9068993a1b2cd260cd963f22d2892f309 SHA512 302c8e86cdea3449dff24c85fcacb837c9f76e20b85ed2e107b88f1c76259a2e816d9874ee6b99da5158207f6f07fe69eef3a8e33b02890a75733ebea70539ab WHIRLPOOL 2ec260d989c7a2e050f71f71f0ea1af1e1d981f56e032399e1bb6239092ad554fec5ef68ce43b7af7780b395e04ba1c0d3405b5861dae25c8f53683c3e4270c7
-MISC ChangeLog 14943 SHA256 d32838e62f8badef1521b4cf7623113243ccd7ca12fff0f200461d82429330ad SHA512 c4c7099f540a816fa3beb79ac2bbc54a214b13f5480d2341439a49380e174306beef6869d236566171a95f985398b685a7f2fc28efe1899a7d40ab6a8394fd50 WHIRLPOOL 4fcedbd98b344a2d4bc59da0b15907af8203bad855d3607383bcc453004b4dc3577df65bbbdceb8c4b2988c20e617f2e675726a54c537ce6f18464937e8eae4f
+EBUILD mlt-0.8.6.ebuild 4774 SHA256 bb03cda7bd741b5d5723aa6e852bf3a3512e7ca54eb386769f2f56076ce92c6d SHA512 bce133d7b75560d450b91339936bf7eb404a6bb35f427b30b27dd8a334dc852ab13b8c6c5c77b64f53fa8bcd81d6c6cf2670ddf867732f972c9115da5ef88666 WHIRLPOOL 538c56d15a362e99a18009631940b371d98e782ac5069b08175d0a7e4ea4ccc1f4296d1ac0e2ed43737233a26c4502af913b662ea5dad7401fa054ea10fff897
+MISC ChangeLog 15097 SHA256 a4b086416cf2ada4441f6844e5d2f15b10d5611fef3a79e774b2b07b0cf9025f SHA512 dcb5a6f4215bda49c3194814d52a567bec52cdfc1c04147442722a6c9b763431714d8615e122331349b699a4ffb49b5d62d3331d379d56b5249515891a7ddddc WHIRLPOOL 564b27cec93cf9c03727ac243abc86bf35b9f9fa826e8bbc739d9ce5f75e995c4226d36753518379be8c47946ba9dc7092bbcabfe7c5a674816d8c997e28a45a
 MISC metadata.xml 1130 SHA256 fbd5e5c1f43b4e3729ffb08a460281d9214e2ce42b2ff0b24f6ace960e65f48a SHA512 38addd8066df26e66b903c70f87fa48309024abde4373b3539ea2f98344b42f9d57fe4f313d83962f010858e51a4f9cfa6ca2b35f441a5b6280cd24877be2411 WHIRLPOOL cbe57172a822b724d0d9a2fcb9c2a88df1de8fdbcb79941664cf0925203cfe29f2a156a815629708319bd23b0f8f28c533bdc6d8b0c91d41f95b38d6758e42c8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCsJPUACgkQvFcC4BYPU0pZVQCeKNt4jBbb75J50rku2AeyEilG
+IAEAoJLIzkckqZOZOHfKby1zDw1Ozqin
+=wO+4
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch b/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch
new file mode 100644
index 000000000000..fa4ec8aec05a
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch
@@ -0,0 +1,19 @@
+The build system tries to link to installed system libraries first, which 
+fails because the ABI has changed...
+
+Index: mlt-0.8.6/src/swig/ruby/build
+===================================================================
+--- mlt-0.8.6.orig/src/swig/ruby/build
++++ mlt-0.8.6/src/swig/ruby/build
+@@ -5,8 +5,10 @@ if ARGV.shift == 'clean'
+   exit 0
+ end
+ system( "ln -sf ../mlt.i" )
++system( "ln -sf ../../framework/libmlt.so" )
++system( "ln -sf ../../mlt++/libmlt++.so" )
+ system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
+ $CFLAGS += " -I../.. " + ENV['CXXFLAGS']
+-$LDFLAGS += " -L../../mlt++ -lmlt++"
++$LIBS += " -lmlt++ -lmlt -lstdc++"
+ create_makefile('mlt')
+ system( "make" )
diff --git a/media-libs/mlt/mlt-0.8.6.ebuild b/media-libs/mlt/mlt-0.8.6.ebuild
new file mode 100644
index 000000000000..86c3a70fb11d
--- /dev/null
+++ b/media-libs/mlt/mlt-0.8.6.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.6.ebuild,v 1.1 2012/11/21 00:48:52 aballier 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.8.6-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
+}