New snapshot, fixes bug 290233. Drop older snapshots.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 25 insertions, 163 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index b0bbf7c8db73..0aea201a3d60 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,14 @@
 # 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.157 2009/10/21 22:18:55 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.158 2009/10/29 01:32:06 yngwin Exp $
+
+*avidemux-2.5.1_p5428 (29 Oct 2009)
+
+  29 Oct 2009; Ben de Groot <yngwin@gentoo.org>
+  -avidemux-2.5.1_p5359.ebuild, -avidemux-2.5.1_p5396.ebuild,
+  +avidemux-2.5.1_p5428.ebuild,
+  +files/avidemux-2.5.1-build-plugins-fix.patch:
+  New snapshot, fixes bug 290233. Drop older snapshots.
 
 *avidemux-2.5.1_p5396 (21 Oct 2009)
 
diff --git a/media-video/avidemux/avidemux-2.5.1_p5396.ebuild b/media-video/avidemux/avidemux-2.5.1_p5396.ebuild
deleted file mode 100644
index 29e25bb2ece7..000000000000
--- a/media-video/avidemux/avidemux-2.5.1_p5396.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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_p5396.ebuild,v 1.1 2009/10/21 22:18:56 yngwin Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-MY_P=${PN}-2.5-r5396
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	mirror://gentoo/${P%_*}-patches-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+aac +aften +alsa amr +dts esd jack libsamplerate +mp3 nls 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 )
-	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-0.0.20090908 )
-	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
-	dev-util/subversion
-	>=dev-util/cmake-2.6.4"
-
-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%_*}-coreImage-parallel-build.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 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/avidemux-2.5.1_p5359.ebuild b/media-video/avidemux/avidemux-2.5.1_p5428.ebuild
index 564aa6a5ac91..387da6bdf795 100644
--- a/media-video/avidemux/avidemux-2.5.1_p5359.ebuild
+++ b/media-video/avidemux/avidemux-2.5.1_p5428.ebuild
@@ -1,12 +1,12 @@
 # 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_p5359.ebuild,v 1.2 2009/10/21 22:18:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.1_p5428.ebuild,v 1.1 2009/10/29 01:32:06 yngwin Exp $
 
 EAPI="2"
 
 inherit cmake-utils
 
-MY_P=${PN}-2.5-r5359
+MY_P=${PN}-2.5-r${PV##*_p}
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -36,7 +36,7 @@ RDEPEND="dev-libs/libxml2
 	truetype? ( media-libs/freetype:2
 		media-libs/fontconfig )
 	vorbis? ( media-libs/libvorbis )
-	x264? ( ~media-libs/x264-0.0.20090908 )
+	x264? ( media-libs/x264 )
 	xv? ( x11-libs/libXv )
 	xvid? ( media-libs/xvid )
 	gtk? ( x11-libs/gtk+:2 )
@@ -44,7 +44,6 @@ RDEPEND="dev-libs/libxml2
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig
-	dev-util/subversion
 	>=dev-util/cmake-2.6.4"
 
 S=${WORKDIR}/${MY_P}
@@ -55,7 +54,8 @@ for L in ${AVIDEMUX_LANGS}; do
 done
 
 PATCHES=( "${WORKDIR}/patches/${PV%_*}-i18n.patch"
-	"${WORKDIR}/patches/${PV%_*}-coreImage-parallel-build.patch" )
+	"${WORKDIR}/patches/${PV%_*}-coreImage-parallel-build.patch"
+	"${FILESDIR}/avidemux-2.5.1-build-plugins-fix.patch" )
 
 src_prepare() {
 	base_src_prepare
diff --git a/media-video/avidemux/files/avidemux-2.5.1-build-plugins-fix.patch b/media-video/avidemux/files/avidemux-2.5.1-build-plugins-fix.patch
new file mode 100644
index 000000000000..8d3634006906
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.1-build-plugins-fix.patch
@@ -0,0 +1,11 @@
+--- avidemux_2.5_branch_gruntster/CMakeLists.txt	2009-10-28 23:22:32.000000000 +0100
++++ avidemux-2.5-r5428/CMakeLists.txt	2009-10-29 00:16:10.000000000 +0100
+@@ -202,7 +202,7 @@
+ ADD_SUBDIRECTORY(avidemux)

+ ADD_SUBDIRECTORY(po)

+ ADD_SUBDIRECTORY(scripts)

+-# MEANX : DOES NOT WORK ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)

++ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)

+ 

+ ########################################

+ # Config Summary