Removed faac/x264-svn dep and marked stable, made new revision with unstable deps

Package-Manager: portage-2.0.54

5 files changed, 167 insertions, 18 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index f34c8244c2f2..1c5df4ea80bc 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.32 2006/03/24 06:06:48 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.33 2006/04/08 22:11:12 tester Exp $
+
+*mpeg4ip-1.4.1-r1 (08 Apr 2006)
+
+  08 Apr 2006; Olivier Crête <tester@gentoo.org> mpeg4ip-1.4.1.ebuild,
+  +mpeg4ip-1.4.1-r1.ebuild:
+  Removed faac/x264-svn dep and marked stable, made new revision with unstable
+  deps
 
   23 Mar 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   mpeg4ip-1.4.1.ebuild:
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index 15e28d79ac2e..5860c30aaa85 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 177b8156b308f1fc1b8c2d5018468191 ChangeLog 5566
+MD5 c79009f3b93609171e312d42dd25bfe8 ChangeLog 5787
 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
 MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1 66
+MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1-r1 66
 MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
 MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
 MD5 75ef8fbc1d49d5a13a8f6ece3b8fff78 files/mpeg4ip-1.4.1-gcc41.patch 5332
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
 MD5 cfeb9a1214e667f72da42c40baf9fa32 mpeg4ip-1.1.ebuild 1789
-MD5 48a443d6bc429e34baaccab0c625b8c1 mpeg4ip-1.4.1.ebuild 3415
+MD5 ac5ee1c7dec7c93da1ea83ecc30adcb1 mpeg4ip-1.4.1-r1.ebuild 3419
+MD5 9deb58efa348a00084de6bc21e7fbd80 mpeg4ip-1.4.1.ebuild 3289
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEI4ZH/NoSW7FuNV8RAvKrAKDQuWcEavc7kSLUQQk0YIjNiAA8PACgy00m
-bIEDBS+Ane7g+07mXhZ9NPk=
-=dZyE
+iD8DBQFEODUjoGcCqvCmTSIRAnI1AJoC1ZqrkpZHr/EDFf0zS/B/tA/eLACgzVEx
+HkCv013lC4KReXm5YpJM5iY=
+=q6Fq
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1-r1 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1-r1
new file mode 100644
index 000000000000..bb02c4581bae
--- /dev/null
+++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1-r1
@@ -0,0 +1 @@
+MD5 68968c23c7e9d23cac11f15f3bcf7ede mpeg4ip-1.4.1.tar.gz 4791075
diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..4ffd15f66ed8
--- /dev/null
+++ b/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild,v 1.1 2006/04/08 22:11:12 tester Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="MPEG 4 implementation library"
+
+HOMEPAGE="http://www.mpeg4ip.net/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="ipv6 mmx v4l2 xvid nas alsa esd arts ffmpeg a52 mpeg2 lame aac id3 player mp4live x264"
+
+RDEPEND=" media-libs/libsdl
+	player? (
+		>=x11-libs/gtk+-2
+		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
+		mpeg2? ( media-libs/libmpeg2 )
+		id3? ( media-libs/libid3tag )
+		a52? ( media-libs/a52dec )
+	)
+	xvid? ( >=media-libs/xvid-0.9.8 )
+	mp4live? (
+		>=x11-libs/gtk+-2
+		lame? ( >=media-sound/lame-3.92 )
+		aac? ( >=media-libs/faac-1.24-r1 )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
+		x264? ( media-libs/x264-svn )
+	)
+	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	=media-libs/libmp4v2-${PV}
+	!<media-libs/faad2-2.0-r9 "
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake
+	player? ( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch
+	epatch ${FILESDIR}/mpeg4ip-1.4.1-gcc41.patch
+}
+
+src_compile() {
+	cd ${S}
+
+	local myconf
+	myconf=" --datadir=/usr/share/mpeg4ip
+			$(use_enable ipv6)
+			$(use_enable ppc)
+			$(use_enable player)
+			$(use_enable mp4live)
+			$(use_enable xvid)
+			$(use_enable nas)
+			$(use_enable esd)
+			$(use_enable alsa)
+			$(use_enable arts)
+			--disable-srtp" # need ot add libsrtp to portage
+
+
+	# Those are possible for both player and mp4live
+	if use player || use mp4live ; then
+		myconf="${myconf} --enable-gtk-glib
+			$(use_enable ffmpeg)"
+	fi
+
+	# Those are only relevant for the player
+	use player && myconf="${myconf}
+			$(use_enable mmx)
+			$(use_enable a52 a52dec)
+			$(use_enable mpeg2 mpeg2dec)
+			$(use_enable id3 id3tags)"
+	use player || myconf="${myconf}
+			--disable-a52
+			--disable-mmx
+			--disable-mpeg2dec
+			--disable-id3tags"
+
+
+	# those can only be used for mp4live
+	use mp4live && myconf="${myconf}
+			$(use_enable v4l2)
+			$(use_enable lame mp3lame)
+			$(use_enable aac faac)
+			$(use_enable x264)"
+			# $(use_enable alsa mp4live-alsa)
+	use mp4live || myconf="${myconf}
+			--disable-v4l2
+			--disable-mp3lame
+			--disable-faac
+			--disable-mp4live-alsa
+			--disable-x264"
+
+	./bootstrap --prefix=/usr \
+		--host=${CHOST} \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var/lib \
+		--disable-warns-as-err \
+		--enable-server \
+		${EXTRA_ECONF} \
+		${myconf} || die "configure failed"
+
+	sed -i -e 's:-Werror::' common/video/iso-mpeg4/src/Makefile || die "sed failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	cd ${S}
+	make install DESTDIR="${D}" || die "make install failed"
+
+	rm -f ${D}/usr/include/mp4.h
+	rm -f ${D}/usr/lib/libmp4v2*
+
+	dodoc doc/MPEG4IP_Guide.pdf doc/*txt AUTHORS TODO
+
+	dohtml doc/*.html FEATURES.html || die
+
+	docinto ietf
+	dodoc doc/ietf/*.txt || die
+
+	docinto mcast
+	dodoc doc/mcast/mcast.txt doc/mcast/mcast_example doc/mcast/playlist_example || die
+
+}
diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
index 96e658ec33f4..60e6f13ce9be 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.7 2006/03/24 06:06:48 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.8 2006/04/08 22:11:12 tester Exp $
 
 inherit eutils multilib
 
@@ -14,9 +14,9 @@ LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc ~x86"
 
-IUSE="ipv6 mmx v4l2 xvid nas alsa esd arts ffmpeg a52 mpeg2 lame aac id3 player mp4live x264"
+IUSE="ipv6 mmx v4l2 xvid nas alsa esd arts ffmpeg a52 mpeg2 lame id3 player mp4live"
 
 RDEPEND=" media-libs/libsdl
 	player? (
@@ -30,9 +30,7 @@ RDEPEND=" media-libs/libsdl
 	mp4live? (
 		>=x11-libs/gtk+-2
 		lame? ( >=media-sound/lame-3.92 )
-		aac? ( >=media-libs/faac-1.24-r1 )
 		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
-		x264? ( media-libs/x264-svn )
 	)
 	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
 	alsa? ( media-libs/alsa-lib )
@@ -69,6 +67,8 @@ src_compile() {
 			$(use_enable esd)
 			$(use_enable alsa)
 			$(use_enable arts)
+			--disable-x264
+			--disable-faac
 			--disable-srtp" # need ot add libsrtp to portage
 
 
@@ -94,16 +94,12 @@ src_compile() {
 	# those can only be used for mp4live
 	use mp4live && myconf="${myconf}
 			$(use_enable v4l2)
-			$(use_enable lame mp3lame)
-			$(use_enable aac faac)
-			$(use_enable x264)"
+			$(use_enable lame mp3lame)"
 			# $(use_enable alsa mp4live-alsa)
 	use mp4live || myconf="${myconf}
 			--disable-v4l2
 			--disable-mp3lame
-			--disable-faac
-			--disable-mp4live-alsa
-			--disable-x264"
+			--disable-mp4live-alsa"
 
 	./bootstrap --prefix=/usr \
 		--host=${CHOST} \