Added patch to fix infinite loop when converting MS encoded WAV files.

Thanks to Heitzso for bug #103444.
Package-Manager: portage-2.1.2.2

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index f8c65a070f2d7cdf42e3885aea98824f88337c0e..0d5d44b0c8e78b8bcde4063aa39efd0857f83ae7 100644 (file)
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/faac
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.45 2007/03/10 12:04:58 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.46 2007/03/12 03:39:03 dirtyepic Exp $
+
+*faac-1.24-r4 (12 Mar 2007)
+
+  12 Mar 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/faac-1.24-fixnoise-hang.patch, +faac-1.24-r4.ebuild:
+  Added patch to fix infinite loop when converting MS encoded WAV files.
+  Thanks to Heitzso for bug #103444.
 
   10 Mar 2007; Matti Bickel <mabi@gentoo.org> faac-1.24-r3.ebuild:
   ppc stable (bug #166539)

diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 26ccb377f9db5d297fa50d6fc41279b16096b934..fec3e78c14ec5c139b7d758d6a89537e615e443a 100644 (file)
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX faac-1.24-as-needed.patch 515 RMD160 2cfb414929d4b0099773460f05e547d713410f78 SHA1 fb9f343bd3b5007199ca10add3bc370db047a61e SHA256 f713b86101debfb4d6ddfe6b9f48f8edef6aa6241e5a577d11ed23bee8b3e419
 MD5 26f55a8c8020bddb380eb5e5b7b520e0 files/faac-1.24-as-needed.patch 515
 RMD160 2cfb414929d4b0099773460f05e547d713410f78 files/faac-1.24-as-needed.patch 515
@@ -9,6 +6,10 @@ AUX faac-1.24-faad.patch 885 RMD160 7f7e323c7a4953bb7610f58473932d50f976168b SHA
 MD5 af9d89575787d0f3507d3c710b588924 files/faac-1.24-faad.patch 885
 RMD160 7f7e323c7a4953bb7610f58473932d50f976168b files/faac-1.24-faad.patch 885
 SHA256 6bacb992f8f7ecfd2fd8ecf5be7d203bdcc0806ebf36362b58531d90028d634a files/faac-1.24-faad.patch 885
+AUX faac-1.24-fixnoise-hang.patch 729 RMD160 5797afe821231b4216266a5a46d1a82435beccbd SHA1 1ebd5de739a00fab6a854bb458ed19eddd0c2ce1 SHA256 166bc8bca9c54a33c0b42917edeada29c70cd2dae6cb77d8b34500bbc1b69548
+MD5 ca475e98dab9ae4a3059ae27844a49bb files/faac-1.24-fixnoise-hang.patch 729
+RMD160 5797afe821231b4216266a5a46d1a82435beccbd files/faac-1.24-fixnoise-hang.patch 729
+SHA256 166bc8bca9c54a33c0b42917edeada29c70cd2dae6cb77d8b34500bbc1b69548 files/faac-1.24-fixnoise-hang.patch 729
 AUX faac-1.24-tracknumber.patch 799 RMD160 76281d80c2dbc16cd44b83841bdcfa59a660b3ba SHA1 48c8f8d03741b297c18aeac62acb3c5073fff91e SHA256 d5c9206a7bb0033f12de16f2099b3bb0e96991b48325b2da1e2c806b35d2655c
 MD5 dfed1381a1f117a2d0bfde9ef7dc64ff files/faac-1.24-tracknumber.patch 799
 RMD160 76281d80c2dbc16cd44b83841bdcfa59a660b3ba files/faac-1.24-tracknumber.patch 799
@@ -22,14 +23,18 @@ EBUILD faac-1.24-r3.ebuild 919 RMD160 c02d07b95da05f567d1f9ef1a9ad1ccfaedc7135 S
 MD5 9df58cd8590fc256fb584fff612417b8 faac-1.24-r3.ebuild 919
 RMD160 c02d07b95da05f567d1f9ef1a9ad1ccfaedc7135 faac-1.24-r3.ebuild 919
 SHA256 c323944212ed3bb659af7fc9f2405b0dc339fc89d5541370275db9ebf8b62e31 faac-1.24-r3.ebuild 919
+EBUILD faac-1.24-r4.ebuild 976 RMD160 f8ca79b968cdc4ed7a3299c0beaa34d805c989b5 SHA1 944cd25468c1e6308577a6f124c48066a73b3f98 SHA256 838a65627c71e90bfe1e8a96e836d430cff09953f8b19d2da4eef7f4ae01341e
+MD5 221f6d593fd5256c3a9ef3ad2fe8c95a faac-1.24-r4.ebuild 976
+RMD160 f8ca79b968cdc4ed7a3299c0beaa34d805c989b5 faac-1.24-r4.ebuild 976
+SHA256 838a65627c71e90bfe1e8a96e836d430cff09953f8b19d2da4eef7f4ae01341e faac-1.24-r4.ebuild 976
 EBUILD faac-1.24.ebuild 885 RMD160 e7457e639a5ecb2623d47b0d2d5fa06cf5d0325f SHA1 b29f26848f28a7f503a664ebe305c5033705369b SHA256 b3276dd74d2f4c8ce1fb173344150bcabde4a7514101340a5e2ed5c67a85d06b
 MD5 f35a68792778a5aeb6f44a7cb61a7d7f faac-1.24.ebuild 885
 RMD160 e7457e639a5ecb2623d47b0d2d5fa06cf5d0325f faac-1.24.ebuild 885
 SHA256 b3276dd74d2f4c8ce1fb173344150bcabde4a7514101340a5e2ed5c67a85d06b faac-1.24.ebuild 885
-MISC ChangeLog 5985 RMD160 ffddc5852c30af4627f2b8bd3645f9645ab63f5b SHA1 d4c281bdf83e6fdee9b703b834168e0acecf8a3b SHA256 5aa15b723691741e8b8e45a339a3ff5658176010b320359af124eed45984405e
-MD5 d73d031159a146b5bfacb28a792cb28f ChangeLog 5985
-RMD160 ffddc5852c30af4627f2b8bd3645f9645ab63f5b ChangeLog 5985
-SHA256 5aa15b723691741e8b8e45a339a3ff5658176010b320359af124eed45984405e ChangeLog 5985
+MISC ChangeLog 6240 RMD160 125b838bad26d8933407f7a3ac2c23cc17a891f5 SHA1 d07795687eb22eff4f5aeaf555b10885200c2e96 SHA256 fab013b8d5b636bf1ee1f6e5874dd246cb758ae2ce0e4674b225d2e6a318c0e6
+MD5 68825f3a0c387d31b2ea957ff223d9fa ChangeLog 6240
+RMD160 125b838bad26d8933407f7a3ac2c23cc17a891f5 ChangeLog 6240
+SHA256 fab013b8d5b636bf1ee1f6e5874dd246cb758ae2ce0e4674b225d2e6a318c0e6 ChangeLog 6240
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -43,10 +48,6 @@ SHA256 629b745951c8f55ba55b195c692f50f548747b32a5fe4d6401d6d9374269e690 files/di
 MD5 d6e9d2ebbabd23307f78a853a2aaa749 files/digest-faac-1.24-r3 229
 RMD160 b77b7e71e79e6acabe5cae38ed83f08f523744bb files/digest-faac-1.24-r3 229
 SHA256 629b745951c8f55ba55b195c692f50f548747b32a5fe4d6401d6d9374269e690 files/digest-faac-1.24-r3 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF8p6ufNMcoUhJ7GwRAvEgAKCCSL7fkcEbIvARddhuFxKhuxUqmwCcD7sg
-Obdr1O8HQc4f7j8Yu/ljDoY=
-=ACPF
------END PGP SIGNATURE-----
+MD5 d6e9d2ebbabd23307f78a853a2aaa749 files/digest-faac-1.24-r4 229
+RMD160 b77b7e71e79e6acabe5cae38ed83f08f523744bb files/digest-faac-1.24-r4 229
+SHA256 629b745951c8f55ba55b195c692f50f548747b32a5fe4d6401d6d9374269e690 files/digest-faac-1.24-r4 229

diff --git a/media-libs/faac/faac-1.24-r4.ebuild b/media-libs/faac/faac-1.24-r4.ebuild
new file mode 100644 (file)
index 0000000..2b1e5ea
--- /dev/null
+++ b/media-libs/faac/faac-1.24-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.24-r4.ebuild,v 1.1 2007/03/12 03:39:03 dirtyepic Exp $
+
+inherit libtool eutils autotools
+
+DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
+HOMEPAGE="http://www.audiocoding.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libsndfile-1.0.0
+       media-libs/libmp4v2"
+DEPEND="${RDEPEND}
+       !<media-libs/faad2-2.0-r3"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-tracknumber.patch
+       epatch "${FILESDIR}"/${P}-as-needed.patch
+       epatch "${FILESDIR}"/${P}-fixnoise-hang.patch
+
+       eautoreconf
+       elibtoolize
+       epunt_cxx
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog NEWS README TODO docs/libfaac.pdf
+}

diff --git a/media-libs/faac/files/digest-faac-1.24-r4 b/media-libs/faac/files/digest-faac-1.24-r4
new file mode 100644 (file)
index 0000000..9441922
--- /dev/null
+++ b/media-libs/faac/files/digest-faac-1.24-r4
@@ -0,0 +1,3 @@
+MD5 e72dc74db17b42b06155613489077ad7 faac-1.24.tar.gz 282585
+RMD160 7dbd8eec4f26875ea641b3319d8b970e68d88a60 faac-1.24.tar.gz 282585
+SHA256 a5844ff3bce0d7c885af71f41da01395d3253dcfc33863306a027a78a7cfad9e faac-1.24.tar.gz 282585

diff --git a/media-libs/faac/files/faac-1.24-fixnoise-hang.patch b/media-libs/faac/files/faac-1.24-fixnoise-hang.patch
new file mode 100644 (file)
index 0000000..d4e3c39
--- /dev/null
+++ b/media-libs/faac/files/faac-1.24-fixnoise-hang.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/show_bug.cgi?id=103444
+http://sourceforge.net/tracker/index.php?func=detail&aid=975905&group_id=704&atid=100704
+
+diff -Naur faac-orig/libfaac/frame.c faac/libfaac/frame.c
+--- faac-orig/libfaac/frame.c  2004-04-13 07:47:33.000000000 -0600
++++ faac/libfaac/frame.c       2007-03-11 21:24:23.000000000 -0600
+@@ -731,6 +731,11 @@
+ 
+     MSEncode(coderInfo, channelInfo, hEncoder->freqBuff, numChannels, allowMidside);
+ 
++      for (channel = 0; channel < numChannels; channel++)
++      {
++              CalcAvgEnrg(&coderInfo[channel], hEncoder->freqBuff[channel]);
++      }
++
+     /* Quantize and code the signal */
+     for (channel = 0; channel < numChannels; channel++) {
+         if (coderInfo[channel].block_type == ONLY_SHORT_WINDOW) {