New upstream version. Closes #99984.

(Portage version: 2.0.51.22-r2)

4 files changed, 118 insertions, 12 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 10249e291dc9..8c7365614230 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.84 2005/05/29 18:22:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.85 2005/07/23 10:02:47 flameeyes Exp $
+
+*avidemux-2.0.42 (23 Jul 2005)
+
+  23 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.42.ebuild:
+  New upstream version. Closes #99984.
 
   29 May 2005; Diego Pettenò <flameeyes@gentoo.org>
   avidemux-2.0.40-r1.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index b920c0c54548..83b581a1dbf3 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7ab96214960aee1e31e0790743ebb4b8 ChangeLog 16076
 MD5 ee5806b95c2dcfc5b397bcf7b64fc053 avidemux-2.0.24.ebuild 2486
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 d80cf399435b7b8c6b7eff979d7612ee avidemux-2.0.38-r1.ebuild 2735
 MD5 dac6310c09045540cf8c8ef4518167a4 avidemux-2.0.38.ebuild 2732
 MD5 7ff6a23ad501e8c2fdc37fb6fca5276d avidemux-2.0.40.ebuild 2865
-MD5 b5ead11a870a9dd4c3251549960a7303 avidemux-2.0.40-r1.ebuild 2805
+MD5 29b05add8d8058f8082d72929a533eb6 avidemux-2.0.40-r1.ebuild 2804
+MD5 27461da181f603909770bec53448377d avidemux-2.0.42.ebuild 2823
 MD5 4b0dc1a0f1e81197582e817410f8d180 files/2.0.38_rc2-fix-faad.patch 759
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 cc1b60c4a9838d713cf334342af96a78 files/digest-avidemux-2.0.38 138
 MD5 2e4c3410be3348fc36b780e6bd9f8683 files/digest-avidemux-2.0.38-r1 138
 MD5 0e47e20e917b79428c097e2920683db3 files/digest-avidemux-2.0.40 138
 MD5 be8cda57abb4f10dbe810d2e8565151e files/digest-avidemux-2.0.40-r1 138
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCmgeGj5H05b2HAEkRAtUEAJ43PfKurcei3XHGJvqbm09ealXc6QCeOeOr
-qezOOWhub/hvzBgQSFlH8IY=
-=rdvC
------END PGP SIGNATURE-----
+MD5 9e8c43427bfca9b17726ad9f02296787 files/digest-avidemux-2.0.42 138
diff --git a/media-video/avidemux/avidemux-2.0.42.ebuild b/media-video/avidemux/avidemux-2.0.42.ebuild
new file mode 100644
index 000000000000..04bc475256c3
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.0.42.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42.ebuild,v 1.1 2005/07/23 10:02:47 flameeyes Exp $
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_/}
+PATCHLEVEL="8"
+
+DESCRIPTION="Great Video editing/encoding tool"
+HOMEPAGE="http://fixounet.free.fr/avidemux/"
+SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="a52 aac alsa altivec arts encode mad nls vorbis sdl truetype xvid xv oss"
+
+RDEPEND="xv? ( virtual/x11 )
+	a52? ( >=media-libs/a52dec-0.7.4 )
+	encode? ( >=media-sound/lame-3.93 )
+	>=dev-libs/libxml2-2.6.7
+	>=x11-libs/gtk+-2.4.1
+	aac? ( >=media-libs/faac-1.23.5
+	       >=media-libs/faad2-2.0-r7 )
+	mad? ( media-libs/libmad )
+	xvid? ( >=media-libs/xvid-1.0.0 )
+	nls? ( >=sys-devel/gettext-0.12.1 )
+	vorbis? ( >=media-libs/libvorbis-1.0.1 )
+	arts? ( >=kde-base/arts-1.2.3 )
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
+	sdl? ( media-libs/libsdl )"
+# media-sound/toolame is supported as well
+
+DEPEND="$RDEPEND
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8.3"
+
+filter-flags "-fno-default-inline"
+filter-flags "-funroll-loops"
+filter-flags "-funroll-all-loops"
+filter-flags "-fforce-addr"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! ( use oss || use arts || use alsa ); then
+		die "You must select at least one between oss, arts and alsa audio output."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/patches/
+
+	cp ${WORKDIR}/${PV}/m4/* ${S}/m4 || die "cp m4 failed"
+
+	gmake -f Makefile.dist || die "autotools failed."
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable altivec) \
+		$(use_enable xv) \
+		$(use_with mad libmad) \
+		$(use_with arts) \
+		$(use_with alsa) \
+		$(use_with oss) \
+		$(use_with vorbis) \
+		$(use_with a52 a52dec) \
+		$(use_with sdl libsdl) \
+		$(use_with truetype freetype2) \
+		$(use_with aac faac) $(use_with aac faad2) \
+		$(use_with xvid) \
+		$(use_with encode lame) \
+		--with-newfaad \
+		--disable-warnings --disable-dependency-tracking \
+		${myconf} || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog History README TODO
+
+	insinto /usr/share/icons/hicolor/64x64/apps
+	newins ${WORKDIR}/${PV}/avidemux_icon.png avidemux.png
+
+	make_desktop_entry avidemux2 "Avidemux2" avidemux
+}
+
+pkg_postinst() {
+	if use ppc && use oss; then
+		echo
+		einfo "OSS sound output may not work on ppc"
+		einfo "If your hear only static noise, try"
+		einfo "changing the sound device to ALSA or arts"
+	fi
+}
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.42 b/media-video/avidemux/files/digest-avidemux-2.0.42
new file mode 100644
index 000000000000..4f34bfb5106d
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.42
@@ -0,0 +1,2 @@
+MD5 d30f1bb981767bca793d78067bcfe084 avidemux-2.0.42.tar.gz 3817449
+MD5 322787b16aa85895294c1c9e6e8c9c4b avidemux-patches-8.tar.bz2 16051