Add const_cast for newer ffmpeg and -lX11 for newer SDL

Package-Manager: portage-2.1.1-r2

3 files changed, 19 insertions, 172 deletions

diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index ccf40239564d..89254f4e1dd9 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -9,6 +9,14 @@ AUX mpeg4ip-1.4.1-gcc41.patch 5332 RMD160 c23b8af9f13f6fdb5e65d20276a6632464c514
 MD5 75ef8fbc1d49d5a13a8f6ece3b8fff78 files/mpeg4ip-1.4.1-gcc41.patch 5332
 RMD160 c23b8af9f13f6fdb5e65d20276a6632464c51416 files/mpeg4ip-1.4.1-gcc41.patch 5332
 SHA256 a4ce2cfd0448c03cec335d46099fdca7b3aed7ea75395dce8b97e38f816a5219 files/mpeg4ip-1.4.1-gcc41.patch 5332
+AUX mpeg4ip-1.5.0.1-lX11.patch 418 RMD160 931eac8523d5a5b594571887ab4792e9dbe544f3 SHA1 dc73ae37cb4569a7476c2cd25ba11cf96a6c0919 SHA256 c34ab2bf8304fa223a20c2baacb83cc5a2ec7ef427cba8db7318f21b0f280f5a
+MD5 199ffbaa7e96920c6cce6672f4102bb9 files/mpeg4ip-1.5.0.1-lX11.patch 418
+RMD160 931eac8523d5a5b594571887ab4792e9dbe544f3 files/mpeg4ip-1.5.0.1-lX11.patch 418
+SHA256 c34ab2bf8304fa223a20c2baacb83cc5a2ec7ef427cba8db7318f21b0f280f5a files/mpeg4ip-1.5.0.1-lX11.patch 418
+AUX mpeg4ip-1.5.0.1-newffmpeg.patch 876 RMD160 d83e4407dc5110ed506210a09f7c72e24034cf44 SHA1 de3a2ef12a3b2d57c08a8ad25c3a21310c6ed2d5 SHA256 b5f6aa63c2e711640dbf81def6b34fcafc51cac5e412ccfe0faa131e6e728281
+MD5 14b5039f2e57d8d127a505f9bc228796 files/mpeg4ip-1.5.0.1-newffmpeg.patch 876
+RMD160 d83e4407dc5110ed506210a09f7c72e24034cf44 files/mpeg4ip-1.5.0.1-newffmpeg.patch 876
+SHA256 b5f6aa63c2e711640dbf81def6b34fcafc51cac5e412ccfe0faa131e6e728281 files/mpeg4ip-1.5.0.1-newffmpeg.patch 876
 AUX mpeg4ip-1.5.0.1-x264.patch 2632 RMD160 4df7016973fc0a657fa25ea118199b6cb37193cf SHA1 f8f9edc71f66a097c32ceed25b9f7d006a0db16b SHA256 3e88f3cc2e6ed398bd9f2a38c97d53590e8209c373a97389f732a1cdce95d5d3
 MD5 db4c08a5fa7937e4c9d1c80936315612 files/mpeg4ip-1.5.0.1-x264.patch 2632
 RMD160 4df7016973fc0a657fa25ea118199b6cb37193cf files/mpeg4ip-1.5.0.1-x264.patch 2632
@@ -23,18 +31,14 @@ EBUILD mpeg4ip-1.4.1.ebuild 3298 RMD160 a335e93dc293d5903c871dfa43293e3fb2351355
 MD5 2522a72059ab600d950d25f47dfe4e96 mpeg4ip-1.4.1.ebuild 3298
 RMD160 a335e93dc293d5903c871dfa43293e3fb2351355 mpeg4ip-1.4.1.ebuild 3298
 SHA256 c71c038c9af91670c1a0a37604663af6d9192b443a8927c31e3cf6a6aa07e340 mpeg4ip-1.4.1.ebuild 3298
-EBUILD mpeg4ip-1.5.0.1-r1.ebuild 3605 RMD160 a7d3c7ad205267e41f4bb54c7c09192d16f86b4c SHA1 6d85873afe26b2da5d719fe26d0fbd561a33503d SHA256 ed1671fdbdf3f0b2667ae97f5c8384a11ae4fb8025f418969c890cb6f2861abf
-MD5 73823a02b13e3900d58ed80d481efe77 mpeg4ip-1.5.0.1-r1.ebuild 3605
-RMD160 a7d3c7ad205267e41f4bb54c7c09192d16f86b4c mpeg4ip-1.5.0.1-r1.ebuild 3605
-SHA256 ed1671fdbdf3f0b2667ae97f5c8384a11ae4fb8025f418969c890cb6f2861abf mpeg4ip-1.5.0.1-r1.ebuild 3605
-EBUILD mpeg4ip-1.5.0.1.ebuild 3561 RMD160 28146aeecb6b7ff59af1dc57c779fdab9f5193d8 SHA1 5cbced3884c65df3af9432470771c8c33b699346 SHA256 19f54dafdbc44a5b66fba1986161274f8c5fd71b01816bbf1814864b29e4c79c
-MD5 c339e5a5d5e588e911b34958a257bd6f mpeg4ip-1.5.0.1.ebuild 3561
-RMD160 28146aeecb6b7ff59af1dc57c779fdab9f5193d8 mpeg4ip-1.5.0.1.ebuild 3561
-SHA256 19f54dafdbc44a5b66fba1986161274f8c5fd71b01816bbf1814864b29e4c79c mpeg4ip-1.5.0.1.ebuild 3561
-MISC ChangeLog 7424 RMD160 f0a9f165825931579fd26569d50559239d9e5911 SHA1 35a21d9d226cbd43caeacec0dc7b72304c18cabf SHA256 8279e72e69f1087aa929d365cdd8a99ead462251bb1bc8dd6c96490a8e37f64a
-MD5 843a0f6fc0be6b61b1f6aa3ef7edcc25 ChangeLog 7424
-RMD160 f0a9f165825931579fd26569d50559239d9e5911 ChangeLog 7424
-SHA256 8279e72e69f1087aa929d365cdd8a99ead462251bb1bc8dd6c96490a8e37f64a ChangeLog 7424
+EBUILD mpeg4ip-1.5.0.1-r1.ebuild 3730 RMD160 8e638d763b5a2a8c7a45d369476a5885faca023b SHA1 eeae9dcd89761d278e950e687f6e77a4cde5ec80 SHA256 a00704968f363c3c80afc362ee2f2fc553de04397a1f40698709f4647282ef51
+MD5 d9d4b9f4c655650f0debef79e8685d63 mpeg4ip-1.5.0.1-r1.ebuild 3730
+RMD160 8e638d763b5a2a8c7a45d369476a5885faca023b mpeg4ip-1.5.0.1-r1.ebuild 3730
+SHA256 a00704968f363c3c80afc362ee2f2fc553de04397a1f40698709f4647282ef51 mpeg4ip-1.5.0.1-r1.ebuild 3730
+MISC ChangeLog 7662 RMD160 3bdedc8659fc131948bdc76444953d67bae187d7 SHA1 d6bfdf430b8fde7744163032ec610c8c976ba127 SHA256 47256fc46df26bc3cac2b469a83ec8670fc35171ad5844396d02ed2608e4867e
+MD5 ef8002b8132ab8d60b54c1013e7ff468 ChangeLog 7662
+RMD160 3bdedc8659fc131948bdc76444953d67bae187d7 ChangeLog 7662
+SHA256 47256fc46df26bc3cac2b469a83ec8670fc35171ad5844396d02ed2608e4867e ChangeLog 7662
 MISC metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 SHA1 ab610963bd3bcba3a951090a167f9fd5755b6cde SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 metadata.xml 255
@@ -45,16 +49,13 @@ SHA256 1ffffd6707a54c8f378bfcd9616bef82c93d6d15bb56d1e582e8297ccf887c03 files/di
 MD5 9f236a809427abc48027b2f7e836a20f files/digest-mpeg4ip-1.4.1-r1 244
 RMD160 152081a6dd19b0212291743d35afb06faa33b880 files/digest-mpeg4ip-1.4.1-r1 244
 SHA256 1ffffd6707a54c8f378bfcd9616bef82c93d6d15bb56d1e582e8297ccf887c03 files/digest-mpeg4ip-1.4.1-r1 244
-MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1 250
-RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1 250
-SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1 250
 MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r1 250
 RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r1 250
 SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVjKsvFcC4BYPU0oRAvlyAKCaEyygJBLxyNZQA4YThHrzNWkPJQCgvupy
-aV6ay6d/SsF3UKBEUuBOcwo=
-=eYE6
+iD8DBQFFX3cGmOfEJZHYOKcRAmH1AKCeyTKzLJmoN2zOFyHt0CsYtKnM5wCeK/YG
+bfnUWPWulX1yP16Pq7gbyf0=
+=XrL9
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1
deleted file mode 100644
index c15cf36b860f..000000000000
--- a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f53b06c62e914ab724bda9d9af041e08 mpeg4ip-1.5.0.1.tar.gz 4826180
-RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a mpeg4ip-1.5.0.1.tar.gz 4826180
-SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6 mpeg4ip-1.5.0.1.tar.gz 4826180
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1.ebuild
deleted file mode 100644
index d030e32da7b6..000000000000
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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.5.0.1.ebuild,v 1.6 2006/10/23 16:05:46 blubb 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-1.5.0.1
-	!<media-libs/faad2-2.0-r9 "
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake
-	player? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )"
-
-pkg_setup() {
-	if ! built_with_use media-libs/libsdl X;
-	then
-		eerror "media-libs/libsdl does not has X support"
-		eerror "You need to rebuild media-libs/libsdl with USE=X"
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.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/$(get_libdir)/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
-
-}