Revision bump to fix bad header file. Closes bug #55767.

4 files changed, 95 insertions, 9 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 86c782222147..c27b7c211cbd 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.32 2004/06/24 22:59:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.33 2004/07/10 18:13:47 eradicator Exp $
+
+*faad2-2.0-r3 (10 Jul 2004)
+
+  10 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +faad2-2.0-r3.ebuild:
+  Revision bump to fix bad header file.  Closes bug #55767.
 
   22 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> -faad2-2.0.ebuild:
   Marking 2.0-r2 stable on x86 and sparc. Removing old ebuilds. Blocking if
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 4d9b31d5ba30..5f771b484a09 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,14 +1,16 @@
-MD5 3a0b110931877c8232a68c5fb353f762 faad2-2.0_rc3-r1.ebuild 1642
+MD5 eec13d25cd60d79985932029572fd826 faad2-2.0-r3.ebuild 1901
 MD5 ebffa98290c094ef2a252a81fa327b38 faad2-1.1.ebuild 1080
-MD5 584e8e91e5a6243c186d6a777c6e2f3c ChangeLog 4534
-MD5 3956aeb67c4d833003423c20bac8f39f faad2-2.0-r2.ebuild 1723
+MD5 44dd4b7027cb750f2b000fb4096554dd ChangeLog 4705
+MD5 3a0b110931877c8232a68c5fb353f762 faad2-2.0_rc3-r1.ebuild 1642
 MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
-MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
+MD5 3956aeb67c4d833003423c20bac8f39f faad2-2.0-r2.ebuild 1723
 MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
-MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
-MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
-MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r2 61
+MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r3 61
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
-MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
 MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
+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 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
diff --git a/media-libs/faad2/faad2-2.0-r3.ebuild b/media-libs/faad2/faad2-2.0-r3.ebuild
new file mode 100644
index 000000000000..5ae16a760422
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r3.ebuild,v 1.1 2004/07/10 18:13:47 eradicator Exp $
+
+inherit eutils libtool flag-o-matic
+
+DESCRIPTION="The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files"
+HOMEPAGE="http://faac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa ~mips"
+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
+
+	# Get the xmms plugin to behave
+	cd ${S}
+	elibtoolize
+}
+
+src_compile() {
+	# see #34392
+	filter-flags -mfpmath=sse
+
+	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 sh ./bootstrap
+
+	# 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
+}
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r3 b/media-libs/faad2/files/digest-faad2-2.0-r3
new file mode 100644
index 000000000000..38c97b9bd3b4
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r3
@@ -0,0 +1 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660