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).

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

4 files changed, 168 insertions, 5 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/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})

+