Bugfix for aac

Package-Manager: portage-2.0.51.19

4 files changed, 61 insertions, 43 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index ddd287e3b4f7..d19c5a0cc5e5 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # 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.65 2005/04/03 10:36:53 zypher Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.66 2005/04/05 18:55:05 lu_zero Exp $
+
+  05 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/2.0.38_rc2-fix-faad.patch, avidemux-2.0.38_rc2.ebuild:
+  fix for bug #86935, thanks again Diego
 
 *avidemux-2.0.38rc2b (31 Mar 2005)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 53cce153df30..b1faec1ce2a7 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,37 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f334c41a1a1d4817b41fe11cf35eac21 avidemux-2.0.34_rc2.ebuild 2636
-MD5 3e7529efab3b4c2630ae395e30ca890f avidemux-2.0.36.ebuild 2604
-MD5 0df3945d4a234df5430c6376a06ee625 avidemux-2.0.38_rc2.ebuild 2629
-MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
 MD5 dc94855a01eb66b0d3c329e46eb85e76 avidemux-2.0.34_rc1-r1.ebuild 3078
-MD5 892bced3fd6431c5db72f76e744f168d ChangeLog 11785
-MD5 07ec34f7b85bdce7aff93574b527d1c5 avidemux-2.0.38_rc1.ebuild 2684
-MD5 5846b93f88b88de1c06950c94bf09e21 avidemux-2.0.34_rc1.ebuild 2417
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 f9121be7bae99c7b33f4140c70799dce files/digest-avidemux-2.0.34_rc2 71
-MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
-MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631
-MD5 fa51202c1d7fc830fcd290028cb4a203 files/digest-avidemux-2.0.38_rc2 72
-MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
-MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74
-MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
-MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 5846b93f88b88de1c06950c94bf09e21 avidemux-2.0.34_rc1.ebuild 2417
+MD5 2be1f577a18f794e73105c6b3b6d9576 avidemux-2.0.38_rc2.ebuild 2614
+MD5 07ec34f7b85bdce7aff93574b527d1c5 avidemux-2.0.38_rc1.ebuild 2684
+MD5 f334c41a1a1d4817b41fe11cf35eac21 avidemux-2.0.34_rc2.ebuild 2636
+MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
+MD5 2878f6883d19357a9b69b86490b30f94 ChangeLog 11941
+MD5 3e7529efab3b4c2630ae395e30ca890f avidemux-2.0.36.ebuild 2604
+MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519
+MD5 4b0dc1a0f1e81197582e817410f8d180 files/2.0.38_rc2-fix-faad.patch 759
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 71caa2da3a9489e6d3e10b3816c753c6 files/2.0.38_rc1_mpegidentify.patch 1077
 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 b33a610486defc84ec634b6161943b21 files/digest-avidemux-2.0.38_rc1 71
+MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
+MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
+MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
+MD5 f9121be7bae99c7b33f4140c70799dce files/digest-avidemux-2.0.34_rc2 71
 MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713
+MD5 fa51202c1d7fc830fcd290028cb4a203 files/digest-avidemux-2.0.38_rc2 72
+MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74
+MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 82846937f7ffde09813d938fe907c5e7 files/digest-avidemux-2.0.36 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCT8dMRPjscZbntocRAiUaAJ9k+9YJsktIVsfHekre57p3R3sPjQCeIk0I
-xJVOlonuGI87Wjk3miiSHrU=
-=Tn6R
------END PGP SIGNATURE-----
+MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631
diff --git a/media-video/avidemux/avidemux-2.0.38_rc2.ebuild b/media-video/avidemux/avidemux-2.0.38_rc2.ebuild
index 8ee482b1ff8a..a82a12c7e61b 100644
--- a/media-video/avidemux/avidemux-2.0.38_rc2.ebuild
+++ b/media-video/avidemux/avidemux-2.0.38_rc2.ebuild
@@ -1,6 +1,6 @@
 # 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.38_rc2.ebuild,v 1.1 2005/04/03 10:36:53 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc2.ebuild,v 1.2 2005/04/05 18:55:05 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}b.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"
+IUSE="a52 aac alsa altivec arts debug encode mad mmx nls vorbis pic sdl truetype xvid xv"
 
 RDEPEND="virtual/x11
 	a52? ( >=media-libs/a52dec-0.7.4 )
@@ -25,7 +25,7 @@ RDEPEND="virtual/x11
 	xvid? ( >=media-libs/xvid-1.0.0 )
 	x86? ( dev-lang/nasm )
 	nls? ( >=sys-devel/gettext-0.12.1 )
-	oggvorbis? ( >=media-libs/libogg-1.0
+	vorbis? ( >=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 )
@@ -33,8 +33,9 @@ RDEPEND="virtual/x11
 	sdl? ( media-libs/libsdl )"
 # media-sound/toolame is supported as well
 
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58
-		>=sys-devel/automake-1.8.3"
+DEPEND="$RDEPEND
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8.3"
 
 filter-flags "-fno-default-inline"
 filter-flags "-funroll-loops"
@@ -45,12 +46,12 @@ S=${WORKDIR}/${MY_P}b
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${PV}-fix-faad.patch
 	cd ${S} || 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
@@ -64,13 +65,14 @@ src_compile() {
 	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_enable altivec` \
-		`use_with pic` \
+		$(use_enable nls) \
+		$(use_enable altivec) \
+		$(use_enable mmx) \
+		$(use_enable aac faac) $(use_enable aac faad) \
+		$(use_with pic) \
+		--disable-warnings \
 		${myconf} || die "configure failed"
 	make || die "make failed"
 }
diff --git a/media-video/avidemux/files/2.0.38_rc2-fix-faad.patch b/media-video/avidemux/files/2.0.38_rc2-fix-faad.patch
new file mode 100644
index 000000000000..b2062e26f9f1
--- /dev/null
+++ b/media-video/avidemux/files/2.0.38_rc2-fix-faad.patch
@@ -0,0 +1,21 @@
+diff -ur avidemux-2.0.38rc2b.orig/avidemux/ADM_audiocodec/ADM_codecfaad.cpp avidemux-2.0.38rc2b/avidemux/ADM_audiocodec/ADM_codecfaad.cpp
+--- avidemux-2.0.38rc2b.orig/avidemux/ADM_audiocodec/ADM_codecfaad.cpp	2005-04-04 23:59:19.044987480 +0200
++++ avidemux-2.0.38rc2b/avidemux/ADM_audiocodec/ADM_codecfaad.cpp	2005-04-05 00:00:22.642319216 +0200
+@@ -33,7 +33,7 @@
+ ADM_faad::ADM_faad( uint32_t fourcc ,WAVHeader *info,uint32_t l,uint8_t *d) :   ADM_Audiocodec(fourcc)
+ {
+ faacDecConfigurationPtr conf;
+-unsigned long srate;
++unsigned int srate;
+ unsigned char chan;
+ 		_inited=0;
+ 		_instance=NULL;
+@@ -89,7 +89,7 @@
+ void *outbuf;
+ faacDecFrameInfo info;
+ int max=0;
+-unsigned long srate=0;
++unsigned int srate=0;
+ unsigned char chan=0;
+ uint8_t first=0;
+