Re-enable qt4 useflag, which works again with qt 4.5.1 (bug 259414). Add patch for cmake-2.6.4 change in behavior (bug 268618). Add test restriction (bug 265218).

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 172 insertions, 7 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 84a2e8b4cab3..657a17cfa0a6 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/avidemux
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.142 2009/02/15 23:29:51 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.143 2009/05/08 12:41:49 yngwin Exp $
+
+*avidemux-2.4.4-r1 (08 May 2009)
+
+  08 May 2009; Ben de Groot <yngwin@gentoo.org>
+  +files/avidemux-2.4-cmake264.patch, avidemux-2.4.3.ebuild,
+  +avidemux-2.4.4-r1.ebuild:
+  Re-enable qt4 useflag, which works again with qt 4.5.1 (bug 259414). Add
+  patch for cmake-2.6.4 change in behavior (bug 268618). Add test
+  restriction (bug 265218).
 
 *avidemux-2.4.4 (15 Feb 2009)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 472c815d35fd..f7f8472d283a 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,10 +1,12 @@
+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.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe8c SHA1 06fb7f651ff8b3c866785c8a9e65ced1ec395d03 SHA256 b7e6a3374aed67734602b5ef25c994267d8bd2324c46993554853336c6a47553
 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 4091 RMD160 645a511321e645f6043f36b7108b6c4b1d8b5a6f SHA1 7069f363839da8da62426b84b4d1d52c907e62a1 SHA256 0c4d69b7a8ab20524bb9eb6b2fbdbd7015c25ac24b1bb9dac2f3aa72ea8d01eb
+EBUILD avidemux-2.4.3.ebuild 4077 RMD160 f3f28982be7f24c50ecb69d4d94b4246917ac704 SHA1 86ea655935da10dcfbf2f4e2b371fa5dcf7912f4 SHA256 dfb4e5f70d3af934930a7f833a187de3075e545641b7c843a02e9f9aa3b9cc6d
+EBUILD avidemux-2.4.4-r1.ebuild 3765 RMD160 ed71e7ce56a8af79e3e6c03808ec7b04a3f7ea4e SHA1 cc9c399a1f30b5fd326e7e2db3ca8220d49a8b96 SHA256 f13e8d32a058069413edf4b54652f4dfc420a8d3127fdda9432d450d7e6fc30c
 EBUILD avidemux-2.4.4.ebuild 3723 RMD160 164d985c7b3f2c6f837d7fe3b01db6e5e6de6109 SHA1 de94587e90966c0e44180d3bd588a2f70f794198 SHA256 5ce07305d9bf1ab4f59ae13b74564b5bfe0e260a04257350aaa38893a768886e
-MISC ChangeLog 25101 RMD160 deaed97b59967a7fc320f8501f9ab9729e2ef38c SHA1 6b4d669861995d7f28dee02229d2c4b8d57298b3 SHA256 b9d3b2a4492cf67c67659ffcbc740c927ae924a69e55ecb7ddaa0b7c381551f8
+MISC ChangeLog 25443 RMD160 6fcfca8eff1b2312caa7c5519e7ded9a833b481f SHA1 66afe17304fdc552b3a1d381c7c2092c34506898 SHA256 3be62d214c20d3b6c96eeff78d00c277d993c2532abdd3b7bb07598c5dc38850
 MISC metadata.xml 429 RMD160 b32016aaa9b19e2462d493e38f1d9423d8772361 SHA1 05b0451bfb459579447bd43a30104445f59c23ce SHA256 e5416acf63f5b056b0d9148a73d6914b09c78446338f913a9cf709661487790a
diff --git a/media-video/avidemux/avidemux-2.4.3.ebuild b/media-video/avidemux/avidemux-2.4.3.ebuild
index 6cfd7ad54b48..564b015e62d1 100644
--- a/media-video/avidemux/avidemux-2.4.3.ebuild
+++ b/media-video/avidemux/avidemux-2.4.3.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.3.ebuild,v 1.7 2009/01/17 20:52:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.3.ebuild,v 1.8 2009/05/08 12:41:49 yngwin Exp $
 
 EAPI="1"
 
@@ -17,6 +17,7 @@ SLOT="2"
 KEYWORDS="amd64 ppc x86"
 IUSE="aac aften alsa amrnb arts dts encode esd jack lame libsamplerate
 	truetype vorbis x264 xv xvid gtk qt4"
+RESTRICT="test"
 
 RDEPEND="dev-libs/libxml2
 	media-libs/libpng
@@ -43,8 +44,7 @@ RDEPEND="dev-libs/libxml2
 	xvid? ( media-libs/xvid )
 	gtk? ( >=x11-libs/gtk+-2
 		x11-libs/libX11 )
-	qt4? ( || ( x11-libs/qt-gui:4
-			>=x11-libs/qt-4.3:4 )
+	qt4? ( x11-libs/qt-gui:4
 		x11-libs/libX11 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/media-video/avidemux/avidemux-2.4.4-r1.ebuild b/media-video/avidemux/avidemux-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..0980cf16a992
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.4.4-r1.ebuild
@@ -0,0 +1,118 @@
+# 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.1 2009/05/08 12:41:49 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
+	# fix for bug 268618
+	epatch "${FILESDIR}"/${PN}-2.4-cmake264.patch
+}
+
+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/files/avidemux-2.4-cmake264.patch b/media-video/avidemux/files/avidemux-2.4-cmake264.patch
new file mode 100644
index 000000000000..80338a8061a5
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4-cmake264.patch
@@ -0,0 +1,36 @@
+diff -uNr avidemux_2.4.4.orig/avidemux/CMakeLists.txt avidemux_2.4.4/avidemux/CMakeLists.txt
+--- avidemux_2.4.4.orig/avidemux/CMakeLists.txt	2009-05-06 13:00:10.000000000 +0200
++++ avidemux_2.4.4/avidemux/CMakeLists.txt	2009-05-06 13:00:49.000000000 +0200
+@@ -84,7 +84,6 @@
+ ADM_audio

+ ADM_script 

+ ADM_videoFilter

+-ADM_filter

+ ADM_video 

+ ADM_audiodevice

+ ADM_ocr  

+@@ -93,6 +92,24 @@
+ 

+ FOREACH(_current ${ADM_SUBDIR})

+ 	ADD_SUBDIRECTORY(${_current})

++ENDFOREACH(_current ${ADM_SUBDIR})

++

++SET(ADM_SUBDIR 

++ADM_filter

++ADM_audiofilter 

++ADM_editor

++ADM_audiocodec 

++ADM_audio

++ADM_script 

++ADM_videoFilter

++ADM_filter

++ADM_video 

++ADM_audiodevice

++ADM_ocr  

++ADM_colorspace 

++)

++

++FOREACH(_current ${ADM_SUBDIR})

+ 	add_libs_all_targets(${_current})

+ ENDFOREACH(_current ${ADM_SUBDIR})

+