4 files changed, 88 insertions, 1 deletions
diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index 0edd80c4e7a1..e7d6096417dc 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,12 @@
 # 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.54 2007/08/13 20:59:03 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.55 2007/10/12 22:29:40 aballier Exp $
+
+*faac-1.26 (12 Oct 2007)
+
+  12 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/faac-1.26-external-libmp4v2.patch, +faac-1.26.ebuild:
+  version bump
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> faac-1.25.ebuild:
   ppc. stable
diff --git a/media-libs/faac/faac-1.26.ebuild b/media-libs/faac/faac-1.26.ebuild
new file mode 100644
index 000000000000..b985a2850413
--- /dev/null
+++ b/media-libs/faac/faac-1.26.ebuild
@@ -0,0 +1,43 @@
+# 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.26.ebuild,v 1.1 2007/10/12 22:29:40 aballier Exp $
+
+inherit libtool eutils autotools flag-o-matic
+
+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}-external-libmp4v2.patch"
+
+	eautoreconf
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	filter-flags -ftree-vectorize
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO docs/libfaac.pdf
+	dohtml docs/*
+}
diff --git a/media-libs/faac/files/digest-faac-1.26 b/media-libs/faac/files/digest-faac-1.26
new file mode 100644
index 000000000000..5decb156eae0
--- /dev/null
+++ b/media-libs/faac/files/digest-faac-1.26
@@ -0,0 +1,3 @@
+MD5 1d7c019bd2dbb4f3101b8937ebc59cf6 faac-1.26.tar.gz 400915
+RMD160 40656b7b1a7c207373d7a1ba0167f220d9073ecd faac-1.26.tar.gz 400915
+SHA256 4b48e2e22267e9260365c7bee4513bf13d262b8b13cf7f9504e9fa612b6aa951 faac-1.26.tar.gz 400915
diff --git a/media-libs/faac/files/faac-1.26-external-libmp4v2.patch b/media-libs/faac/files/faac-1.26-external-libmp4v2.patch
new file mode 100644
index 000000000000..3cfd67a6aed9
--- /dev/null
+++ b/media-libs/faac/files/faac-1.26-external-libmp4v2.patch
@@ -0,0 +1,35 @@
+Index: faac/configure.in
+===================================================================
+--- faac.orig/configure.in
++++ faac/configure.in
+@@ -28,6 +28,7 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
+ AC_CHECK_LIB(gnugetopt, getopt_long)
+ 
+ AM_CONDITIONAL(WITH_MP4V2, false)
++AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
+ 
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+@@ -36,6 +37,8 @@ AC_CHECK_DECLS([MP4Create, MP4MetadataDe
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
++  MY_DEFINE(HAVE_LIBMP4V2)
++  AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
+ else
+   if test x$WITHMP4V2 = xyes; then
+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
+Index: faac/frontend/Makefile.am
+===================================================================
+--- faac.orig/frontend/Makefile.am
++++ faac/frontend/Makefile.am
+@@ -7,5 +7,9 @@ INCLUDES = -I$(top_srcdir)/include -I$(t
+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
+ else
+ INCLUDES = -I$(top_srcdir)/include 
++if WITH_EXTERNAL_MP4V2
++LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
++else
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
++endif