Avidemux version bump (bugfix release)

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-hh7 i686

4 files changed, 146 insertions, 12 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/Manifest b/media-video/avidemux/Manifest
index 63e2fdfe08cb..2373a6b1caeb 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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.1-gcc43-includes.patch 4125 RMD160 72eb0497889dd1f463ec22dfbe9682be2f2612f2 SHA1 7197a4d035eb99e6ceed5c763d57d4091e4c309a SHA256 85e30977430d6542529a854837999b436fa9298dcf759e9cac2ed203af4a7253
 AUX avidemux-2.4.1-gcc43-missing-asm-naming.patch 6136 RMD160 d3b38507ac9bee6e854a0002e6f9d92fb80c153d SHA1 00ee010a0d1373a7887d67f6026de55735cfa46e SHA256 c4fe7551a48e7502c1e3e4f16e93a036a67612301ba26186de899e44a9fcca0b
+AUX avidemux-2.4.2-x264-2pass-fix.patch 356 RMD160 5435a2545c56d3c235773755d4098a1d1fd803d2 SHA1 8d41540af98ae62ab3cafb2e3c6201fac1385328 SHA256 90ee49f7dfc193512d3238eb9af32d8dc8cddef3755f373da648ef427c69ef42
 DIST avidemux_2.4.1.tar.gz 5788014 RMD160 8149eb62cb4f3196d98b8c2707a4252f06e198cf SHA1 6bbf542bab73d91cb73f198d2d8afe10d83b2821 SHA256 f3c7ada9da6cd65ce840127dfa7062a7004af0a44a2e3a474ff153b0e7d50b51
+DIST avidemux_2.4.2.tar.gz 6683907 RMD160 feeed70c39651875cb9fa6455ce2812f98d6bf60 SHA1 17b2dc75646baa62f8ae3df47ac5a00c0b0dc050 SHA256 747dfb2efc9c1b3d4e60a6f426e5c22476ec7b141a8091cc0f1c5a75b451cfe4
 DIST avidemux_2.4.tar.gz 5728629 RMD160 2e02e2acc6f87cd8ecf781e3c4a37f03d9365640 SHA1 4a055580d65adbefcd52a159da9059f376a56cc6 SHA256 7ec094464637a8e4ba81021bcae15f04edbd3239d210fe6f9d2ef795c7febf11
 EBUILD avidemux-2.4.1.ebuild 4067 RMD160 86a8fdc496fbd406a9761c7458f2b95dab61faad SHA1 82ee8f04888eb21c374472c0d765c02fb47a66f6 SHA256 35916cd2c4a77d677051fe4895f501a9f61851809f45fe77d2bb30ff74e12e25
+EBUILD avidemux-2.4.2.ebuild 3925 RMD160 4f7ec8f9c64b39da9b633230ac18d6a3efa642cb SHA1 c12fef06f95b5a119d97f69302c4879d5fa37412 SHA256 7b6ce77d5d783479c7e1c4f66a8d473455afd29a33f09f4569edd1673942acb9
 EBUILD avidemux-2.4.ebuild 3578 RMD160 7f726cd919bdfc88f38d89a3244bc48af82d93e1 SHA1 2a54ef3ca88d573365e76d9de0b4cca5a9af29f9 SHA256 9bb3ea9701cabf2e5441063688efc60ef384a02acb7878dd2b3bdd37e57dafb2
-MISC ChangeLog 23204 RMD160 ecce4af0b7038e776f4729a38a8939b708bcd004 SHA1 41cdd01fa719d33ebfe7c66da885ab456db53c7b SHA256 2aa672744d5720536182d487e0ea3afc7c5ab4bd05cdfc1eb83bf4d6458906bc
+MISC ChangeLog 23382 RMD160 77df26edebfb30578bdaf5aca009ab438e7b2aea SHA1 2d7b61bf6bb7c044d2ada6a8bc3babd3fb6950a2 SHA256 1718dda1a8040f04f552cce8c3fa96ee1407ac7782fce4e0d4e0bf4c728a41d9
 MISC metadata.xml 251 RMD160 dd6e0dda3634c267e55d59fcb94e9a1d4e7fb109 SHA1 26fa0c9c65f848f2bd7793491cadf4cf28ac074c SHA256 44556c130873ffc95cf9229359070f837ad83e8dd5492eda7894bec5c41f80b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhebJ0ACgkQkKaRLQcq0GLUsACcD/3w2xHL1ZSq534+vGCjjVzm
-CoIAn2LlnQlY+rZxcIitEM+16GkhhuNH
-=YiyE
------END PGP SIGNATURE-----
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);
+