Added pre version of Avidemux 2.1, with heavy patching. Need quite a bit of testing.

(Portage version: 2.0.51.22)

4 files changed, 123 insertions, 11 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 31990ec67ac3..ac8592efc66f 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # 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.88 2005/08/08 13:12:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.89 2005/08/22 12:04:47 flameeyes Exp $
+
+*avidemux-2.1_pre1 (22 Aug 2005)
+
+  22 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.1_pre1.ebuild:
+  Added pre version of Avidemux 2.1, with heavy patching. Need quite a bit of
+  testing.
 
   08 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.42.ebuild:
   Added patch to respect CXXFLAGS.
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 235035b4b9df..a6ff3d5b50f9 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dac6310c09045540cf8c8ef4518167a4 avidemux-2.0.38.ebuild 2732
 MD5 aa8b609e04382961269fe5c9a4954ac8 ChangeLog 16597
 MD5 d80cf399435b7b8c6b7eff979d7612ee avidemux-2.0.38-r1.ebuild 2735
 MD5 b5ead11a870a9dd4c3251549960a7303 avidemux-2.0.40-r1.ebuild 2805
+MD5 c03f0a65bd7c75300d3148e7a932d4df avidemux-2.1_pre1.ebuild 2947
 MD5 7ff6a23ad501e8c2fdc37fb6fca5276d avidemux-2.0.40.ebuild 2865
 MD5 ee5806b95c2dcfc5b397bcf7b64fc053 avidemux-2.0.24.ebuild 2486
 MD5 a46026c78083183a278fc471db6f4bb5 avidemux-2.0.42.ebuild 2848
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 83d72b260bc5ee987608beded3d9b606 files/digest-avidemux-2.0.42 139
 MD5 2e4c3410be3348fc36b780e6bd9f8683 files/digest-avidemux-2.0.38-r1 138
+MD5 829b17a9790d79f257614bfcd384f049 files/digest-avidemux-2.1_pre1 142
 MD5 cc1b60c4a9838d713cf334342af96a78 files/digest-avidemux-2.0.38 138
 MD5 be8cda57abb4f10dbe810d2e8565151e files/digest-avidemux-2.0.40-r1 138
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 0e47e20e917b79428c097e2920683db3 files/digest-avidemux-2.0.40 138
 MD5 4b0dc1a0f1e81197582e817410f8d180 files/2.0.38_rc2-fix-faad.patch 759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC91pOj5H05b2HAEkRAi0zAKCMUoQwD0nQ8MHjNKGFw4BUbCoKYQCfa+KI
-KIA1t+Rl0m90zmecZaHPRlM=
-=rsL4
------END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.1_pre1.ebuild b/media-video/avidemux/avidemux-2.1_pre1.ebuild
new file mode 100644
index 000000000000..21f655fcc809
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.1_pre1.ebuild
@@ -0,0 +1,111 @@
+# 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.1_pre1.ebuild,v 1.1 2005/08/22 12:04:47 flameeyes Exp $
+
+inherit eutils flag-o-matic fixheadtails
+
+MY_P=${PN}_${PV/_pre/_step}
+PATCHLEVEL="b1"
+
+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="
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/libxml2-2.6.7
+	dev-lang/spidermonkey
+	xv? ( virtual/x11 )
+	a52? ( >=media-libs/a52dec-0.7.4 )
+	encode? ( >=media-sound/lame-3.93 )
+	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_EXCLUDE="040_all_linking.patch"
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches/
+
+	cp ${WORKDIR}/m4/* ${S}/m4 || die "cp m4 failed"
+
+	ht_fix_all
+
+	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 --with-jsapi-include=/usr/include/js \
+		--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}/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.1_pre1 b/media-video/avidemux/files/digest-avidemux-2.1_pre1
new file mode 100644
index 000000000000..07e9b2932d30
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.1_pre1
@@ -0,0 +1,2 @@
+MD5 f5a3f530e86501eba55c8e37dbeb371c avidemux_2.1_step1.tar.gz 3884153
+MD5 d9f1c619324e88983bad8084a375bd74 avidemux-patches-b1.tar.bz2 21734