Revbump for the the API change, that was causing major headaches to apps linking to faad2.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 114 insertions, 14 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 61a9ef4b1829..ad48684f7c3f 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.46 2005/05/12 23:43:26 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.47 2005/05/26 10:26:28 flameeyes Exp $
+
+*faad2-2.0-r7 (26 May 2005)
+
+  26 May 2005; Diego Pettenò <flameeyes@gentoo.org> +faad2-2.0-r7.ebuild:
+  Revbump for the the API change, that was causing major headaches to apps
+  linking to faad2.
 
   12 May 2005; Olivier Crête <tester@gentoo.org>
   +files/faad2-2.0-amd64.patch, faad2-2.0-r6.ebuild:
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index ca3b917c7cfc..79e8325b3f0b 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 b3ff8340371b3405d00dd20ddddbc8cf ChangeLog 6621
 MD5 0fe7937cc235e121a0f49ad7f096bcf3 faad2-1.1.ebuild 1080
-MD5 b16b4f0c45feaa82f3c58f5f69b588dd metadata.xml 472
+MD5 28448949b05e4107de323e7468679e65 faad2-2.0-r2.ebuild 1722
 MD5 6ef9876bb677ab3ba3ce5754c886af12 faad2-2.0-r3.ebuild 2092
-MD5 281abfb24dcc32c9cef7c654ec7bcf42 ChangeLog 6418
 MD5 09895e3d45713684c8539ee3e217c806 faad2-2.0-r4.ebuild 2082
-MD5 28448949b05e4107de323e7468679e65 faad2-2.0-r2.ebuild 1722
 MD5 cb1349d60a6c585a5dffc2cee85876af faad2-2.0-r6.ebuild 2126
-MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
-MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
-MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
+MD5 b16b4f0c45feaa82f3c58f5f69b588dd metadata.xml 472
+MD5 127d6a29f70587f040fca6a268be20c1 faad2-2.0-r7.ebuild 2129
+MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
+MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r2 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r3 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r4 61
+MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r6 61
 MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
-MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
-MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r2 61
-MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
+MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
+MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
+MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
 MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
-MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r6 61
+MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
 MD5 edab653b8b9960b0ea4a04a745786c5f files/faad2-2.0-amd64.patch 9564
+MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r7 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCg+oqmOfEJZHYOKcRApFpAKCCi79AIhR51C8cc+77asfIMJ8JMgCdEvkM
-HW4bKsVxqCdh2l31j/HpFpw=
-=qLS0
+iD8DBQFClaNhj5H05b2HAEkRAqj5AKCdNK0R2QgLqF1U33td83uK+EikdgCdGIxw
+8LqII6Ky54m15tun/JHJBNY=
+=qj46
 -----END PGP SIGNATURE-----
diff --git a/media-libs/faad2/faad2-2.0-r7.ebuild b/media-libs/faad2/faad2-2.0-r7.ebuild
new file mode 100644
index 000000000000..f6b86ca650c7
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0-r7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r7.ebuild,v 1.1 2005/05/26 10:26:28 flameeyes Exp $
+
+inherit eutils libtool flag-o-matic
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/"
+SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc"
+IUSE="xmms"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
+		media-libs/id3lib )
+	!media-video/mpeg4ip"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.7
+	sys-devel/automake
+	sys-devel/autoconf"
+
+S=${WORKDIR}/${PN}
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README README.linux TODO"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile-space.patch
+	epatch ${FILESDIR}/${P}-configure-mpeg4ip.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	cd ${S}/common/mp4v2
+	epatch ${FILESDIR}/mp4atom-sliver.patch
+
+	cd ${S}/plugins/xmms/src
+	epatch ${FILESDIR}/${P}-noext.patch
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-amd64.patch
+
+	# Get the xmms plugin to behave
+	cd ${S}
+	elibtoolize
+
+}
+
+src_compile() {
+	# see #34392
+	filter-flags -mfpmath=sse
+
+	# Fix for bug #67510
+	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7  \
+		aclocal -I . && \
+		autoheader && \
+		libtoolize --automake --copy	&& \
+		automake --add-missing --copy	&& \
+		autoconf || die "Couldn't build configuration file"
+
+	# mp4v2 needed for rhythmbox
+	# drm needed for nothing but doesn't hurt
+
+	econf \
+		--with-mp4v2 \
+		--with-drm \
+		`use_with xmms` \
+		|| die
+
+	# emake causes xmms plugin building to fail
+	emake || die
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc ${DOCS}
+
+	# unneeded include, <systems.h> breaks building of apps, but
+	# it is necessary because includes <sys/types.h>,
+	# which is needed by /usr/include/mp4.h... so we just
+	# include <sys/types.h> instead.  See bug #55767
+	dosed "s:#include <systems.h>:#include <sys/types.h>:" /usr/include/mpeg4ip.h
+	# make latexer happy
+	dosed "s:\"mp4ff_int_types.h\":<stdint.h>:" /usr/include/mp4ff.h
+
+}
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r7 b/media-libs/faad2/files/digest-faad2-2.0-r7
new file mode 100644
index 000000000000..38c97b9bd3b4
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r7
@@ -0,0 +1 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660