Add patch to fix mishandling of track numbers 07 and 08, thanks to Jose A. Hernandez in bug #80690.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 101 insertions, 6 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index 3556d952bd5f..666c947395d0 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/faac
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.33 2006/01/15 23:43:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.34 2006/04/18 16:46:30 flameeyes Exp $
+
+*faac-1.24-r2 (18 Apr 2006)
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/faac-1.24-tracknumber.patch, +faac-1.24-r2.ebuild:
+  Add patch to fix mishandling of track numbers 07 and 08, thanks to Jose A.
+  Hernandez in bug #80690.
 
   15 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/libsndfile-1.0.diff, -files/fix-linefeeds.sh, -faac-1.23.5.ebuild:
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 7af7f48f4dcf..23d624d8770a 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,17 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f20741ae24f6bae336b16b8703df260e ChangeLog 4361
+MD5 34bc8964b2ed54e2ee7b347336bbf071 ChangeLog 4608
+RMD160 ba10789c3c1a6a505571e52ed51cdbe62ae67703 ChangeLog 4608
+SHA256 85b4812cc64b9c784985cb63bb5041af458e9c0a2bfd85a9e0e0ee11c119a286 ChangeLog 4608
 MD5 bf33170043aee274cbc63755f1339254 faac-1.24-r1.ebuild 905
+RMD160 6c77c5af6b7f763bf57d7640da67d32ed8ae76a1 faac-1.24-r1.ebuild 905
+SHA256 cefa5cc330193c044755b2238b6921755bd4404ede60c4c0640564230f014567 faac-1.24-r1.ebuild 905
+MD5 965ed76f06650d000e8fb7c4827f2bfc faac-1.24-r2.ebuild 950
+RMD160 4a4a1511de3ba4e817ce7b1daec3d4d62532a550 faac-1.24-r2.ebuild 950
+SHA256 038c12cbe17ca93ddd7576ccddf69bd765c63d2f74b71ae07510a4e1d158bbaa faac-1.24-r2.ebuild 950
 MD5 3870d2e5e634da7382012e17f24c69ad faac-1.24.ebuild 854
+RMD160 41660f901a3a559394742eb418bea730b0ac86d7 faac-1.24.ebuild 854
+SHA256 3e4200edc85ec9f9b5af36af90e839296695be4dd664d7b9146472c771f3066e faac-1.24.ebuild 854
 MD5 927d4973537500e758398d0dd1daae88 files/digest-faac-1.24 61
+RMD160 c2ffffca247b0b3f447d0e3648f7382f7e9b9a6e files/digest-faac-1.24 61
+SHA256 143e67433042786e8b95c5d6e86e263960eb49a1f42ea9a85416e6729b6f678c files/digest-faac-1.24 61
 MD5 927d4973537500e758398d0dd1daae88 files/digest-faac-1.24-r1 61
+RMD160 c2ffffca247b0b3f447d0e3648f7382f7e9b9a6e files/digest-faac-1.24-r1 61
+SHA256 143e67433042786e8b95c5d6e86e263960eb49a1f42ea9a85416e6729b6f678c files/digest-faac-1.24-r1 61
+MD5 d6e9d2ebbabd23307f78a853a2aaa749 files/digest-faac-1.24-r2 229
+RMD160 b77b7e71e79e6acabe5cae38ed83f08f523744bb files/digest-faac-1.24-r2 229
+SHA256 629b745951c8f55ba55b195c692f50f548747b32a5fe4d6401d6d9374269e690 files/digest-faac-1.24-r2 229
 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
+MD5 dfed1381a1f117a2d0bfde9ef7dc64ff files/faac-1.24-tracknumber.patch 799
+RMD160 76281d80c2dbc16cd44b83841bdcfa59a660b3ba files/faac-1.24-tracknumber.patch 799
+SHA256 d5c9206a7bb0033f12de16f2099b3bb0e96991b48325b2da1e2c806b35d2655c files/faac-1.24-tracknumber.patch 799
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDyt4eAiZjviIA2XgRAhm2AJ9vFz/SoogzYyXIEqI0Kh1C6r8I5ACgr7Zy
-PAOduhiHS59hKjSJyGOyHes=
-=bH90
+iD8DBQFERRc0AiZjviIA2XgRAkFdAKC7ISK6NT2H4qXgb7cDXIggOg13vgCglZ8f
+QPzNEZkgQPpee/cd4U2eDD0=
+=9+RY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/faac/faac-1.24-r2.ebuild b/media-libs/faac/faac-1.24-r2.ebuild
new file mode 100644
index 000000000000..f1b0f7660b92
--- /dev/null
+++ b/media-libs/faac/faac-1.24-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.24-r2.ebuild,v 1.1 2006/04/18 16:46:30 flameeyes 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 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsndfile-1.0.0"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-1.3.5
+	sys-devel/automake
+	!<media-libs/faad2-2.0-r3"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-faad.patch"
+	epatch "${FILESDIR}/${P}-tracknumber.patch"
+
+	eautoreconf
+	elibtoolize
+	epunt_cxx
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO docs/libfaac.pdf
+}
diff --git a/media-libs/faac/files/digest-faac-1.24-r2 b/media-libs/faac/files/digest-faac-1.24-r2
new file mode 100644
index 000000000000..9441922a2cd6
--- /dev/null
+++ b/media-libs/faac/files/digest-faac-1.24-r2
@@ -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-tracknumber.patch b/media-libs/faac/files/faac-1.24-tracknumber.patch
new file mode 100644
index 000000000000..faea8fd55731
--- /dev/null
+++ b/media-libs/faac/files/faac-1.24-tracknumber.patch
@@ -0,0 +1,23 @@
+This patch is needed to fix usage of faac with track numbers higher than 7 with
+a 0 prefix. The original scanf parameter %i will consider numbers starting by 0
+as octal, thus breaking the numbering for 08 and 09 tracks.
+
+See Gentoo bug #80690.
+
+Index: faac/frontend/main.c
+===================================================================
+--- faac.orig/frontend/main.c
++++ faac/frontend/main.c
+@@ -607,10 +607,10 @@ int main(int argc, char *argv[])
+ 	    album = optarg;
+ 	    break;
+ 	case TRACK_FLAG:
+-	    sscanf(optarg, "%i/%i", &trackno, &ntracks);
++	    sscanf(optarg, "%d/%d", &trackno, &ntracks);
+ 	    break;
+ 	case DISC_FLAG:
+-	    sscanf(optarg, "%i/%i", &discno, &ndiscs);
++	    sscanf(optarg, "%d/%d", &discno, &ndiscs);
+ 	    break;
+ 	case COMPILATION_FLAG:
+ 	    compilation = 0x1;