Avidemux version bump (bugfix release)

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-hh7 i686)

3 files changed, 142 insertions, 1 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 8dcb746e4712..683fff31db38 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.131 2008/06/22 15:14:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.132 2008/07/12 21:36:40 yngwin Exp $
+
+*avidemux-2.4.2 (12 Jul 2008)
+
+  12 Jul 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/avidemux-2.4.2-x264-2pass-fix.patch, +avidemux-2.4.2.ebuild:
+  Version bump. Bug 231151.
 
   22 Jun 2008; Markus Meier <maekke@gentoo.org> avidemux-2.4.1.ebuild:
   amd64/x86 stable, bug #227307
diff --git a/media-video/avidemux/avidemux-2.4.2.ebuild b/media-video/avidemux/avidemux-2.4.2.ebuild
new file mode 100644
index 000000000000..a836105856b9
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.4.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.2.ebuild,v 1.1 2008/07/12 21:36:40 yngwin Exp $
+
+EAPI="1"
+
+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 encode esd jack lame libsamplerate
+truetype vorbis x264 xv xvid gtk qt4"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libpng
+	media-libs/libsdl
+	>=dev-libs/glib-2
+	aac? ( media-libs/faad2 )
+	aften? ( media-libs/aften )
+	alsa? ( media-libs/alsa-lib )
+	amrnb? ( media-libs/amrnb )
+	arts? ( kde-base/arts )
+	dts? ( media-libs/libdca )
+	encode? (
+		aac? ( media-libs/faac )
+		lame? ( 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-4.3:4
+			x11-libs/qt-gui:4 )
+		x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	>=dev-util/cmake-2.4.4"
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# TODO. Needs to be reported upstream.
+	epatch "${FILESDIR}"/${PN}-2.4-libdca.patch
+	epatch "${FILESDIR}"/${PN}-2.4-i18n.patch
+	# post-release patch from upstream
+	epatch "${FILESDIR}"/${P}-x264-2pass-fix.patch
+}
+
+src_compile() {
+	# 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 encode || mycmakeargs="${mycmakeargs} -DNO_Lame=1 -DNO_FAAC=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"
+	#use png || mycmakeargs="${mycmakeargs} -DNO_libPNG=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_compile
+}
+
+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.2-x264-2pass-fix.patch b/media-video/avidemux/files/avidemux-2.4.2-x264-2pass-fix.patch
new file mode 100644
index 000000000000..55767e3af257
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4.2-x264-2pass-fix.patch
@@ -0,0 +1,10 @@
+---  avidemux_2.4.1/avidemux/ADM_encoder/adm_encx264.cpp-orig	2008-06-30 20:30:09.000000000 +0200
++++  avidemux_2.4.1/avidemux/ADM_encoder/adm_encx264.cpp	2008-07-10 17:27:51.000000000 +0200
+@@ -271,6 +271,7 @@
+ {
+   uint32_t    bitrate;
+ 
++  _delayed = 0;
+   ADM_assert (_state == enc_Pass1);
+   printf ("\n[x264] Starting pass 2 (%d x %d)\n", _w, _h);
+