From 553a7a6dff5a23f480270ec78cb3cb858266de10 Mon Sep 17 00:00:00 2001
From: Steve Dibb <beandog@gentoo.org>
Date: Sat, 17 Mar 2007 20:06:39 +0000
Subject: [PATCH] version bump, bug 152718, thanks to Tim Harder, Christian
 Shcmidt and stephan for ebuilds and patches Package-Manager: portage-2.1.2.2

---
 media-libs/faac/ChangeLog                     |  9 ++-
 media-libs/faac/Manifest                      | 20 ++++--
 media-libs/faac/faac-1.25.ebuild              | 41 +++++++++++++
 media-libs/faac/files/digest-faac-1.25        |  3 +
 .../files/faac-1.25-external-libmp4v2.patch   | 61 +++++++++++++++++++
 5 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 media-libs/faac/faac-1.25.ebuild
 create mode 100644 media-libs/faac/files/digest-faac-1.25
 create mode 100644 media-libs/faac/files/faac-1.25-external-libmp4v2.patch

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index 505613e12ed7..bce126e747f8 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.47 2007/03/17 13:34:57 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.48 2007/03/17 20:06:39 beandog Exp $
+
+*faac-1.25 (17 Mar 2007)
+
+  17 Mar 2007; Steve Dibb <beandog@gentoo.org>
+  +files/faac-1.25-external-libmp4v2.patch, +faac-1.25.ebuild:
+  version bump, bug 152718, thanks to Tim Harder, Christian Shcmidt and
+  stephan for ebuilds and patches
 
   17 Mar 2007; Steve Dibb <beandog@gentoo.org> faac-1.24-r3.ebuild:
   amd64 stable
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 36516641c5b1..b8f953327edc 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -14,7 +14,12 @@ AUX faac-1.24-tracknumber.patch 799 RMD160 76281d80c2dbc16cd44b83841bdcfa59a660b
 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
+AUX faac-1.25-external-libmp4v2.patch 2175 RMD160 9fab6320c41c6bde007e95b507146c5d63ce9e96 SHA1 31839e77e2e6fa05b111cab03f14d8d657e6b507 SHA256 aed09e5f01b6a184a1c6269eac94426caa85e83f0b9f8c4c9576bf0c2ad3a8c2
+MD5 3e2cf70cf469fbb9655a865de27c0a43 files/faac-1.25-external-libmp4v2.patch 2175
+RMD160 9fab6320c41c6bde007e95b507146c5d63ce9e96 files/faac-1.25-external-libmp4v2.patch 2175
+SHA256 aed09e5f01b6a184a1c6269eac94426caa85e83f0b9f8c4c9576bf0c2ad3a8c2 files/faac-1.25-external-libmp4v2.patch 2175
 DIST faac-1.24.tar.gz 282585 RMD160 7dbd8eec4f26875ea641b3319d8b970e68d88a60 SHA1 fd79715a800f8b39470d5b312f5d843a2629dd49 SHA256 a5844ff3bce0d7c885af71f41da01395d3253dcfc33863306a027a78a7cfad9e
+DIST faac-1.25.tar.gz 386608 RMD160 63a884775081e3d9a66dffaab341ed10e73365b8 SHA1 482a0217362c50ce523ce5e165c5566e1a4a2a87 SHA256 059313fcba287a95a7d71b696e54e29310b96566a2b1e7eb6ec1b03cfdf8e5b1
 EBUILD faac-1.24-r2.ebuild 1030 RMD160 317d9141c576c02e661cff1de0f8a8bdce464d96 SHA1 8b8c3001e47f121e0903121ea65fb87d658a218e SHA256 37899450653ba928fce9749b8cd8282bb909651833ac2073fe5a67dcefe1f1b1
 MD5 e9f05ddc8b6538a245db93f46dcd200e faac-1.24-r2.ebuild 1030
 RMD160 317d9141c576c02e661cff1de0f8a8bdce464d96 faac-1.24-r2.ebuild 1030
@@ -31,10 +36,14 @@ EBUILD faac-1.24.ebuild 885 RMD160 e7457e639a5ecb2623d47b0d2d5fa06cf5d0325f SHA1
 MD5 f35a68792778a5aeb6f44a7cb61a7d7f faac-1.24.ebuild 885
 RMD160 e7457e639a5ecb2623d47b0d2d5fa06cf5d0325f faac-1.24.ebuild 885
 SHA256 b3276dd74d2f4c8ce1fb173344150bcabde4a7514101340a5e2ed5c67a85d06b faac-1.24.ebuild 885
-MISC ChangeLog 6322 RMD160 be6f446c1c1c46688e920421a740ad00d77ee424 SHA1 dcbdf4a498c90e2010649f6593e57ee58afaac24 SHA256 8a928d4a889c53d7eda44065acb90d755fb7d5ab24c1b215c4bdc0ebd95b5a6b
-MD5 3a4a58c6b31f56fdb760005ed7dc9e3e ChangeLog 6322
-RMD160 be6f446c1c1c46688e920421a740ad00d77ee424 ChangeLog 6322
-SHA256 8a928d4a889c53d7eda44065acb90d755fb7d5ab24c1b215c4bdc0ebd95b5a6b ChangeLog 6322
+EBUILD faac-1.25.ebuild 993 RMD160 e685a45ee305b0362b257e3d067360e6bcf5d132 SHA1 7b8c8bfcc198fe7c687bc04aa9fce343b045910d SHA256 cb5f168a5951819d6d632f0f13029c97a020121619f9b9f94b430e2579021c80
+MD5 d728bc1229b9d615c903badf65b5e6d9 faac-1.25.ebuild 993
+RMD160 e685a45ee305b0362b257e3d067360e6bcf5d132 faac-1.25.ebuild 993
+SHA256 cb5f168a5951819d6d632f0f13029c97a020121619f9b9f94b430e2579021c80 faac-1.25.ebuild 993
+MISC ChangeLog 6565 RMD160 cd97556afec7bd48348b646195f643f0ad7c6651 SHA1 0ab0f4a2849fcc4905bcc263adbdd7b9a59ea551 SHA256 ebe0c03da41f8681c75f16bab51abb3335165b763524162d10eeac115f3cd915
+MD5 ae70f81debfe91d27c0668b8099e72a8 ChangeLog 6565
+RMD160 cd97556afec7bd48348b646195f643f0ad7c6651 ChangeLog 6565
+SHA256 ebe0c03da41f8681c75f16bab51abb3335165b763524162d10eeac115f3cd915 ChangeLog 6565
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -51,3 +60,6 @@ SHA256 629b745951c8f55ba55b195c692f50f548747b32a5fe4d6401d6d9374269e690 files/di
 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
+MD5 086ba7d25ff007f1cc12d0d33dca0c4a files/digest-faac-1.25 229
+RMD160 6ecdb0becfeabcc3c8a43bbb5153a8ce442c6a2f files/digest-faac-1.25 229
+SHA256 1dca5a5a6ba33376a2f8b1e5e4f788cb40365513b0631fd6e3971e61a71d5537 files/digest-faac-1.25 229
diff --git a/media-libs/faac/faac-1.25.ebuild b/media-libs/faac/faac-1.25.ebuild
new file mode 100644
index 000000000000..30879266d467
--- /dev/null
+++ b/media-libs/faac/faac-1.25.ebuild
@@ -0,0 +1,41 @@
+# 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.25.ebuild,v 1.1 2007/03/17 20:06:39 beandog Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+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
+	app-text/recode"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/${P}-external-libmp4v2.patch
+	recode ibmpc..latin1 configure.in
+
+	eautoreconf
+	elibtoolize
+	epunt_cxx
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO docs/libfaac.pdf
+	dohtml docs/*
+}
diff --git a/media-libs/faac/files/digest-faac-1.25 b/media-libs/faac/files/digest-faac-1.25
new file mode 100644
index 000000000000..d64430425cd1
--- /dev/null
+++ b/media-libs/faac/files/digest-faac-1.25
@@ -0,0 +1,3 @@
+MD5 75eaffd18ee072eaca52ae2d622bb1db faac-1.25.tar.gz 386608
+RMD160 63a884775081e3d9a66dffaab341ed10e73365b8 faac-1.25.tar.gz 386608
+SHA256 059313fcba287a95a7d71b696e54e29310b96566a2b1e7eb6ec1b03cfdf8e5b1 faac-1.25.tar.gz 386608
diff --git a/media-libs/faac/files/faac-1.25-external-libmp4v2.patch b/media-libs/faac/files/faac-1.25-external-libmp4v2.patch
new file mode 100644
index 000000000000..77e74abe2947
--- /dev/null
+++ b/media-libs/faac/files/faac-1.25-external-libmp4v2.patch
@@ -0,0 +1,61 @@
+diff -ur faac/common/Makefile.am faac-new/common/Makefile.am
+--- faac/common/Makefile.am	2004-07-28 10:18:21.000000000 +0200
++++ faac-new/common/Makefile.am	2006-11-22 16:40:22.000000000 +0100
+@@ -1,4 +1,4 @@
+-if WITH_MP4V2
++if WITH_INTERNAL_MP4V2
+ SUBDIRS = mp4v2
+ else
+ SUBDIRS =
+diff -ur faac/configure.in faac-new/configure.in
+--- faac/configure.in	2006-08-13 16:17:26.000000000 +0200
++++ faac-new/configure.in	2006-11-22 16:39:18.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ AC_ARG_WITH( mp4v2,  [  --with-mp4v2            compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
+ 
+-AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
++AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ])
+ 
+ CFLAGS=${CFLAGS:-"-O2 -Wall"}
+ 
+@@ -27,6 +27,7 @@
+ AC_CHECK_LIB(gnugetopt, getopt_long)
+ 
+ AM_CONDITIONAL(WITH_MP4V2, false)
++AM_CONDITIONAL(WITH_INTERNAL_MP4V2, false)
+ 
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+@@ -35,10 +36,13 @@
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
++  MY_DEFINE(HAVE_LIBMP4V2)
++  AM_CONDITIONAL(WITH_MP4V2, true)
+ else
+   if test x$WITHMP4V2 = xyes; then
+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
+      AM_CONDITIONAL(WITH_MP4V2, true)
++     AM_CONDITIONAL(WITH_INTERNAL_MP4V2, true)
+      AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h)
+      MY_DEFINE(HAVE_LIBMP4V2)
+   else
+diff -ur faac/frontend/Makefile.am faac-new/frontend/Makefile.am
+--- faac/frontend/Makefile.am	2004-07-28 10:18:21.000000000 +0200
++++ faac-new/frontend/Makefile.am	2006-11-22 16:24:16.000000000 +0100
+@@ -3,9 +3,14 @@
+ faac_SOURCES = main.c input.c
+ 
+ if WITH_MP4V2
++if WITH_INTERNAL_MP4V2
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
+ else
+ INCLUDES = -I$(top_srcdir)/include 
++LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
++endif
++else
++INCLUDES = -I$(top_srcdir)/include 
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
-- 
2.26.2