Version bump.

(Portage version: 2.0.51.16)

5 files changed, 133 insertions, 12 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 126dea5c39e3..6ad698f8371d 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.62 2005/01/14 13:33:55 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.63 2005/02/21 11:18:13 zypher Exp $
+
+*avidemux-2.0.38rc1 (20 Feb 2005)
+
+  21 Feb 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.38_rc1.ebuild:
+  Version bump.
 
 *avidemux-2.0.36 (12 Jan 2005)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 9f0b7edf5158..927eb0370da9 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f334c41a1a1d4817b41fe11cf35eac21 avidemux-2.0.34_rc2.ebuild 2636
 MD5 62eb979e73dd6719f723c04b2c02837c avidemux-2.0.36.ebuild 2604
 MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
 MD5 dc94855a01eb66b0d3c329e46eb85e76 avidemux-2.0.34_rc1-r1.ebuild 3078
-MD5 fc8cffe43cdc79f7478c5dd5ab1fed3f ChangeLog 11412
+MD5 0a750f6c06cd235505d701c8833a3394 ChangeLog 11543
+MD5 03a41228a8647c176b2e6d8e7f4ea535 avidemux-2.0.38_rc1.ebuild 2680
 MD5 5846b93f88b88de1c06950c94bf09e21 avidemux-2.0.34_rc1.ebuild 2417
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 f9121be7bae99c7b33f4140c70799dce files/digest-avidemux-2.0.34_rc2 71
@@ -17,16 +15,11 @@ MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
 MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
 MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1-r1 74
 MD5 04305efde8b8b115e0a0c8e1885cf194 files/avidemux-2.0.30_amd64_cpuutil.patch 1539
+MD5 71caa2da3a9489e6d3e10b3816c753c6 files/2.0.38_rc1_mpegidentify.patch 1077
 MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
 MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
+MD5 b33a610486defc84ec634b6161943b21 files/digest-avidemux-2.0.38_rc1 71
 MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519
 MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
 MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713
 MD5 82846937f7ffde09813d938fe907c5e7 files/digest-avidemux-2.0.36 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB58qORPjscZbntocRAoIoAJ9i3sEFCAcXOm+UEV8gUlxXX069PwCgg/Ju
-MsYlvC43oZm7zyK2/AL/IYc=
-=T0Dp
------END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.0.38_rc1.ebuild b/media-video/avidemux/avidemux-2.0.38_rc1.ebuild
new file mode 100644
index 000000000000..ce2227ac674e
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.0.38_rc1.ebuild
@@ -0,0 +1,92 @@
+# 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.38_rc1.ebuild,v 1.1 2005/02/21 11:18:13 zypher Exp $
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_/}
+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="a52 aac alsa altivec arts debug encode mad mmx nls oggvorbis pic sdl truetype xvid xv"
+
+RDEPEND="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-r2 )
+	mad? ( media-libs/libmad )
+	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 )
+	sdl? ( media-libs/libsdl )"
+# 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
+	epatch ${FILESDIR}/2.0.38_rc1_mpegidentify.patch || die
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-gnu-ld --disable-warnings"
+
+	use arts || export ac_cv_path_ART_CONFIG=no
+	use alsa || export ac_cv_header_alsa_asoundlib_h=no
+	use sdl || export ac_cv_path_SDL_CONFIG=no
+	use oggvorbis || export ac_cv_lib_vorbis_vorbis_info_init=no
+	use xvid || export ac_cv_header_xvid_h=no
+	use xv || export ac_cv_header_X11_extensions_XShm_h=no
+	use truetype || export ac_cv_path_FREETYPE_CONFIG=no
+	use encode || export ac_cv_header_lame_lame_h=no
+	use mad || export ac_cv_header_mad_h=no
+	use a52 || export ac_cv_header_a52dec_a52=no
+
+	use debug && myconf="${myconf} --enable-debug=full"
+	use aac || myconf="${myconf} --disable-faac --disable-faad"
+	use mmx || myconf="${myconf} --disable-mmx"
+
+	econf \
+		`use_enable nls` \
+		`use_enalbe altivec` \
+		`use_with pic` \
+		${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/2.0.38_rc1_mpegidentify.patch b/media-video/avidemux/files/2.0.38_rc1_mpegidentify.patch
new file mode 100644
index 000000000000..51f196fb3ac9
--- /dev/null
+++ b/media-video/avidemux/files/2.0.38_rc1_mpegidentify.patch
@@ -0,0 +1,30 @@
+Index: avidemux/ADM_audio/audio_mpegidentify.cpp
+===================================================================
+RCS file: /cvsroot/avidemux/avidemux/avidemux/ADM_audio/audio_mpegidentify.cpp,v
+retrieving revision 1.4
+diff -u -r1.4 audio_mpegidentify.cpp
+--- avidemux/ADM_audio/audio_mpegidentify.cpp	19 Feb 2005 16:07:20 -0000	1.4
++++ avidemux/ADM_audio/audio_mpegidentify.cpp	20 Feb 2005 15:35:11 -0000
+@@ -33,7 +33,7 @@
+ #include "fourcc.h"
+ #include "aviaudio.hxx"
+ 
+-#include "ADM_audio/ADM_mp3info.h"
++#include "ADM_audio/ADM_mp3info.h" 
+ 
+    
+ uint8_t mpegAudioIdentify(uint8_t *ptr, uint32_t maxLookUp, WAVHeader *header, uint8_t *tokens)
+@@ -58,9 +58,12 @@
+         if(info.layer==3) header->encoding=WAV_MP3;
+                 else header->encoding=WAV_MP2;
+ 
++        if(tokens)
++        {
+                 tokens[0]=ptr[offset+1];
+                 tokens[1]=ptr[offset+2]&0xfd;
+                 tokens[2]=ptr[offset+3];
++        }
+ #define DUMPX(x) printf(#x": %d\n",info.x);
+                 DUMPX( level);                    
+                 DUMPX( layer);
+
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.38_rc1 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc1
new file mode 100644
index 000000000000..739b8629bbab
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.38_rc1
@@ -0,0 +1 @@
+MD5 59f0cfff83a7a04bfadaf51fe35fd225 avidemux-2.0.38rc1.tar.gz 3177994