Version bump, dropping ~ppc keyword due to opencore-amr not keyworded yet for ppc (bug #283839).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 183 insertions, 3 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 59add5c05d85..05e0c7fd5122 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.151 2009/08/15 21:18:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.152 2009/09/24 15:50:25 ayoy Exp $
+
+*avidemux-2.5.1-r1 (24 Sep 2009)
+
+  24 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> +avidemux-2.5.1-r1.ebuild,
+  metadata.xml:
+  Version bump, dropping ~ppc keyword due to opencore-amr not keyworded yet
+  for ppc (bug #283839).
 
   15 Aug 2009; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.3.ebuild:
   Remove old
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 08d8945dd024..3a20a1695a25 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX avidemux-2.4-cmake264.patch 820 RMD160 e02c32891a257dd6e14e2b6aa464232cea222429 SHA1 387804ad24a816a24a036b57692cee9ff13e728f SHA256 693958df6c16d467e3c4a0b9dc56861c2c1bf8eed051de5cd7422b274d5d68af
 AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
 AUX avidemux-2.4-libdca.patch 949 RMD160 53ec97b26441f2617566dbb949496be72ecbc07c SHA1 91ff55452ed9bdaabd76fa41add4c405bf6b8405 SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e
@@ -6,9 +9,19 @@ AUX avidemux-2.4.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe
 AUX avidemux-2.4.4-gcc-4.4.patch 3946 RMD160 1be6fb90f05befb0399ef38ccb6358d082f27b0a SHA1 63de9ce7999af1b9f94c01b14ccd049c2b27f32a SHA256 d8e2392b4eb4a0e5573fe5bac10a9ac57ae0f16207e613543d8e61d7527914af
 AUX lavcodec-mpegvideo_mmx-asm-fix.patch 2443 RMD160 3b1b315ef1e5083f95807ce5419196c832a66aad SHA1 0bd5ca05d373f7fd63cafb03d5514cfc86d8504c SHA256 c6cfcf06da8a254e542077a7ac728be220d41fc0ad3c4b7001ac63de5f36bc6c
 DIST avidemux-2.5.0-patches-1.tar.bz2 6371 RMD160 8abb2f7645f7e3992a802c8f8abbce5982f4933b SHA1 78961a826384ab3e6959f5ef3a1c5bb74337c683 SHA256 7bff6f272ede8d8581fcfe46deaafc20ab064e904e255351bcac9c5aef07297b
+DIST avidemux-2.5.1-patches-1.tar.bz2 3700 RMD160 6150cef25c8411c76816f800bc1d688e2771bebe SHA1 bdc6aab3f19c1ef71f3e04c23435f22452651fd9 SHA256 bcd472ea7c5f96c8bf8f48c2c93d53804912e94c77120dc8739e2c0ab122d69c
 DIST avidemux_2.4.4.tar.gz 6894690 RMD160 8bb2705b3e2d5379d833ec4fa06a01b897c06e04 SHA1 c50a00caf13a8ea1053e5994edeb59354192e18e SHA256 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956
 DIST avidemux_2.5.0.tar.gz 12806613 RMD160 e2a385af627d41bede2231e62893dbb957e75fc3 SHA1 9697f1a54006e362a361aa609d3bdc1065676fb2 SHA256 9c92a8de1bfa82bd8f01dff27a953434c8042646babe1b0949620de86d449a7a
+DIST avidemux_2.5.1.tar.gz 13020725 RMD160 fc12d01cf4b98ddcf635c20b32f8890cc70ab23a SHA1 50fe78548e0ebf0611d23aa4755f332056520392 SHA256 2f5546b8a95da23f5c43202d9c7b465dd7a0012d689d483ad7eb44bae8ca5c92
 EBUILD avidemux-2.4.4-r2.ebuild 3569 RMD160 40c9ed0aa804e8522114a0dbeae1450e0ea4f4fa SHA1 1cd5f5fd615684a9eed5c01be7ee8ec4b3ba8b0e SHA256 0c64685f4e800fea3fc2052bab688d62bfbf662175a5cb0b750c59784190d2df
 EBUILD avidemux-2.5.0.ebuild 5145 RMD160 05656faf95fcc9ecfa02eb6ab7b5a022736c13c0 SHA1 98bd6c747170bff9ce5a1d495a20cd04039e2f0f SHA256 23597c6da7468aa467a0a54aad9153262569e9aa0a70e461ccaf5788a8501fae
-MISC ChangeLog 26688 RMD160 aed2f78e93d75d86c081fccb8083cf4d03136488 SHA1 d5a7421fb1bcd7beee4bdedb368b0673b343d56a SHA256 74b17a34f92538839d70fa286817155785558efc6d478366741a2bc2c17bf172
-MISC metadata.xml 429 RMD160 b32016aaa9b19e2462d493e38f1d9423d8772361 SHA1 05b0451bfb459579447bd43a30104445f59c23ce SHA256 e5416acf63f5b056b0d9148a73d6914b09c78446338f913a9cf709661487790a
+EBUILD avidemux-2.5.1-r1.ebuild 4986 RMD160 112692c33de3a9f2bd7a4ec89e63cf5cd00cde97 SHA1 69416727be6fd856f3c64b2108d2107861b45230 SHA256 239ea0995481f05a63251c56704e5ded22ff6a0fd0c90f8f82859b8cf9643b3b
+MISC ChangeLog 26914 RMD160 47260fbca2470c0e707dd106d9825243efa2d88d SHA1 30f1b24622d7870f78cb7fa9b8f439d5eb7c2e41 SHA256 547f9a3730e9c698101afde4f80171478a55385923919d1e30682e263346729f
+MISC metadata.xml 513 RMD160 293398788053d9f00b94feb27be8de763622e269 SHA1 c3b1796f8eac9f0b90a2df29345f9d3bda238ff5 SHA256 bf77fa934a03278dc96c1d0b8a1db3a8b8a98b97271f7d309adc6f4eb3de1264
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq7lUsACgkQ+CZEqwt+F6aUIgCfZGKJTOd4z53WHpHfjNvdV+YB
+DscAn0PqHqx5QGffjh2nlin4QH+GxZ9U
+=b1ij
+-----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.5.1-r1.ebuild b/media-video/avidemux/avidemux-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..662b7dffcc73
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.5.1-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.1-r1.ebuild,v 1.1 2009/09/24 15:50:25 ayoy Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patches-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aac +aften +alsa +dts esd jack libsamplerate +mp3 nls opencore-amr oss
+	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
+
+RDEPEND="dev-libs/libxml2
+	aac? ( media-libs/faac
+		media-libs/faad2 )
+	aften? ( media-libs/aften )
+	alsa? ( media-libs/alsa-lib )
+	opencore-amr? ( media-libs/opencore-amr )
+	dts? ( media-libs/libdca )
+	mp3? ( media-sound/lame )
+	esd? ( media-sound/esound )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	oss? ( media-libs/alsa-oss )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	truetype? ( media-libs/freetype:2
+		media-libs/fontconfig )
+	vorbis? ( media-libs/libvorbis )
+	x264? ( media-libs/x264 )
+	xv? ( x11-libs/libXv )
+	xvid? ( media-libs/xvid )
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? ( >=x11-libs/qt-gui-4.5.1:4 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
+for L in ${AVIDEMUX_LANGS}; do
+	IUSE="${IUSE} linguas_${L}"
+done
+
+PATCHES=( "${WORKDIR}/patches/${PV}-i18n.patch"
+	"${WORKDIR}/patches/${PV}-multilib.patch"
+	"${WORKDIR}/patches/${PV}-coreImage-parallel-build.patch"
+	# adds plugins as a build target and adjusts include paths
+	"${WORKDIR}/patches/${PV}-build-plugins.patch" )
+
+src_prepare() {
+	base_src_prepare
+
+	local po_files=
+	local qt_ts_files=
+	local avidemux_ts_files=
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} ${AVIDEMUX_LANGS}; then
+			if [[ -e ${S}/po/${lingua}.po ]]; then
+				po_files="${po_files} \${po_subdir}/${lingua}.po"
+			fi
+			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
+				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
+			fi
+			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
+				avidemux_ts_files="${avidemux_ts_files} \${ts_subdir}/${PN}_${lingua}.ts"
+			fi
+		fi
+	done
+
+	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
+		"${S}/cmake/Po.cmake" || die "sed failed"
+	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
+	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
+		"${S}/cmake/Ts.cmake" || die "sed failed"
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DAVIDEMUX_INSTALL_PREFIX='${S}_build'
+		-DAVIDEMUX_CORECONFIG_DIR='${S}_build/config'"
+
+	# CMakeLists.txt
+	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
+	use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0"
+
+	# cmake/admCheckMiscLibs.cmake
+	use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0"
+	use sdl || mycmakeargs="${mycmakeargs} -DSDL=0"
+	use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0"
+
+	# cmake/admCheckAudioDeviceLibs.cmake
+	use alsa || mycmakeargs="${mycmakeargs} -DALSA=0"
+	use esd || mycmakeargs="${mycmakeargs} -DESD=0"
+	use jack || mycmakeargs="${mycmakeargs} -DJACK=0"
+	use oss || mycmakeargs="${mycmakeargs} -DOSS=0"
+	use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0"
+
+	# cmake/admCheckAudioEncoderLibs.cmake
+	use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0"
+	use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0"
+	use aac || mycmakeargs="${mycmakeargs} -DFAAC=0"
+	use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0"
+
+	# plugins/ADM_audioDecoders
+	use aac || mycmakeargs="${mycmakeargs} -DFAAD=0"
+	use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0"
+
+	# opencore
+	use opencore-amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0
+	                                                -DOPENCORE_AMRWB=0"
+
+	# plugins/ADM_videoFilters
+	use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0"
+
+	# plugins/ADM_videoEncoder
+	use xvid || mycmakeargs="${mycmakeargs} -DXVID=0"
+	use x264 || mycmakeargs="${mycmakeargs} -DX264=0"
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# first build the application
+	cmake-utils_src_compile
+	# and then go on with plugins
+	emake -C "${CMAKE_BUILD_DIR}/plugins" || die "building plugins failed"
+}
+
+src_install() {
+	# install the application
+	cmake-utils_src_install
+	# install plugins
+	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install \
+		|| die "installing plugins failed"
+
+	dodoc AUTHORS || die "dodoc failed"
+	newicon ${PN}_icon.png ${PN}.png || die "installing icon failed"
+
+	if use qt4; then
+		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
+		domenu ${PN}2.desktop || die "installing desktop file failed"
+	fi
+
+	if use gtk; then
+		domenu ${PN}2-gtk.desktop || die "installing desktop file failed"
+	fi
+}
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 462fed06cafd..65f1856d6d60 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -9,5 +9,6 @@
   <use>
     <flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
     <flag name="amrnb">Enable Narrow Band Adaptive Multi-Rate Audio support</flag>
+    <flag name="opencore-amr">Enable Band Adaptive Multi-Rate format support</flag>
   </use>
 </pkgmetadata>