Version bump, added optional dep on x264

(Portage version: 2.0.51.22-r3)

4 files changed, 149 insertions, 11 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 820ae29a0dfa..615b6433cb88 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.24 2005/11/05 19:03:15 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.25 2005/11/10 05:40:29 tester Exp $
+
+*mpeg4ip-1.4 (10 Nov 2005)
+
+  10 Nov 2005; Olivier Crête <tester@gentoo.org> +mpeg4ip-1.4.ebuild:
+  Version bump, added optional dep on x264
 
   05 Nov 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.2.ebuild,
   mpeg4ip-1.3.ebuild:
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index e353fcf48684..92884e891d0c 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f76a0769708a4206a63faa32b0544452 mpeg4ip-1.1.ebuild 1734
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
 MD5 1a54464e01198168dd121523eef824bf ChangeLog 4164
 MD5 c399ecabe11e7d686e1e3c5d18510863 mpeg4ip-1.0.ebuild 2222
 MD5 d5e76386089bfc57a6125e7b174f617e mpeg4ip-1.2.ebuild 2631
 MD5 1853cba67e985bc2abb43482d552848c mpeg4ip-1.3.ebuild 3146
+MD5 8fecb85fb7390cb9e8b82586edd9a438 mpeg4ip-1.4.ebuild 3297
 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
 MD5 e1adf5b673be8f3eede637fc5ea66aa3 files/digest-mpeg4ip-1.2 64
+MD5 7a57c3fac558a74a94814986d16cc6dc files/digest-mpeg4ip-1.4 64
 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
 MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
 MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
 MD5 5362a4e7d4ecc6778c030d2de9070f14 files/mpeg4ip-1.2-mp4encode-template-path.patch 1013
 MD5 9dc5a82373d611ff96499fe69690fe62 files/digest-mpeg4ip-1.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDbQIzmOfEJZHYOKcRAl1EAKDClNVmcHa2wQx91Jyu+JzJzpQhmQCgj/hO
-SjEUE/wCSQRmZgwfDztgYbw=
-=NRGz
------END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.4 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.4
new file mode 100644
index 000000000000..793608e61f35
--- /dev/null
+++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.4
@@ -0,0 +1 @@
+MD5 69474e97e6783df4fe61fd7198638a76 mpeg4ip-1.4.tar.gz 4790940
diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.ebuild
new file mode 100644
index 000000000000..be7b99606759
--- /dev/null
+++ b/media-video/mpeg4ip/mpeg4ip-1.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.ebuild,v 1.1 2005/11/10 05:40:29 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="~x86 ~amd64"
+
+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.20.1 )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
+		x264? ( media-libs/x264-svn )
+	)
+	nas? ( media-libs/nas virtual/x11 )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake
+	player? ( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )"
+
+
+pkg_setup() {
+	if use aac && [ -r /usr/lib/libfaac.la ] &&
+		grep -q /usr/lib/libmp4v2.la /usr/lib/libfaac.la; then
+		eerror "libfaac is compiled against libmp4v2"
+		eerror "Please unmerge faad2 and mpeg4ip then recompile faac"
+		die
+	fi
+
+}
+
+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"
+
+
+	emake || die "make failed"
+}
+
+src_install () {
+	cd ${S}
+	make install DESTDIR="${D}" || die "make install failed"
+
+	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
+
+}