fix automagic on swfdec, by SN (Enlik) in bug #384225

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

4 files changed, 16 insertions, 9 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 51d5d59c1b82..299960634298 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.81 2012/02/25 21:53:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.82 2012/02/25 22:05:03 aballier Exp $
+
+  25 Feb 2012; Alexis Ballier <aballier@gentoo.org> mlt-0.7.6.ebuild,
+  metadata.xml:
+  fix automagic on swfdec, by SN (Enlik) in bug #384225
 
   25 Feb 2012; Alexis Ballier <aballier@gentoo.org> mlt-0.7.6.ebuild:
   fix enabling of vdpau, by gionnico in bug #396113
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index b5b85a5a1fc1..9de362cfe379 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -7,13 +7,13 @@ AUX mlt-0.7.6-ffmpeg.patch 939 RMD160 11f4bf7f72c6b501df8973f11c725c30ce8580fc S
 DIST mlt-0.5.10.tar.gz 819471 RMD160 015053ddb98175adc905d2ccf29ae962f295a9bb SHA1 e0b3d8f77ad6d97d6495614e78dfbbb531e70f77 SHA256 106636540cdf44f670937b8df549ea2c988a27d05e14d4a8670f9b6af5a0d19e
 DIST mlt-0.7.6.tar.gz 1024353 RMD160 898256dfbbda158f51796a7d4468a6a54b9b246d SHA1 f23c8bddb9b1f406c3cfcd155e74f8d9d37b5120 SHA256 f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae
 EBUILD mlt-0.5.10.ebuild 4456 RMD160 d8caa63396701fbf34f00d1c3435b80c2e34a59e SHA1 05ff0316c1ca33a1a08b48239d693855334dfef2 SHA256 679a3206e4eb1efd3fe60e86f730fd2b85a6c1645ebcafcd4482c5d651d16b45
-EBUILD mlt-0.7.6.ebuild 4586 RMD160 50cffaf29038f6144a0a38e1040ead5a7804c70d SHA1 e7de4dcb40b0c56639e8af9d2e7ce32595e87e20 SHA256 cad060414ab47c1bdc731fe1e7c452a51730403b855bb9666677d737dc895fac
-MISC ChangeLog 12576 RMD160 af17aa0bc592788b871cc394651467aa65ccc220 SHA1 d7c78225b8a0afca73f536f93536e35d4c19102e SHA256 7ca00be8e333e7d5af2c5ee882106ab040415a14c646460434b1f6e4b3720c37
-MISC metadata.xml 902 RMD160 9cbaf3b801eeda6ba3733ffdc947eec947c9c905 SHA1 564c50101ea02bc5b3adc1c94a59962e8652e4f5 SHA256 42ad9c42cec4fbde252f7bfb7656012f7b452525679de4a644697bcbea73b7e6
+EBUILD mlt-0.7.6.ebuild 4647 RMD160 778fc8a0f44c723be24ab95b652aeea16cd4a9af SHA1 a304351c7593860fac42f0f43e39928e835bb8ac SHA256 80fdb964a976e49c2773a013519a0ab1bd4c40a0b0d79bd6fa7439decc69777d
+MISC ChangeLog 12719 RMD160 9f58b92fad9091bbd5d13cd6ee00f9bf43e92609 SHA1 61d7c4d565eecaa42149a838545e9337797023a9 SHA256 7a4cd121161c21905237605d446155ab87d5a7570f2e1fcec9384a5915a2912a
+MISC metadata.xml 1029 RMD160 52f790fb6a39be330c84b6062d252568a18067bc SHA1 d74ec117e802209524126e82b644fe29bb7ea046 SHA256 8fbc99a7f3fefd8d7bed72481a885c67c92b599c16cc5135a658e6ae8d64cf78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9JWHUACgkQvFcC4BYPU0rjVgCgmszxk2KPfL7jWmMKghmrWecP
-x4oAnA0s1msLXoJ4Jp1lfeZ8gdqgdWip
-=sGCf
+iEYEARECAAYFAk9JWxUACgkQvFcC4BYPU0otbQCeIQkERy3UabEAWYebq3yS6dGe
+gMkAn1GuD/3vQXtEV3O1Y8K9G6Ip2Q+w
+=QR9i
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 6eb315b850ca..3ec436181317 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="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
 	<flag name="vdpau">Build with vdpau support</flag>
 	<!--
 	<flag name="java">Build SWIG bindings for Java</flag>
diff --git a/media-libs/mlt/mlt-0.7.6.ebuild b/media-libs/mlt/mlt-0.7.6.ebuild
index c2ef043f4e23..4df22da90099 100644
--- a/media-libs/mlt/mlt-0.7.6.ebuild
+++ b/media-libs/mlt/mlt-0.7.6.ebuild
@@ -1,6 +1,6 @@
 # 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.7.6.ebuild,v 1.7 2012/02/25 21:53:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.6.ebuild,v 1.8 2012/02/25 22:05:03 aballier Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -14,7 +14,7 @@ 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 sdl sse sse2 vorbis xine xml lua python ruby vdpau" # java perl php tcl
+mmx qt4 quicktime sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau" # java perl php tcl
 
 RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
 	dv? ( >=media-libs/libdv-0.104 )
@@ -31,6 +31,7 @@ RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
 		media-libs/libexif
 		x11-libs/pango )
 	quicktime? ( media-libs/libquicktime )
+	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++
@@ -79,6 +80,7 @@ src_configure() {
 		$(use_enable dv)
 		$(use_enable sse)
 		$(use_enable sse2)
+		$(use_enable swfdec)
 		$(use_enable gtk gtk2)
 		$(use_enable vorbis)
 		$(use_enable sdl)