add media-libs/faad-2.0 with appropriates patches

7 files changed, 139 insertions, 7 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index e9b9a7765ac9..f901d33f18d7 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.17 2004/02/26 18:29:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.18 2004/03/13 15:52:14 tester Exp $
+
+*faad2-2.0 (13 Mar 2004)
+
+  13 Mar 2004; <tester@gentoo.org> faad2-2.0.ebuild,
+  files/faad2-2.0-configure-mpeg4ip.patch, files/mp4atom-sliver.patch,
+  files/faad2-2.0-makefile-space.patch:
+  Bump to 2.0. Add patch for sliver bug (from mpeg4ip), fix configure script to
+  check correctly for mpeg4ip and fix space-vs-tabs in Makefile. Fixes bug
+  #43096
 
   26 Feb 2004; Guy Martin <gmsoft@gentoo.org> faad2-2.0_rc3-r1.ebuild:
   Keyworded ~hppa.
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index cf8cc8880dde..3b79c18cb83c 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,11 +1,14 @@
+MD5 1b9b557bd50301ef527805a6519f8f08 faad2-2.0_rc3.ebuild 1349
 MD5 8a3530b4647b037928ee4bd8c67838fe ChangeLog 2519
 MD5 5957ea55f1b2f774c2118054f8d68944 faad2-1.1.ebuild 1007
-MD5 bee842eaa79e76a1be4f8380779b9512 faad2-2.0_rc1.ebuild 1688
-MD5 9dacb8ea7625e127d600b96f11f5b175 faad2-2.0_rc3-r1.ebuild 1627
-MD5 6b83d28f546c8d7fa22753b6591f8745 faad2-2.0_rc3.ebuild 1262
 MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
-MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
-MD5 2603753c0def47977fce3b5d494b8f65 files/digest-faad2-2.0_rc1 65
-MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3 65
+MD5 0d11a188ad76acbb676197ca72042bdf faad2-2.0_rc3-r1.ebuild 1735
+MD5 0d11a188ad76acbb676197ca72042bdf faad2-2.0.ebuild 1735
+MD5 bee842eaa79e76a1be4f8380779b9512 faad2-2.0_rc1.ebuild 1688
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
+MD5 6264dccf9a4c49712b65b406825c5113 files/sliver.patch 659
+MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0 61
+MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3 65
+MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
 MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
+MD5 2603753c0def47977fce3b5d494b8f65 files/digest-faad2-2.0_rc1 65
diff --git a/media-libs/faad2/faad2-2.0.ebuild b/media-libs/faad2/faad2-2.0.ebuild
new file mode 100644
index 000000000000..6af5fb71a63a
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0.ebuild,v 1.1 2004/03/13 15:52:14 tester 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"
+IUSE="xmms"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
+	media-libs/id3lib )"
+
+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}/faad2-2.0-makefile-space.patch
+	epatch ${FILESDIR}/faad2-2.0-configure-mpeg4ip.patch
+
+	cd ${S}/common/mp4v2
+	epatch ${FILESDIR}/mp4atom-sliver.patch
+}
+
+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
+	make || die
+}
+
+src_install() {
+	# Copy over the xmms plugins first.  make install will not install these unless this is an upgrade.  See bug #38001
+	if use xmms; then
+		exeinto `xmms-config --input-plugin-dir`
+		doexe ${S}/plugins/xmmsmp4/src/.libs/libmp4.so
+		doexe ${S}/plugins/xmms/src/.libs/libaac.so
+	fi
+
+	make DESTDIR=${D} install || die
+
+	dodoc ${DOCS}
+
+	# unneeded include, breaks building of apps
+	# <foser@gentoo.org>
+	dosed "s:#include <systems.h>::" /usr/include/mpeg4ip.h
+}
diff --git a/media-libs/faad2/files/digest-faad2-2.0 b/media-libs/faad2/files/digest-faad2-2.0
new file mode 100644
index 000000000000..38c97b9bd3b4
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0
@@ -0,0 +1 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
diff --git a/media-libs/faad2/files/faad2-2.0-configure-mpeg4ip.patch b/media-libs/faad2/files/faad2-2.0-configure-mpeg4ip.patch
new file mode 100644
index 000000000000..c91804d39070
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.0-configure-mpeg4ip.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2004-03-13 15:24:19.783147336 +0100
++++ configure.in	2004-03-13 15:24:48.430792232 +0100
+@@ -67,7 +67,7 @@
+         [HAVE_FPOS_T_POS])
+ 
+ 
+-external_mp4v2=yes
++AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no)
+ AC_CHECK_LIB(mp4v2, MP4Create, , external_mp4v2=no, -lstdc++)
+ AC_CHECK_LIB(mp4v2, MP4MetadataDelete, , external_mp4v2=no, -lstdc++)
+ AC_CHECK_HEADER(mp4.h, , external_mp4v2=no)
diff --git a/media-libs/faad2/files/faad2-2.0-makefile-space.patch b/media-libs/faad2/files/faad2-2.0-makefile-space.patch
new file mode 100644
index 000000000000..c8710d9ddb84
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.0-makefile-space.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2004-03-13 14:05:37.008118272 +0100
++++ Makefile.am	2004-03-13 14:05:42.753244880 +0100
+@@ -1,8 +1,3 @@
+ SUBDIRS = libfaad common frontend plugins
+ 
+ EXTRA_DIST = faad2.spec
+-
+-rpm:    Makefile
+-       make dist
+-       $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
+-       rm $(PACKAGE)-$(VERSION).tar.gz
diff --git a/media-libs/faad2/files/mp4atom-sliver.patch b/media-libs/faad2/files/mp4atom-sliver.patch
new file mode 100644
index 000000000000..50b6d0e57bd2
--- /dev/null
+++ b/media-libs/faad2/files/mp4atom-sliver.patch
@@ -0,0 +1,24 @@
+Index: mp4atom.h
+===================================================================
+RCS file: /vws/pan/mpeg4ip/lib/mp4v2/mp4atom.h,v
+retrieving revision 1.30
+diff -c -w -r1.30 mp4atom.h
+*** mp4atom.h	5 Dec 2001 21:11:20 -0000	1.30
+--- mp4atom.h	3 Dec 2003 21:56:26 -0000
+***************
+*** 88,94 ****
+  		return m_type;
+  	};
+  	void SetType(const char* type) {
+! 		if (type) {
+  			ASSERT(strlen(type) == 4);
+  			memcpy(m_type, type, 4);
+  			m_type[4] = '\0';
+--- 88,94 ----
+  		return m_type;
+  	};
+  	void SetType(const char* type) {
+! 		if (type && *type != '\0') {
+  			ASSERT(strlen(type) == 4);
+  			memcpy(m_type, type, 4);
+  			m_type[4] = '\0';