New revision, dropping the automagic dependency on libmp4v2.

Package-Manager: portage-2.1_pre1

5 files changed, 76 insertions, 5 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index 340178a09925..ee4e0f4a0add 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/faac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.31 2005/10/16 18:14:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.32 2005/12/19 15:39:08 flameeyes Exp $
+
+*faac-1.24-r1 (19 Dec 2005)
+
+  19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/faac-1.24-faad.patch, +faac-1.24-r1.ebuild:
+  New revision, dropping the automagic dependency on libmp4v2.
 
   16 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> faac-1.24.ebuild:
   Use autotools eclass and eautoreconf instead of faac's bootstrap script,
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 8c352703d3d7..a658d88e7eca 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5c5cb885c9b6aae0d01ba3bdd4867a34 ChangeLog 4012
+MD5 b9cba2deca9cefed6c2bcd68cd5a8b47 ChangeLog 4211
 MD5 376eff56e5468e5e556e185136b498a0 faac-1.23.5.ebuild 855
+MD5 bf33170043aee274cbc63755f1339254 faac-1.24-r1.ebuild 905
 MD5 3870d2e5e634da7382012e17f24c69ad faac-1.24.ebuild 854
 MD5 3c7304d2a11a89df8123f8c096d11725 files/digest-faac-1.23.5 63
 MD5 927d4973537500e758398d0dd1daae88 files/digest-faac-1.24 61
+MD5 927d4973537500e758398d0dd1daae88 files/digest-faac-1.24-r1 61
+MD5 af9d89575787d0f3507d3c710b588924 files/faac-1.24-faad.patch 885
 MD5 cdd79fb009d4c52796f1b1e31bf6ed20 files/fix-linefeeds.sh 122
 MD5 049efb5435eb21d0c652a01219932747 files/libsndfile-1.0.diff 1368
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDUpimj5H05b2HAEkRAqD4AKCY5RG0s8tZ48chI77r/l+fYM98BgCdGBfj
-oU6dJKYv29FBUYn8PobsK3c=
-=Lxhn
+iD8DBQFDptQoAiZjviIA2XgRAmABAKCWrnBv0g2pofGCGMI9DyVr8ohOHACeI09v
+h0BB0dbsvCuksSlgEEwNv+c=
+=E/Q3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/faac/faac-1.24-r1.ebuild b/media-libs/faac/faac-1.24-r1.ebuild
new file mode 100644
index 000000000000..b57faf8a832a
--- /dev/null
+++ b/media-libs/faac/faac-1.24-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.24-r1.ebuild,v 1.1 2005/12/19 15:39:08 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"
+
+	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-r1 b/media-libs/faac/files/digest-faac-1.24-r1
new file mode 100644
index 000000000000..cfa6f489697d
--- /dev/null
+++ b/media-libs/faac/files/digest-faac-1.24-r1
@@ -0,0 +1 @@
+MD5 e72dc74db17b42b06155613489077ad7 faac-1.24.tar.gz 282585
diff --git a/media-libs/faac/files/faac-1.24-faad.patch b/media-libs/faac/files/faac-1.24-faad.patch
new file mode 100644
index 000000000000..b26b155d598c
--- /dev/null
+++ b/media-libs/faac/files/faac-1.24-faad.patch
@@ -0,0 +1,23 @@
+Index: faac/configure.in
+===================================================================
+--- faac.orig/configure.in
++++ faac/configure.in
+@@ -21,12 +21,12 @@ AC_CHECK_TYPES(int16_t)
+ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP))
+ 
+ AC_CHECK_LIB(gnugetopt, getopt_long)
+-AC_CHECK_LIB(mp4v2, MP4MetadataDelete,
+-		    [AC_MSG_NOTICE([*** Building with MP4 support ***])
+-		     MY_DEFINE([HAVE_LIBMP4V2])
+-		     LIBS="$LIBS -lstdc++ -lmp4v2"],
+-		     [AC_MSG_NOTICE([*** Building without MP4 support ***])],
+-		     -lstdc++)
++dnl AC_CHECK_LIB(mp4v2, MP4MetadataDelete,
++dnl 		    [AC_MSG_NOTICE([*** Building with MP4 support ***])
++dnl 		     MY_DEFINE([HAVE_LIBMP4V2])
++dnl 		     LIBS="$LIBS -lstdc++ -lmp4v2"],
++dnl 		     [AC_MSG_NOTICE([*** Building without MP4 support ***])],
++dnl 		     -lstdc++)
+ AC_C_BIGENDIAN
+ 
+ dnl Checks for header files required for mp4.h