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

in bug 272730. Remove old revision.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 24 insertions, 133 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/Manifest b/media-video/avidemux/Manifest
index dd79b4e5efd4..034d096afadd 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,23 +1,13 @@
------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
+AUX avidemux-2.4-ts-cmake.patch 517 RMD160 10796376d71b67ed7881db397679ea1888b868b1 SHA1 a05f8853bbcc55c28f1aa957335b90fd0e655b1d SHA256 980fd8a1404e66fbc33ffe4161c8018313e32ad06eee28d80e978842d49c6d12
 AUX avidemux-2.4.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe8c SHA1 06fb7f651ff8b3c866785c8a9e65ced1ec395d03 SHA256 b7e6a3374aed67734602b5ef25c994267d8bd2324c46993554853336c6a47553
 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.4.3.tar.gz 6707930 RMD160 3d9d098d97462027ac1a62fe9438451b1915367b SHA1 d3a4dc2c07884916c45f750229d02fbdeb3cedde SHA256 b2e24ed11ad84c1f5c0b6efaad8b1aae07618cf99994ae0d63fbd7f71333214f
 DIST avidemux_2.4.4.tar.gz 6894690 RMD160 8bb2705b3e2d5379d833ec4fa06a01b897c06e04 SHA1 c50a00caf13a8ea1053e5994edeb59354192e18e SHA256 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956
 EBUILD avidemux-2.4.3.ebuild 4077 RMD160 f3f28982be7f24c50ecb69d4d94b4246917ac704 SHA1 86ea655935da10dcfbf2f4e2b371fa5dcf7912f4 SHA256 dfb4e5f70d3af934930a7f833a187de3075e545641b7c843a02e9f9aa3b9cc6d
-EBUILD avidemux-2.4.4-r1.ebuild 3812 RMD160 9b2d7cc2f4e9d5254f6ef61681497df80b92c9cf SHA1 eaa8daa5068ff5691bb92532bc5399d7dac2443c SHA256 15f019c62757390682dcd9ad752fa1d5543735aca4aa76ef4daf541af549f056
-EBUILD avidemux-2.4.4-r2.ebuild 3508 RMD160 c872f3bf7220edde1d592068987eed988a4d4661 SHA1 e4a6b14aa41fdc690cc3c32a9ff69e4856910fb4 SHA256 cbcf54dd8b14a09ab0d902ac7732fdfaa4f7fc47c8f1a8fef09fd63d9195dc27
-MISC ChangeLog 26123 RMD160 5bfd02fa3dbc735c3632bc5975cbb6b89384383d SHA1 4cdeeb8547b1767a1eb8d9c11e238822d906fbab SHA256 606bc45e3fe72ed9e7e192ca0779def320c728a0cd3815ef24eac0aa97a31b77
+EBUILD avidemux-2.4.4-r2.ebuild 3570 RMD160 fbb561349a5ea0786ee5256313f19b7496d9ecc3 SHA1 b1587b325cdda3c10c4ea79acbd9fbf24661cc93 SHA256 7315ead035075faa709b13f2dfb2703e662b6accc2989381363aebf8a0424215
+MISC ChangeLog 26380 RMD160 14043627ea6366944dd60771bc0cd309ae6c7824 SHA1 ced57dced95149ff37e5af151e6c1a3593094cc4 SHA256 53a3e53ad627e117e90489208d8189a0e2f2d79cc6907efb890c1f95b3b2bcc2
 MISC metadata.xml 429 RMD160 b32016aaa9b19e2462d493e38f1d9423d8772361 SHA1 05b0451bfb459579447bd43a30104445f59c23ce SHA256 e5416acf63f5b056b0d9148a73d6914b09c78446338f913a9cf709661487790a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpErXUACgkQNQqtfCuFneMIrACgkQ5WJ8U/21/r8/fictPksg8l
-tNEAn0q3/UERilxO0dU/7nWDkYzGMHLv
-=N83v
------END PGP SIGNATURE-----
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})