Add patch to fix possible parallel make issues, thanks to Martin von Gagern

in bug 272730. Remove old revision.
(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 21 insertions, 120 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 1e03329958a5..cd80a3a6f1de 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # 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.147 2009/06/26 11:13:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.148 2009/06/27 10:48:11 yngwin Exp $
+
+  27 Jun 2009; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.4-r1.ebuild,
+  avidemux-2.4.4-r2.ebuild, +files/avidemux-2.4-ts-cmake.patch:
+  Add patch to fix possible parallel make issues, thanks to Martin von
+  Gagern in bug 272730. Remove old revision.
 
   26 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
   avidemux-2.4.4-r2.ebuild:
diff --git a/media-video/avidemux/avidemux-2.4.4-r1.ebuild b/media-video/avidemux/avidemux-2.4.4-r1.ebuild
deleted file mode 100644
index 882ae3e7b60a..000000000000
--- a/media-video/avidemux/avidemux-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,118 +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.4.4-r1.ebuild,v 1.2 2009/05/15 21:13:03 yngwin Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils flag-o-matic
-
-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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+aac +aften +alsa amrnb arts +dts esd jack libsamplerate +mp3 +truetype
-	+vorbis +x264 +xv +xvid gtk +qt4"
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libpng
-	media-libs/libsdl
-	dev-libs/glib:2
-	aac? ( media-libs/faac
-		media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	arts? ( kde-base/arts )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	truetype? ( media-libs/freetype
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/libX11 )
-	qt4? ( >=x11-libs/qt-gui-4.5.1:4
-		x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	dev-util/cmake"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if hasq distcc ${FEATURES}; then
-		eerror "Avidemux does not compile with distcc. Please retry with"
-		eerror "FEATURES='-distcc' emerge avidemux"
-		die "distcc not supported for this package"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/lavcodec-mpegvideo_mmx-asm-fix.patch
-	epatch "${FILESDIR}"/${PN}-2.4-cmake264.patch  # bug 268618
-	epatch "${FILESDIR}"/${P}-gcc-4.4.patch  # bug 269114
-}
-
-src_configure() {
-	# Commented out options cause compilation errors, some
-	# might need -Wl,--as-needed in LDFLAGS and all USE
-	# flags disabled for reproducing. -drac
-	# TODO. Needs to be fixed, or reported upstream.
-
-	local mycmakeargs
-
-	# ConfigureChecks.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DNO_ALSA=1"
-	#use oss || mycmakeargs="${mycmakeargs} -DNO_OSS=1"
-	#use nls || mycmakeargs="${mycmakeargs} -DNO_NLS=1"
-	#use sdl || mycmakeargs="${mycmakeargs} -DNO_SDL=1"
-
-	# ConfigureChecks.cmake -> ADM_CHECK_HL -> cmake/adm_checkHeaderLib.cmake
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
-	use xv || mycmakeargs="${mycmakeargs} -DNO_Xvideo=1"
-	use esd || mycmakeargs="${mycmakeargs} -DNO_Esd=1"
-	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
-	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
-	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
-	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAC=1"
-	use mp3 || mycmakeargs="${mycmakeargs} -DNO_Lame=1"
-	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
-	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
-	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
-	use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
-	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
-	use vorbis || mycmakeargs="${mycmakeargs} -DNO_Vorbis=1"
-
-	# ConfigureChecks.cmake -> cmake/FindArts.cmake
-	use arts || mycmakeargs="${mycmakeargs} -DNO_ARTS=1"
-
-	# CMakeLists.txt
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FREETYPE=1"
-	use gtk || mycmakeargs="${mycmakeargs} -DNO_GTK=1"
-	use qt4 || mycmakeargs="${mycmakeargs} -DNO_QT4=1"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS History
-	doicon avidemux_icon.png
-
-	use gtk && make_desktop_entry avidemux2_gtk "Avidemux GTK" \
-		avidemux_icon "AudioVideo;GTK"
-	use qt4 && make_desktop_entry avidemux2_qt4 "Avidemux Qt" \
-		avidemux_icon "AudioVideo;Qt"
-}
diff --git a/media-video/avidemux/avidemux-2.4.4-r2.ebuild b/media-video/avidemux/avidemux-2.4.4-r2.ebuild
index 94fe209d311c..7408ceddc582 100644
--- a/media-video/avidemux/avidemux-2.4.4-r2.ebuild
+++ b/media-video/avidemux/avidemux-2.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4.4-r2.ebuild,v 1.3 2009/06/26 11:13:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r2.ebuild,v 1.4 2009/06/27 10:48:11 yngwin Exp $
 
 EAPI="2"
 
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.4-cmake264.patch  # bug 268618
 	epatch "${FILESDIR}"/${PN}-2.4-i18n.patch      # bug 272258
 	epatch "${FILESDIR}"/${P}-gcc-4.4.patch        # bug 269114
+	epatch "${FILESDIR}"/${PN}-2.4-ts-cmake.patch  # bug 272730
 }
 
 src_configure() {
diff --git a/media-video/avidemux/files/avidemux-2.4-ts-cmake.patch b/media-video/avidemux/files/avidemux-2.4-ts-cmake.patch
new file mode 100644
index 000000000000..3edbec0cada8
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4-ts-cmake.patch
@@ -0,0 +1,13 @@
+Index: avidemux_2.4.4/cmake/Ts.cmake
+===================================================================
+--- avidemux_2.4.4.orig/cmake/Ts.cmake
++++ avidemux_2.4.4/cmake/Ts.cmake
+@@ -58,7 +58,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdi
+                 COMMAND ${LRELEASE_EXECUTABLE}

+                     ${_outXml}

+                     -qm ${_out}

+-                DEPENDS ${_in}

++                DEPENDS ${_outXml}

+             )

+                 

+             SET(qm_files ${qm_files} ${_outXml} ${_out})