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

Thanks to Heitzso for bug #103444.
(Portage version: 2.1.2.2)

4 files changed, 68 insertions, 1 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index f8c65a070f2d..0d5d44b0c8e7 100644
--- 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/faac-1.24-r4.ebuild b/media-libs/faac/faac-1.24-r4.ebuild
new file mode 100644
index 000000000000..2b1e5eae7643
--- /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
index 000000000000..9441922a2cd6
--- /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
index 000000000000..d4e3c39526f0
--- /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) {