Added faad2 block as faad2 as an older version of libmp4v2 that mpeg4ip provides, cleaned up older versions, also removed ~ppc as dep faac doesnt have it

8 files changed, 12 insertions, 218 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 0d723a84090e..b4d0e9a83a9b 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.5 2004/01/21 18:51:06 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.6 2004/02/27 13:38:34 tester Exp $
+
+  27 Feb 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.0_rc1.ebuild,
+  mpeg4ip-1.0_rc3.ebuild, files/sliver.patch:
+  Add block on faad2 as it provides libmp4v2 too, also removed ~ppc as faac 
+  doesnt have it
 
   21 Jan 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild:
   Trying to fix bug 38316 which I believe is the same as 34804 since mpeg4ip has
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index 1fd4a9dc6698..687bcc727012 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,9 +1,4 @@
-MD5 93c2a04ea0a7b4f491f0a0cc74c3f1da mpeg4ip-1.0_rc1.ebuild 2088
-MD5 8e70326588103326db1df50953bf525f mpeg4ip-1.0.ebuild 2268
-MD5 6d1d0cc3e2ce36b2124cf84dd87e6117 ChangeLog 1181
-MD5 e6dab8254f95f76b21e834c1c13ec3ce mpeg4ip-1.0_rc3.ebuild 2147
+MD5 4d0b9409924fbbc400377aafd9145d20 mpeg4ip-1.0.ebuild 2283
+MD5 1c8e8e8cf756095bc02e9eccbb89ae49 ChangeLog 1401
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 9fd30cb88ca225eed3247808dcbea404 files/digest-mpeg4ip-1.0_rc3 67
 MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
-MD5 6264dccf9a4c49712b65b406825c5113 files/sliver.patch 659
-MD5 e4f8176e7bdb754b483129ba0cc83b7f files/digest-mpeg4ip-1.0_rc1 67
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.0_rc1 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.0_rc1
deleted file mode 100644
index e51ea5e1cea2..000000000000
--- a/media-video/mpeg4ip/files/digest-mpeg4ip-1.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 77dc15865f29c204545dbfe81c90fbd9 mpeg4ip-1.0RC1.tar.gz 5560837
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.0_rc3 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.0_rc3
deleted file mode 100644
index bb5a37a3a132..000000000000
--- a/media-video/mpeg4ip/files/digest-mpeg4ip-1.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0fb1b9fb2e2fd69d5efc05adeb6b5304 mpeg4ip-1.0RC3.tar.gz 5676190
diff --git a/media-video/mpeg4ip/files/sliver.patch b/media-video/mpeg4ip/files/sliver.patch
deleted file mode 100644
index 50b6d0e57bd2..000000000000
--- a/media-video/mpeg4ip/files/sliver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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';
diff --git a/media-video/mpeg4ip/mpeg4ip-1.0.ebuild b/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
index d3bd1a99a407..97679894c418 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0.ebuild,v 1.4 2004/01/22 15:02:29 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0.ebuild,v 1.5 2004/02/27 13:38:34 tester Exp $
 
 DESCRIPTION="MPEG 4 implementation library"
 
@@ -14,7 +14,7 @@ LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
 
 SLOT="0"
 
-KEYWORDS="x86 ~ppc -amd64"
+KEYWORDS="x86 -amd64"
 # not 64 bit safe yet
 
 IUSE="ipv6 mmx gtk"
@@ -26,7 +26,8 @@ DEPEND="sys-devel/libtool
 		>=media-sound/lame-3.92
 		gtk? ( >=x11-libs/gtk+-2 )
 		mmx? ( >=dev-lang/nasm-0.98.19 )
-		media-video/ffmpeg"
+		media-video/ffmpeg
+		!media-libs/faad2"
 
 S="${WORKDIR}/${PN}-${PV2}"
 
diff --git a/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild
deleted file mode 100644
index ed67115c1e51..000000000000
--- a/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0_rc1.ebuild,v 1.2 2003/12/08 23:32:20 tester Exp $
-
-DESCRIPTION="MPEG 4 implementation library"
-
-HOMEPAGE="http://www.mpeg4ip.net/"
-
-PV2=`echo $PV | sed s/_rc/RC/`
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV2}.tar.gz"
-
-LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
-
-SLOT="0"
-
-KEYWORDS="x86 ~ppc -amd64"
-# Not 64bit safe yet
-
-IUSE="ipv6 mmx gtk"
-
-DEPEND="sys-devel/libtool
-		sys-devel/autoconf
-		sys-devel/automake
-		media-libs/faac
-		>=media-sound/lame-3.92
-		gtk? ( >=x11-libs/gtk+-2 )
-		mmx? ( >=dev-lang/nasm-0.98.19 )
-		media-video/ffmpeg"
-
-S="${WORKDIR}/${PN}-${PV2}"
-
-src_unpack() {
-	unpack ${A}
-
-	# It searches for ffmpeg in the wrong place
-	cp ${S}/configure ${S}/configure.orig
-	sed 's:-I\${enable_ffmpeg}/libavcodec:-I/usr/include/ffmpeg:' \
-		${S}/configure.orig | \
-		sed 's:\${enable_ffmpeg}/libavcodec/libavcodec.a:/usr/lib/libavcodec.so:' \
-		> ${S}/configure
-
-	#  Violently rename the private SDL so it doesnt bother the normal version
-	for i in lib/SDL/src/Makefile.in \
-			lib/SDL/src/main/Makefile.in \
-			player/src/Makefile.in \
-			server/mp4live/Makefile.in \
-			util/iptv/Makefile.in \
-			util/yuv/Makefile.in \
-			configure; do
-		cd ${S}/`dirname ${i}`
-		file="`basename ${i}`"
-		cp ${file} ${file}.orig || die
-		sed -e 's:libSDL:libSDLmpeg4ip:g' ${file}.orig > ${file} || die
-	done
-}
-
-src_compile() {
-
-	# Configure the private SDL
-	cd ${S}/lib/SDL
-	econf || die "SDL configure failed"
-	cd ${S}
-
-	local myconf
-	myconf=" `use_enable ipv6`
-			`use_enable mmx`
-			` use_enable ppc`"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-
-}
-
-src_install () {
-
-	# Install only the lib from the private SDL
-	cd ${S}/lib/SDL
-	make install-lib DESTDIR=${D}
-
-	# It has its own SDL, we have install the libs, ignore the rest
-	cd ${S}/lib
-	mv Makefile Makefile.orig
-	sed -e 's/SDL / /' Makefile.orig > Makefile
-
-	cd ${S}
-	einstall || die "make install failed"
-
-}
diff --git a/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild b/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild
deleted file mode 100644
index 8b3116ceb00b..000000000000
--- a/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0_rc3.ebuild,v 1.3 2003/12/16 10:03:06 tester Exp $
-
-DESCRIPTION="MPEG 4 implementation library"
-
-HOMEPAGE="http://www.mpeg4ip.net/"
-
-PV2=`echo $PV | sed s/_rc/RC/`
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV2}.tar.gz"
-
-LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
-
-SLOT="0"
-
-KEYWORDS="x86 ~ppc -amd64"
-# not 64 bit safe yet
-
-IUSE="ipv6 mmx gtk"
-
-DEPEND="sys-devel/libtool
-		sys-devel/autoconf
-		sys-devel/automake
-		media-libs/faac
-		>=media-sound/lame-3.92
-		gtk? ( >=x11-libs/gtk+-2 )
-		mmx? ( >=dev-lang/nasm-0.98.19 )
-		media-video/ffmpeg"
-
-S="${WORKDIR}/${PN}-${PV2}"
-
-src_unpack() {
-	unpack ${A}
-
-	# It searches for ffmpeg in the wrong place
-	cp ${S}/configure ${S}/configure.orig
-	sed 's:-I\${enable_ffmpeg}/libavcodec:-I/usr/include/ffmpeg:' \
-		${S}/configure.orig | \
-		sed 's:\${enable_ffmpeg}/libavcodec/libavcodec.a:/usr/lib/libavcodec.so:' \
-		> ${S}/configure
-
-	#  Violently rename the private SDL so it doesnt bother the normal version
-	for i in lib/SDL/src/Makefile.in \
-			lib/SDL/src/main/Makefile.in \
-			player/src/Makefile.in \
-			server/mp4live/Makefile.in \
-			util/iptv/Makefile.in \
-			util/yuv/Makefile.in \
-			configure; do
-		cd ${S}/`dirname ${i}`
-		file="`basename ${i}`"
-		cp ${file} ${file}.orig || die
-		sed -e 's:libSDL:libSDLmpeg4ip:g' ${file}.orig > ${file} || die
-	done
-
-	cd ${S}/lib/mp4v2
-	patch -p0 < ${FILESDIR}/sliver.patch
-}
-
-src_compile() {
-
-	# Configure the private SDL
-	cd ${S}/lib/SDL
-	econf || die "SDL configure failed"
-	cd ${S}
-
-	local myconf
-	myconf=" `use_enable ipv6`
-			`use_enable mmx`
-			` use_enable ppc`"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-
-}
-
-src_install () {
-
-	# Install only the lib from the private SDL
-	cd ${S}/lib/SDL
-	make install-lib DESTDIR=${D}
-
-	# It has its own SDL, we have install the libs, ignore the rest
-	cd ${S}/lib
-	mv Makefile Makefile.orig
-	sed -e 's/SDL / /' Makefile.orig > Makefile
-
-	cd ${S}
-	einstall || die "make install failed"
-
-}