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.

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 18 insertions, 3 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/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>