Add patch to make it compile with ffmpeg, bug #188183

Package-Manager: portage-2.1.3.19

5 files changed, 231 insertions, 5 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 1b1f6b36488f..20c0ffbfde6e 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.55 2008/01/11 00:15:31 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.56 2008/01/12 21:03:53 tester Exp $
+
+*mpeg4ip-1.5.0.1-r4 (12 Jan 2008)
+
+  12 Jan 2008; Olivier Crête <tester@gentoo.org>
+  +files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch, +mpeg4ip-1.5.0.1-r4.ebuild:
+  Add patch to make it compile with ffmpeg, bug #188183
 
   11 Jan 2008; Steve Dibb <beandog@gentoo.org> mpeg4ip-1.5.0.1-r3.ebuild:
   amd64 stable
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index 9bb379bb0c7c..87aff7eb7b0e 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mpeg4ip-1.4.1-disable-faac-test.patch 1149 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 SHA1 a84ae2a263374edbe104c682fd2db385ff1145ca SHA256 cbe9093e82530731e4dc53973c62e3879b7297199f52f25b7d0317cfe4c0d2ba
 MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
@@ -10,6 +13,10 @@ AUX mpeg4ip-1.5.0.1-as-needed.patch 4197 RMD160 3a55f0ce40c5e771df88307cf08b8f91
 MD5 1377c5577684c189977dd42bcb8734c2 files/mpeg4ip-1.5.0.1-as-needed.patch 4197
 RMD160 3a55f0ce40c5e771df88307cf08b8f912cfb06e1 files/mpeg4ip-1.5.0.1-as-needed.patch 4197
 SHA256 b95921dbae1c4b0964b90698605a7dff1886f792e347c3ad0518b705fcf25aa9 files/mpeg4ip-1.5.0.1-as-needed.patch 4197
+AUX mpeg4ip-1.5.0.1-avcodec_extern_c.patch 1207 RMD160 ded5c4e1953a834c1ef879d2cfebfd7ad8721a27 SHA1 df57a44a18738a089a1be913a00405455ca0a94b SHA256 04afaa301469a515d5a61973232dc70c0134bc976cef8e028d9f8726fa3f8a07
+MD5 b77c97b37af16a6fdccbc4d8ee22024e files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch 1207
+RMD160 ded5c4e1953a834c1ef879d2cfebfd7ad8721a27 files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch 1207
+SHA256 04afaa301469a515d5a61973232dc70c0134bc976cef8e028d9f8726fa3f8a07 files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch 1207
 AUX mpeg4ip-1.5.0.1-gcc42.patch 1282 RMD160 250ae882c6737a02f0d5eac18359f030faed5168 SHA1 9a5e1334476dca239c9a9290bcb9767cfcaa0f25 SHA256 a1a03d56865fd0d2989db980e546b445e740e5d5a3241ef2639e5def125c0ff7
 MD5 76e3304aa89c02c59f44639354f14c67 files/mpeg4ip-1.5.0.1-gcc42.patch 1282
 RMD160 250ae882c6737a02f0d5eac18359f030faed5168 files/mpeg4ip-1.5.0.1-gcc42.patch 1282
@@ -39,10 +46,14 @@ EBUILD mpeg4ip-1.5.0.1-r3.ebuild 3787 RMD160 c9471a71dafbd97d4abebbbdc8f2b634a14
 MD5 c860b1228130966803ae6d9b130d54a3 mpeg4ip-1.5.0.1-r3.ebuild 3787
 RMD160 c9471a71dafbd97d4abebbbdc8f2b634a14ce103 mpeg4ip-1.5.0.1-r3.ebuild 3787
 SHA256 0db3da5832c94dc2f31f59d327902e5e2450004ba013810500fff1c9c2c92b6d mpeg4ip-1.5.0.1-r3.ebuild 3787
-MISC ChangeLog 9161 RMD160 133d589ddb3a8eefeac984c11fdc5101662e1636 SHA1 f5b415d87c470cdb610f6b3939991c8a964f2242 SHA256 a0e904c8f288d2f534f5c3c585708a46df3da12d50a83f348d97f14d270e860b
-MD5 852497fbd95c5b56fef01853160da00e ChangeLog 9161
-RMD160 133d589ddb3a8eefeac984c11fdc5101662e1636 ChangeLog 9161
-SHA256 a0e904c8f288d2f534f5c3c585708a46df3da12d50a83f348d97f14d270e860b ChangeLog 9161
+EBUILD mpeg4ip-1.5.0.1-r4.ebuild 3848 RMD160 27451db27a86476474d563562cbf3f9c8b46ce32 SHA1 d3163633d195b0b33f7a5853af696fcd9cfa2cc1 SHA256 10ae24f328cb80714cd7fcdef62e82c267d8f42295a5891a1c15ceead416f270
+MD5 ce419afdc40d3427fc7dbb15cc3b29b5 mpeg4ip-1.5.0.1-r4.ebuild 3848
+RMD160 27451db27a86476474d563562cbf3f9c8b46ce32 mpeg4ip-1.5.0.1-r4.ebuild 3848
+SHA256 10ae24f328cb80714cd7fcdef62e82c267d8f42295a5891a1c15ceead416f270 mpeg4ip-1.5.0.1-r4.ebuild 3848
+MISC ChangeLog 9379 RMD160 1055cb637a874f32f989027884fe8ffa88b44b7f SHA1 896050b940eddf2b3650921397d65c542b59d438 SHA256 8429d4489948cea4b836d1104848275bd7e85372ba8158731dd9327f76802bb3
+MD5 b8290ccb0eae16d6bf524760e516122b ChangeLog 9379
+RMD160 1055cb637a874f32f989027884fe8ffa88b44b7f ChangeLog 9379
+SHA256 8429d4489948cea4b836d1104848275bd7e85372ba8158731dd9327f76802bb3 ChangeLog 9379
 MISC metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 SHA1 ab610963bd3bcba3a951090a167f9fd5755b6cde SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 metadata.xml 255
@@ -53,3 +64,13 @@ SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/di
 MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r3 250
 RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r3 250
 SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r3 250
+MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r4 250
+RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r4 250
+SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r4 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHiSs+mOfEJZHYOKcRAkNDAJ9vr2pUePOikAUWUnAGwwbkoZFozwCg1GML
+6AtkNEaIF1q/jKb7kbVrPxY=
+=wg+6
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r4 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r4
new file mode 100644
index 000000000000..c15cf36b860f
--- /dev/null
+++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r4
@@ -0,0 +1,3 @@
+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/files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch
new file mode 100644
index 000000000000..4acad6b7b7f1
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch
@@ -0,0 +1,48 @@
+--- mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h.unpatched	2007-11-24 09:07:06.000000000 +0100
++++ mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h	2007-11-24 09:11:03.000000000 +0100
+@@ -24,9 +24,13 @@
+ 
+ #include "audio_encoder.h"
+ #ifdef HAVE_FFMPEG_INSTALLED
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
+ #else
++extern "C" {
+ #include <avcodec.h>
++}
+ #endif
+ #include <sdp.h>
+ 
+--- mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h.unpatched	2007-11-24 09:09:04.000000000 +0100
++++ mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h	2007-11-24 09:10:18.000000000 +0100
+@@ -24,9 +24,13 @@
+ 
+ #include "video_encoder.h"
+ #ifdef HAVE_FFMPEG_INSTALLED
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
+ #else
++extern "C" {
+ #include <avcodec.h>
++}
+ #endif
+ 
+ class CFfmpegVideoEncoder : public CVideoEncoder {
+--- mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp.unpatched	2007-11-24 09:11:51.000000000 +0100
++++ mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp	2007-11-24 09:12:17.000000000 +0100
+@@ -26,9 +26,13 @@
+ #include "video_util_filter.h"
+ #ifdef HAVE_FFMPEG
+ #ifdef HAVE_FFMPEG_INSTALLED
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
+ #else
++extern "C" {
+ #include <avcodec.h>
++}
+ #endif
+ #endif
+ 
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild
new file mode 100644
index 000000000000..ec473bf462ee
--- /dev/null
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 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-r4.ebuild,v 1.1 2008/01/12 21:03:53 tester Exp $
+
+WANT_AUTOMAKE="1.9"
+
+inherit eutils multilib autotools
+
+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 )
+	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}
+	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"
+	epatch "${FILESDIR}/${P}-x264.patch"
+	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-newffmpeg.patch"
+	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-lX11.patch"
+	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-as-needed.patch"
+	epatch "${FILESDIR}/${P}-gcc42.patch"
+	epatch "${FILESDIR}/${P}-nasm-r.patch"
+	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-avcodec_extern_c.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	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 () {
+	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
+
+}