Added a system-ffmpeg to =media-video/avidemux-2.6.1, currently it is disabled by default and masked since it does not compile and work yet.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 28 insertions, 13 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 96fda73d2a4f..08bfa20880e1 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.206 2013/03/04 16:34:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.207 2013/03/10 13:58:25 tomwij Exp $
+
+  10 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.1.ebuild,
+  metadata.xml:
+  Added a system-ffmpeg to =media-video/avidemux-2.6.1, currently it is disabled
+  by default and masked since it does not compile and work yet.
 
   04 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.1.ebuild:
   Split magic powder function into EAPI 5 appropriate src_configure, src_compile
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 3021a8fbb1ba..778348dcb872 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -8,17 +8,17 @@ DIST avidemux_2.6.0.tar.gz 16145705 SHA256 5ee2d898794141b47bc288e9b0fb770eff831
 DIST avidemux_2.6.1.tar.gz 16537020 SHA256 17ad853a306e6cfed9166ee36b014748ea7b24a62e035b489ed97fbd8d91afc2 SHA512 3a4e1ca21abe014c944549dbb51e1b8588fdd71b147191f01ee47a402ef45a35e8cf5cbf08924f7e1581f961a3ec3eaec570f9c8c3081abffa9752b11008c26f WHIRLPOOL addd80555f423253a46c02a75980e2b70bf03631a378daae86fc66efca4420ae1a2e07b04ba5c00e4e5a7ab7c522344540b3f6c36209233ce1a8d7cde09c1309
 EBUILD avidemux-2.5.6-r2.ebuild 4393 SHA256 95fd317399d57acf75cf0baf73fb487c5143b3dd3af4b0aa1537a9b4c4994776 SHA512 bfc5e96966c46bb52d0f9da586b3c5ccb693561c5008c0d06d7921f649fee0a8fe13eca61947793d272e4e661d42c029e57779e4f7630c7db539fd39610b1c11 WHIRLPOOL 591f6ac35e8e83e0454e3545d9a70d76d27d9de3fee4ecdd6adf3cb4488637eaed8091771c193f3fc893e7094c6c659c5fef25985473171a95e54ac3064b7e16
 EBUILD avidemux-2.6.0.ebuild 5951 SHA256 5267025ecb887f15805b878170dbd81ff7c00e6f0255d954c9a162e2c85471e3 SHA512 c20cacd565d008ef902e0eb107c3449b03881547d0f203595933a37c99b916f1e57a644c3b77b0204b3efbe05025192d69386a2a7e0c210dbf03ebdd5d6b733f WHIRLPOOL ff982e90a4908055588697cbd587cc51a4720a81ec31221417232c708149bba8b1b1e24f11ef7f9159246c8fd93db06083f3927d79ab24a7ad32a5ed93d4bd3d
-EBUILD avidemux-2.6.1.ebuild 6147 SHA256 cb8d4eacd5c628a7fefc9d9103c4ac4fad0c55a5f6b4cf64b80d481642d8275a SHA512 c9cfab5f7a34ca45115480d76c0cf28c4643cb70f6470028579f9d5d6310d9f6a6f2c4c32099c46cc62b491257208f7667e0075ba268831176d66d746cb06dc6 WHIRLPOOL 8f8ef72f4fd58b590604fa84922735a0ff21dba618fc402a935cefda08bd6d6208c191f0dd8132cbffe3413f6408ca7378b2be4370ceec97d1f191f69d90423c
-MISC ChangeLog 37903 SHA256 a82d66ada2acd6d9d0b2aff8ea930b0b2baf567ce170fd6718134290b4bee280 SHA512 df45d5d241e871a13600517d4f13345ccc64737afda40a109c062647239bc37d99c6c20a2cb194d91784e98fcda49767c745a9a9ec70448855d600d3ea9e77ed WHIRLPOOL 7ae2c5c01138d5cfac27d4da02008e01e4eebe4fea337938e256109c48ff9d0b0321feb90c52d47f9f18125598c8d5cd1580183fbd73a32a175772d3a1ea2fd4
-MISC metadata.xml 540 SHA256 f1410337c0d9a5ac6defbaa4a30c00711a2698bbd7f741db3153e9d055f3166b SHA512 964848c238bf50ce85bf58d794bb6c7b44b7607f7ecac873622f1cad830f30a7f727f7a103a8e05b2547a2961ca6e1a4db0471d151c3502b124fc583758ca49f WHIRLPOOL a3b194c507357fdf4fc7380d020f1f0306f37e19c5de35b9398a3d468208aab52fa7f41e484bce0728a4592cd3c11ce069a75cacfaf1f760215298b424322e53
+EBUILD avidemux-2.6.1.ebuild 6715 SHA256 c078098b9ace625def5b5333a414d06a3986fefbd9f6b328cf9ebaf993b4b647 SHA512 d097d0fc96118d7ce8f6456c6887c8b4958763ee736c293bb2a61f319509a273806a96c7dc2bb2973e3c546aaef1a36dc740eb63907e5a7c74f1754d4b86bc2d WHIRLPOOL 42fb291778c1991615a6f776d3959d46e9a2cabcc7c057a9e153e8837613f05eef543cb0045219b2dd774a49dee174c7190909a1f8d31fdcc2dfcbf10d7feee2
+MISC ChangeLog 38135 SHA256 0b4e754e4e67ba5b4c183b485b6d7bc57ee12cff9eb17534f242ceda61b94ece SHA512 d929b15ff9aa9ee3f9a60cdbf3ae89e7413613883dcc3f83d9780c28813515b21d6ac7013fd9dce98aa7a65a64403705772e3b5569c62b1f5803efc7afba990e WHIRLPOOL 89ca3ea988a6b72d4b85bc56c522dfc71892725636458b9a70e24111c3f57daa1f10f4eac0d6df6e3000f3ae9041413cb2b9473d027a5044aceab2a2057ed5d9
+MISC metadata.xml 617 SHA256 cc07206012811ca8352bb16dbd3df6cd73d4f38e804f78261a2e4b89ecd8dc01 SHA512 bedd22470fd3c99eefb882a0fb8f7528c55a3d181c3da08bc1bc44261580074c606c6c9dd1f6854c67e47eef0d3ebf36b3613f2df356a1205d3318e5eed9283a WHIRLPOOL 383957513383cff90961b30e8b060b2068bd9778840047bd321c717938f3bf3a30959af52ee5c29d2ab7a62fe8635794eed644cc8e885469d7cd9ee009bf4ce6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRNM0qAAoJEJWyH81tNOV9AfIH/0vRRrHkrvvVEBgCgrNyM34A
-5pioEX1hq/JR3Twza+OkoJULOMc3eAf3nY2dzW46voYqMLYK3wvRMkWe2vS5r9n6
-vmt0CBgjTsWuiz73bkOsyzrdYUUtTsxUfHd6ixb33BzJfPvBB5ltNHHAl9ta0qkc
-qYXhnhZ/ttehMhW3f1yEqSGlpBERLvlYNWRInoZapbNsKZ48BykvZy/Q6ipD9VXe
-cMCPbv+JwhEiibqwzib3CPGu07e3fUrWofz/28w8QdPujEi521bXgM5y32erg3xg
-HMzcv5BIcBG7GtehilTd8d56EZ1qWzmcSEwREXNs5+tJwFtGoU771jxZaWNMFz8=
-=nXuB
+iQEcBAEBCAAGBQJRPJF/AAoJEJWyH81tNOV9cS4H/0+x4QQYjP/Q9p86vr3T4+c2
+SFooAdG//Y0uQFI5LTKqTcWUt7vr6AtIyeVPreWXaaSV7QUxsdbzS/rxr5gmwHcG
+Y8sUOVWZICIvfxFno48xYsEWybd0WMZGu2OFa7giw+UMd7UD+BTxtMdmCBPK2j6H
+zfrB6ZIf6ho+mC/FtnIgN+b0NhurOVGxGuULqsrSHnI7qqTMU0CqkM2G+cAsBPq8
+GQevkQyE02ak8JSrwKxfiyLz3mFdulZegu2uOFA1HVKzbtcsRJXWFaXq2PD7QkDx
+IuCFPCeq8/iNaxukshB/kXQhdydukp0GvXDAgqAXY2sneJXdOO2lu9OnXLUaKzk=
+=F33N
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.1.ebuild b/media-video/avidemux/avidemux-2.6.1.ebuild
index d71521f3469a..42a8fa1d76c3 100644
--- a/media-video/avidemux/avidemux-2.6.1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.3 2013/03/04 16:34:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.4 2013/03/10 13:58:25 tomwij Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264"
+IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl -system-ffmpeg vorbis truetype xvid xv oss x264"
 
 RDEPEND="
 	>=dev-lang/spidermonkey-1.5-r2
@@ -40,6 +40,7 @@ RDEPEND="
 	lame? ( media-sound/lame )
 	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
 	sdl? ( media-libs/libsdl )
+	system-ffmpeg? ( >=media-video/ffmpeg-1.0[aac,cpudetection,mp3,theora] )
 	truetype? ( >=media-libs/freetype-2.1.5 )
 	x264? ( media-libs/x264 )
 	xv? ( x11-libs/libXv )
@@ -110,6 +111,14 @@ src_prepare() {
 	# The desktop file is broken. It uses avidemux2 instead of avidemux3
 	# so it will actually launch avidemux-2.5 if it is installed.
 	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die "Desktop file fix failed."
+
+	if use system-ffmpeg ; then
+		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "Failed to remove ffmpeg."
+
+		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
+		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
+		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "Failed to remove ffmpeg."
+	fi
 }
 
 src_configure() {
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index f4aa850387b7..8002939d58ff 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -9,6 +9,7 @@
   <use>
     <flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg></flag>
+    <flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
     <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
   </use>
 </pkgmetadata>