Version bump to 2.6.3. Reworked USE flags to be more specific to each avidemux package, the way it is meant to be; introduced additional support for some libraries through USE flags as a conseuence.

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

3 files changed, 142 insertions, 3 deletions

diff --git a/media-libs/avidemux-plugins/ChangeLog b/media-libs/avidemux-plugins/ChangeLog
index 8ec78e68dc9a..fd2973ba5459 100644
--- a/media-libs/avidemux-plugins/ChangeLog
+++ b/media-libs/avidemux-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/avidemux-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.2 2013/03/24 11:12:34 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.3 2013/03/29 15:12:51 tomwij Exp $
+
+*avidemux-plugins-2.6.3 (29 Mar 2013)
+
+  29 Mar 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-plugins-2.6.3.ebuild,
+  metadata.xml:
+  Version bump to 2.6.3. Reworked USE flags to be more specific to each avidemux
+  package, the way it is meant to be; introduced additional support for some
+  libraries through USE flags as a conseuence.
 
 *avidemux-plugins-2.6.2-r2 (24 Mar 2013)
 
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild
new file mode 100644
index 000000000000..f26c4d2c7f8a
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild,v 1.1 2013/03/29 15:12:51 tomwij Exp $
+
+EAPI="5"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
+
+SLOT="2.6"
+MY_PN="${PN/-plugins/}"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/${MY_PN}"
+SRC_URI="mirror://sourceforge/${MY_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 faac faad fontconfig fribidi jack lame libsamplerate mmx opengl oss qt4 vorbis truetype twolame xvid x264 vpx"
+
+DEPEND="
+	=media-video/avidemux-${PV}[opengl?]
+	>=dev-lang/spidermonkey-1.5-r2
+	dev-libs/libxml2
+	media-libs/libpng
+	virtual/libiconv
+	aften? ( media-libs/aften )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
+	amr? ( media-libs/opencore-amr )
+	dts? ( media-libs/libdca )
+	faac? ( media-libs/faac )
+	faad? ( media-libs/faad2 )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	jack? (
+		media-sound/jack-audio-connection-kit
+		libsamplerate? ( media-libs/libsamplerate )
+	)
+	lame? ( media-sound/lame )
+	oss? ( virtual/os-headers )
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	twolame? ( media-sound/twolame )
+	x264? ( media-libs/x264 )
+	xvid? ( media-libs/xvid )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx )
+"
+RDEPEND="$DEPEND"
+
+S="${WORKDIR}/${MY_P}"
+
+PROCESSES="buildPluginsCommon:avidemux_plugins
+	buildPluginsCLI:avidemux_plugins"
+
+use qt4 && PROCESSES+=" buildPluginsQt4:avidemux_plugins"
+
+src_configure() {
+	local x mycmakeargs plugin_ui extra_mycmakeargs
+
+	mycmakeargs="
+		$(cmake-utils_use fontconfig FONTCONFIG)
+		$(cmake-utils_use truetype FREETYPE2)
+		$(cmake-utils_use x264 X264)
+	"
+
+	use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+		DEST="${PROCESS#*:}"
+
+		mkdir "${S}"/${SOURCE} || die "Can't create build folder."
+		cd "${S}"/${SOURCE} || die "Can't enter build folder."
+
+		if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then
+			plugin_ui="-DPLUGIN_UI=COMMON"
+
+			extra_mycmakeargs="
+				$(cmake-utils_use amr OPENCORE_AMRWB)
+				$(cmake-utils_use amr OPENCORE_AMRNB)
+				$(cmake-utils_use dts LIBDCA)
+				$(cmake-utils_use faad FAAD)
+				$(cmake-utils_use jack JACK)
+				$(cmake-utils_use vorbis VORBIS)
+			"
+		elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then
+			plugin_ui="-DPLUGIN_UI=CLI"
+			extra_mycmakeargs=""
+		elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then
+			plugin_ui="-DPLUGIN_UI=QT4"
+			extra_mycmakeargs=""
+		fi
+
+		cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
+			-DCMAKE_INSTALL_PREFIX="/usr" \
+			${mycmakeargs} ${extra_mycmakeargs} ${plugin_ui} -G "Unix Makefiles" ../"${DEST}${POSTFIX}/" || die "cmake failed."
+	done
+}
+
+src_compile() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+
+		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	done
+}
+
+src_install() {
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+
+		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+		emake DESTDIR="${ED}" install
+	done
+}
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index f8b59070e559..f726581edae9 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -7,7 +7,12 @@
   </maintainer>
   <herd>video</herd>
   <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="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="faac">Enable free MPEG-4 audio codecs support via <pkg>media-libs/faac</pkg>.</flag>
+    <flag name="faad">Enable AAC audio decoding library support via <pkg>media-libs/faad2</pkg>.</flag>
+    <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
+    <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
+    <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>
   </use>
 </pkgmetadata>