Version bump.

5 files changed, 143 insertions, 15 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index c1bcdb92b32b..4c31df236e41 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,7 +1,12 @@
 # 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.53 2004/09/23 20:38:19 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.54 2004/10/18 11:12:48 zypher Exp $
 
+*avidemux-2.0.39 (15 Okt 2004)
+
+  17 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
+  Version bump.
+  
   23 Sep 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild,
   avidemux-2.0.28.ebuild:
   Added faad2 dependency, closes bug #59556
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index e7d283fdd5dd..40971629e64c 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,22 +1,25 @@
-MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
-MD5 faa3cbad236210cf4b3d130e3ed077fc avidemux-2.0.26.ebuild 2224
-MD5 b26350a505e3bbc5b41e0d8b73379270 avidemux-2.0.28.ebuild 2350
-MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
-MD5 69d9cc6608581ec445cd2291ba17d93a ChangeLog 9965
+MD5 36c14cc721785b91b788e8752cdfd4ba ChangeLog 10091
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
 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 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
+MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
+MD5 b26350a505e3bbc5b41e0d8b73379270 avidemux-2.0.28.ebuild 2350
+MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
+MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
+MD5 62907e2953086130a2d797224502e1c7 avidemux-2.0.30.ebuild 2311
+MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
 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 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
-MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
-MD5 612882d7351307d06e2ba0ff8a1e6c90 files/digest-avidemux-2.0.28 68
+MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
+MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713
 MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
 MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
-MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
-MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
-MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
+MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
+MD5 612882d7351307d06e2ba0ff8a1e6c90 files/digest-avidemux-2.0.28 68
+MD5 68b5a84288adbd1306f475f41ac1091d files/digest-avidemux-2.0.30 68
diff --git a/media-video/avidemux/avidemux-2.0.30.ebuild b/media-video/avidemux/avidemux-2.0.30.ebuild
new file mode 100644
index 000000000000..6668310b52a7
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.0.30.ebuild
@@ -0,0 +1,78 @@
+# 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.30.ebuild,v 1.1 2004/10/18 11:12:48 zypher Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Great Video editing/encoding tool"
+HOMEPAGE="http://fixounet.free.fr/avidemux/"
+SRC_URI="http://download.berlios.de/"${PN}/${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"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/avidemux-2.0.30_fixes.patch
+}
+
+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.30_fixes.patch b/media-video/avidemux/files/avidemux-2.0.30_fixes.patch
new file mode 100644
index 000000000000..0f156d42d579
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.0.30_fixes.patch
@@ -0,0 +1,41 @@
+diff -aur avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp /root/downloads/avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp
+--- avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp	2004-10-13 20:31:57.000000000 +0200
++++ /root/downloads/avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp	2004-10-18 12:20:08.846812432 +0200
+@@ -118,7 +118,7 @@
+ //
+ 	uint32_t count,sample;
+ 			sample=_wavheader->frequency/100;			
+-			count*=_wavheader->channels;
++			count=sample*_wavheader->channels;
+ 			if(_wavheader->encoding!=WAV_ULAW)
+ 			{
+ 				count*=2;			
+diff -aur avidemux-2.0.30/avidemux/ADM_memsupport.cpp /root/downloads/avidemux-2.0.30/avidemux/ADM_memsupport.cpp
+--- avidemux-2.0.30/avidemux/ADM_memsupport.cpp	2004-10-10 20:36:48.000000000 +0200
++++ /root/downloads/avidemux-2.0.30/avidemux/ADM_memsupport.cpp	2004-10-18 12:21:59.286023120 +0200
+@@ -76,7 +76,9 @@
+ 	uint32_t *backdoor;

+ 	uint32_t size,offset;

+ 	char	 *c=(char *)ptr;

+-	

++

++	if(!ptr) return;

++

+ 	backdoor=(uint32_t *)ptr;

+ 	backdoor-=2;

+ 	

+Only in avidemux-2.0.30: avidemux-2.0.30_audiopacketizer.patch
+diff -aur avidemux-2.0.30/configure.in.in /root/downloads/avidemux-2.0.30/configure.in.in
+--- avidemux-2.0.30/configure.in.in	2004-10-15 18:14:34.000000000 +0200
++++ /root/downloads/avidemux-2.0.30/configure.in.in	2004-10-18 12:22:07.025846488 +0200
+@@ -459,8 +459,8 @@
+   
+ dnl _______________/faad_______________
+ dnl ____________ faac ?________________
+- AC_CHECK_HEADERS(faac.h,,have_faad=no)
+- AC_CHECK_HEADERS(faacfg.h,,have_faad=no)
++ AC_CHECK_HEADERS(faac.h,,have_faac=no)
++ AC_CHECK_HEADERS(faaccfg.h,,have_faac=no)
+  
+  AC_ARG_ENABLE(faac,[  --disable-faac           Force no faac],have_faac=no)
+    
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.30 b/media-video/avidemux/files/digest-avidemux-2.0.30
new file mode 100644
index 000000000000..239b6ccbcdde
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.30
@@ -0,0 +1 @@
+MD5 9135ab6f43bba44355a1e6b4e783b92b avidemux-2.0.30.tar.gz 3150648