Version bump plus one patch

5 files changed, 134 insertions, 24 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index e6ccd06bc871..9bfc83ae042d 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.56 2004/10/29 09:39:11 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.57 2004/11/09 19:28:01 zypher Exp $
+
+*avidemux-2.0.34_rc1 (08 Nov 2004)
+
+  09 Nov 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.34_rc1.ebuild:
+  Version bump.
 
 *avidemux-2.0.32 (26 Okt 2004)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index f153414d2be0..f459e0e27010 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,39 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 46a5f246c1fc7ef31791743cea5bcfe8 ChangeLog 10333
-MD5 b26350a505e3bbc5b41e0d8b73379270 avidemux-2.0.28.ebuild 2350
-MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
-MD5 2db6e1fe58118f49019049f62e10e35c avidemux-2.0.32.ebuild 2317
-MD5 a4e7880f69cf02398a2dc82d928a6584 avidemux-2.0.18.ebuild 2445
+MD5 080fb2d3307b62977483d04ed58a81bf ChangeLog 10465
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
+MD5 a4e7880f69cf02398a2dc82d928a6584 avidemux-2.0.18.ebuild 2445
+MD5 faa3cbad236210cf4b3d130e3ed077fc avidemux-2.0.26.ebuild 2224
+MD5 11648f5ec6649662e9fb3182267612fe avidemux-0.9-r1.ebuild 2021
 MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
+MD5 b26350a505e3bbc5b41e0d8b73379270 avidemux-2.0.28.ebuild 2350
+MD5 5846b93f88b88de1c06950c94bf09e21 avidemux-2.0.34_rc1.ebuild 2417
+MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
 MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
-MD5 faa3cbad236210cf4b3d130e3ed077fc avidemux-2.0.26.ebuild 2224
+MD5 2db6e1fe58118f49019049f62e10e35c avidemux-2.0.32.ebuild 2317
 MD5 a1809702f7671a3d49533d14db253b98 avidemux-2.0.30.ebuild 2427
-MD5 11648f5ec6649662e9fb3182267612fe avidemux-0.9-r1.ebuild 2021
-MD5 612882d7351307d06e2ba0ff8a1e6c90 files/digest-avidemux-2.0.28 68
+MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
+MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519
+MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
+MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
+MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
+MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
+MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631
+MD5 b1232d3ea78d0b8b79161fa8270d29f6 files/digest-avidemux-2.0.32 68
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
+MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
 MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713
-MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
 MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
-MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
-MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519
+MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
+MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
+MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74
+MD5 612882d7351307d06e2ba0ff8a1e6c90 files/digest-avidemux-2.0.28 68
 MD5 04305efde8b8b115e0a0c8e1885cf194 files/avidemux-2.0.30_amd64_cpuutil.patch 1539
-MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
-MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
-MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
-MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
 MD5 68b5a84288adbd1306f475f41ac1091d files/digest-avidemux-2.0.30 68
-MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
-MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
-MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
-MD5 b1232d3ea78d0b8b79161fa8270d29f6 files/digest-avidemux-2.0.32 68
-MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBghCERPjscZbntocRAn6ZAJ91TSfPGdw7/nJZIIkFQrm5oYVISgCgh23f
-06wPnhFh9bMARd5eyBejOIg=
-=hMGA
+iD8DBQFBkRqkRPjscZbntocRArREAJ4pmIk3bpXcOiPWMifG4hN9M7sbiQCfdTSn
+porixpdqdlU+tvModM35Drs=
+=gRKp
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.0.34_rc1.ebuild b/media-video/avidemux/avidemux-2.0.34_rc1.ebuild
new file mode 100644
index 000000000000..9d0e327253f4
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.0.34_rc1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.34_rc1.ebuild,v 1.1 2004/11/09 19:28:02 zypher Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="${P/_rc/-test}"
+DESCRIPTION="Great Video editing/encoding tool"
+HOMEPAGE="http://fixounet.free.fr/avidemux/"
+SRC_URI="http://download.berlios.de/"${PN}/${MY_P}".tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="alsa altivec arts debug nls oggvorbis truetype xvid"
+
+RDEPEND="virtual/x11
+	media-sound/madplay
+	>=media-libs/a52dec-0.7.4
+	>=media-sound/lame-3.93
+	>=dev-libs/libxml2-2.6.7
+	>=x11-libs/gtk+-2.4.1
+	>=media-libs/faac-1.23.5
+	>=media-libs/faad2-2.0-r2
+	xvid? ( >=media-libs/xvid-1.0.0 )
+	x86? ( dev-lang/nasm )
+	nls? ( >=sys-devel/gettext-0.12.1 )
+	oggvorbis? ( >=media-libs/libogg-1.0
+		>=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 )"
+# media-sound/toolame is supported as well
+
+DEPEND="$RDEPEND >=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}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+	cd ${S}/avidemux/ADM_audiofilter
+	epatch ${FILESDIR}/avidemux-2.0.34-test1_faac.patch
+	cd ${S}
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-gnu-ld --disable-warnings"
+
+	# --enable-profile        creates profiling infos default=no
+	# --enable-pch            enables precompiled header support
+	#                         (currently only KCC) default=no
+	# --enable-final          build size optimized apps
+	#                         (experimental - needs lots of memory)
+	# --disable-closure       don't delay template instantiation
+
+	use debug && myconf="${myconf} --enable-debug=full"
+	use nls || myconf="${myconf} --disable-nls"
+	use altivec && myconf="${myconf} --enable-altivec"
+	econf ${myconf} || die "configure failed"
+	make || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog History README TODO
+}
+
+pkg_postinst() {
+	if use ppc ; 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/avidemux-2.0.34-test1_faac.patch b/media-video/avidemux/files/avidemux-2.0.34-test1_faac.patch
new file mode 100644
index 000000000000..d52c66068573
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.0.34-test1_faac.patch
@@ -0,0 +1,18 @@
+Index: audiodeng_buildfilters.cpp
+===================================================================
+RCS file: /cvsroot/avidemux/avidemux/avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp,v
+retrieving revision 1.18
+diff -u -r1.18 audiodeng_buildfilters.cpp
+--- audiodeng_buildfilters.cpp	5 Nov 2004 19:36:10 -0000	1.18
++++ audiodeng_buildfilters.cpp	7 Nov 2004 10:07:00 -0000
+@@ -70,8 +70,8 @@
+ #ifdef HAVE_LIBMP3LAME
+ 		{"lame","Lame", AUDIOENC_MP3},
+ #endif
+-#ifdef USE_AAC
+-		{"aac","FAAC", AUDIOENC_AAC},
++#ifdef USE_FAAC
++		{"aac","FAAC", AUDIOENC_FAAC},
+ #endif
+ #ifdef USE_VORBIS
+ 		{"vorbis","Vorbis", AUDIOENC_VORBIS},
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.34_rc1 b/media-video/avidemux/files/digest-avidemux-2.0.34_rc1
new file mode 100644
index 000000000000..3325d471a0b6
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.34_rc1
@@ -0,0 +1 @@
+MD5 327307dfdf3bcb19cd7a06fefea5df35 avidemux-2.0.34-test1.tar.gz 2869582