version bump, bug 152718, thanks to Tim Harder, Christian Shcmidt and stephan for ebuilds and patches

(Portage version: 2.1.2.2)

4 files changed, 113 insertions, 1 deletions

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/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