Version bump. Set target-arch for cross-compiling, bug #447746

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

3 files changed, 196 insertions, 18 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 1ca226adef5d..444e1f3e7749 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.104 2013/03/02 21:46:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.105 2013/07/12 13:05:57 aballier Exp $
+
+*mlt-0.9.0 (12 Jul 2013)
+
+  12 Jul 2013; Alexis Ballier <aballier@gentoo.org> +mlt-0.9.0.ebuild:
+  Version bump. Set target-arch for cross-compiling, bug #447746
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> mlt-0.7.8.ebuild,
   mlt-0.8.2.ebuild, mlt-0.8.6-r1.ebuild, mlt-0.8.8.ebuild:
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index e0d0cb278939..0a9cf9ec8a98 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -10,28 +10,18 @@ DIST mlt-0.7.8.tar.gz 1106625 SHA256 95833b2746e2d71dd42f6163e1a5d863c7d4772cc34
 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
 DIST mlt-0.8.8.tar.gz 1108652 SHA256 cc0e1cdb97a1cd59811a74553b5d3fbff590eb859c475253e188de1069ff9654 SHA512 d29d982632dec14e4397db602688816e06f095b1831514a816bc7640d574a04d3d56cc16240ea0a01229887e95c80891b87c5df981063cb2d6a14b50ff67589f WHIRLPOOL 6e5665e5b4c9471d252faea7073cfd21580e31b55941ba51a415783d79bec3d857fcd01f111da25e24551a3f03a728390e17ab9b127e1bd0977bac94c83162a5
+DIST mlt-0.9.0.tar.gz 1167943 SHA256 f20c6a9c9acaed3da84c601bf9293b2d148168386e5be2bc55651a75f95c1cc9 SHA512 631ab41ee6e3673c712f784b9c02b567a5e3b982d49eabe032ef20e89be9424cf9ce6d97fe6906f03b0ac082544316ba8524ae041d017aeac009ab9b98d457d9 WHIRLPOOL b39e78837f2f2785721315ac174d106e33bafd2dd55b8883b254a39dc98f664be29ce3e84413d2ba55f881bb42ca10c36a9117de00b1a5efc3dff8577a6a29af
 EBUILD mlt-0.7.8.ebuild 4804 SHA256 9d14d003f8b45c09b5a3dbcf316220a255bd864800512ef5178ce24624540985 SHA512 443e075d54fb068e7399a08f6d540cd3749ae3b7ad305fa8d9aae79c75aa2a883b36b5b074f0bd3177c8642051d5c7bc434baf14bcf568186f3ad3b259c5859f WHIRLPOOL 0e36298d16f99a5d7f089c933bc01b232595f5a6d3b0c412067dd6c48f8cdd21237660e91531b8789dbc52b30aa01a545d7a813d2c0ac908adfc174926d2d735
 EBUILD mlt-0.8.2.ebuild 4826 SHA256 0a7b8f0ff6325c7fa2ea222ade18a84d0a262f3bda3c698a42d8c92d1705d487 SHA512 5907d108463030ea0a2fa9e82a25df85a24ea8e8728efc23550cab5c61b2c47e9fba3877e09657027e5c1cda788926eb013f2b0e0f2c58b9e71de139af5c15ac WHIRLPOOL 71202b191a3f0bb112b4665067318d766b7595b39319387d3257764f8cc5f9335b80b8bfb8af725ad362fd0460b61151affce5b4b5f125d9a402a64d02f33a2b
 EBUILD mlt-0.8.6-r1.ebuild 4924 SHA256 9d78b8903d7e6a54c2d02329b534724e249bf64d6246f89064952d38251e4da6 SHA512 86a620727b3bce2f7ead08e63964d802047ee279533f00cf07267639a9a559c46e10711ed1e86910d50245acc1f056873264809b2cdcf61275024b43def498ea WHIRLPOOL c259d2fea667a22d61a826cbaa54d13788e399b261acf96fa29fe9989c89c4c3011e1661e30ae638a864cae1571e2323d0a63a06544731fe28498ac534e19d20
 EBUILD mlt-0.8.8.ebuild 4900 SHA256 866171c3691c3b4c9958027e209ca191cd1187f1d5a8eff93e811892583ac02f SHA512 e7e777fd8447d4d4ca4f0d1bd0124deceaa1ed690e173d90aadc9b3f552e9ff34492a444945d59a91a79fbbd0a33186e387ef2904e4f9361b34d3bdb05f4eb32 WHIRLPOOL b3a910b23d4946081139eda2e6a857635d15e945febc2e606b7312642e86f37615d2fe0439a8cd52634ca8a6e90a2e3ffc8f5510dd8d861255fa52c1589a7fbf
-MISC ChangeLog 16043 SHA256 775cfa6c562a0da69540e4011df1a2ac7d2741016171871e3de3df2ad0f98ed9 SHA512 c7b76cc95c95c898fe5515aa8a5fc2cdd91043b9978d2babc7eef3ebf8f30f97b6dceb321d25e0c51065a5c3dc7316ff77de5cb492ed5a917a0ed84c6ed0144b WHIRLPOOL 9b4bf21a933e031ba5e972d9387af903c14105f7ada36348cd1554e810eb10757abcb41745faa96d2882dd1b1c3ad8147706b35f803e1d75ef85d990389df31c
+EBUILD mlt-0.9.0.ebuild 4934 SHA256 2264a69baadc0bc9383bdf76dba95ee68cf0380de341a6e7cd8f0f0802eab924 SHA512 ac183d34f002a55548bf67aded67c2166f23a8d976f55948652545eaaf92f50763c6ab207667413d233482a7838f1770cc2fc68b4f6527b391be0af3970cd5e3 WHIRLPOOL f2cffcaf64e91cce91529abbd5311de20eb1c5e213e4b84551c34bdb169c1213765be1b25e6ca2e7a3574b49cfee77a555a86efe3ee2172a1bf8c33a7533349a
+MISC ChangeLog 16206 SHA256 4a386ccd617f3ef4a16b5b56979bc859e16eb22fab5a6a99a02f6d18d67ccafc SHA512 2f37a5ff01e159c04abf670ea6c8b68783fd00c269cce7c5cb6515b874c69613319baf68c791e146f920ac8f273392e7e9780fd4bfb112e3a89ace44119ff1ee WHIRLPOOL 24f28ca953a0fe949af6b6e36449952d3b4874fda07b4bda9ea3f7a5b096cbfa57d38a05f808fd84e8443bc3af540b06703aadea7a3b52dc91305ef10c9929e8
 MISC metadata.xml 1157 SHA256 08612c2ce4f642148f14f2d86c4eb8813cadabecd8e7ef3dcf13349cc3eda05a SHA512 38e69c1a4eb98dc6065bb26ae41f5bb75be53d81b3851ab3c9e83cfdb7d5e67f91c8a4d52d6ac4f5eadcaee0e3e768baee24c8d3faf2bc6579359bb89fbe53c8 WHIRLPOOL b8165ab773ae549bb89f7031f892b6ab81fedfe670f4131a0ac089373d2b520a630e101513872bf2225f3061dc0793a9b16563e3be9c9c625ef920447b6166df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMnMiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88zYQP/A55SozTKy0g4XoD44Jqik/1
-EHRS+hwrtuPTybWA+5IEEqs2fue/HugAOVHXowMKH0RGnFY5n5YnckzkFSQw/lMP
-zayzJDD2SKiI3ZU6y3/55yHF13c73Cv+7mNHdeEymkEcmljDP5DkKhD7zS3j4P4t
-CozPAs2aIqa6Y/lqnNYEqgN0r/yj7NztBDz4ve//YdK8BCk78Fp+3/OpKKqhXgx0
-n6ZghXjcGEKpBz8OXmuVlYp8qIDVPdkIBnXIFpdkFti0lIp6WVCnE9JApeunFXBD
-TDGkpn3qoJiWdFlDyKZokl3MB1+ds1xBytcqxLPBllu5Ep9ha3e+WP3bGgyVhSYG
-4IFCty3DOnxyghdcEtONzz/1xRKb0u4c/NsIn+ThUDoAtXuljTtGR/NniDIk3JXZ
-AUMNB6UzGcVWi6J/98ez8usq4J0sfoV0QvTrns4KbBCK3sz6Q9D8HSmDdIsS54zR
-g9Z4OdD3d3DOawSmsP1ulCt2ifn8yWXZprtnh9e+jjSLYH2+myoC/+RpYmvxIVfj
-53JCmQ6fWdT7k2akOYhSTtPCx7IHhsrlbKi6jTBYIDPVsV+1UKO48Nf+YhT/PPTK
-1mUrHDyGGW//of+Gkf3s6E0+LDYcc0BHcGCxo2O6TxdhKPRlLtyw6USznb/S+k2z
-lhXyKqn/V/JG9at1vMIo
-=lLfN
+iEYEAREIAAYFAlHf/zcACgkQvFcC4BYPU0q7ZgCfQqYB607Yzpk5t6bka9qCGvFP
+EnMAniNkVdiMuV4ExH97oGzQRWdncRip
+=RRdJ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/mlt-0.9.0.ebuild b/media-libs/mlt/mlt-0.9.0.ebuild
new file mode 100644
index 000000000000..380ec37f1f26
--- /dev/null
+++ b/media-libs/mlt/mlt-0.9.0.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v 1.1 2013/07/12 13:05:57 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-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive 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? ( dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		media-libs/libexif )
+	kde? ( kde-base/kdelibs: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
+
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf="--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch-kernel)
+		$(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 kdenlive)
+		$(use_enable qt4 qimage)
+		--disable-sox"
+		#$(use_enable sox)  FIXME
+
+	use ffmpeg && myconf="${myconf} --avformat-swscale"
+	use kde || myconf="${myconf} --without-kde"
+	(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
+}