Make 1.4.1 depend on media-libs/libmp4v2 and not provide it, block it from 1.1,

add --with-pics to 1.1 to make it build on amd64, add gcc 4.1 patch to 1.4.1
(Portage version: 2.0.51.22-r3)

7 files changed, 138 insertions, 165 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 0777fb969bf2..019eed2b4d07 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2005/12/19 11:17:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.30 2005/12/20 05:43:45 tester Exp $
+
+  20 Dec 2005; Olivier Crête <tester@gentoo.org>
+  +files/mpeg4ip-1.4.1-gcc41.patch, mpeg4ip-1.1.ebuild, -mpeg4ip-1.3.ebuild,
+  mpeg4ip-1.4.1.ebuild:
+  Make 1.4.1 depend on media-libs/libmp4v2 and not provide it, block it from 1.1,
+  add --with-pics to 1.1 to make it build on amd64, add gcc 4.1 patch to 1.4.1
 
   19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> mpeg4ip-1.4.1.ebuild:
   Move block on pre-r8 versions of faad2, that now depends on this.
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index f5ff8b2a9f99..3718984ee784 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
 MD5 044e129b14ff8a9a0fd862385555d62f ChangeLog 4968
-MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
-MD5 9dc5a82373d611ff96499fe69690fe62 files/digest-mpeg4ip-1.3 64
+MD5 42c1b1e2e309550850a056c09d66b00c mpeg4ip-1.4.1.ebuild 3357
+MD5 8a8fd50ef0a2aa18ff175b38e7d0d283 mpeg4ip-1.1.ebuild 1790
 MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1 66
-MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
+MD5 75ef8fbc1d49d5a13a8f6ece3b8fff78 files/mpeg4ip-1.4.1-gcc41.patch 5332
 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
-MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 31544d8d7b7e74d1dc0c885b357daa18 mpeg4ip-1.1.ebuild 1756
-MD5 3152b9a0685b9506c5ccd32eef11376c mpeg4ip-1.3.ebuild 3165
-MD5 7a61ca2f619730c5d6c4eb72e1c3299e mpeg4ip-1.4.1.ebuild 3400
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDppbtAiZjviIA2XgRAknkAKDbxYBj6MGgoJGGJesVORGFnP7dnQCg74vd
-PuenH6u3+FAC96JvNIbvZFc=
-=kfMH
------END PGP SIGNATURE-----
+MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
+MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.3 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.3
deleted file mode 100644
index 6d55aa6397ef..000000000000
--- a/media-video/mpeg4ip/files/digest-mpeg4ip-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a0301d3e395f17b2462ab95c2e5ba6a mpeg4ip-1.3.tar.gz 4680258
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.4.1-gcc41.patch b/media-video/mpeg4ip/files/mpeg4ip-1.4.1-gcc41.patch
new file mode 100644
index 000000000000..9c6608d5ba00
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.4.1-gcc41.patch
@@ -0,0 +1,110 @@
+diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/cae.h mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/cae.h
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/cae.h	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/cae.h	2005-12-20 04:23:45.751472750 +0100
+@@ -52,8 +52,8 @@
+ class CInBitStream;
+ class arcodec {
+ public:
+-	arcodec::~arcodec () {};
+-	arcodec::arcodec () {};
++	~arcodec () {};
++	arcodec () {};
+ 	UInt L; /* lower bound */
+ 	UInt R; /* code range */
+ 	UInt V; /* current code value */
+diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/dataStruct.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/dataStruct.hpp
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/dataStruct.hpp	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/dataStruct.hpp	2005-12-20 04:29:19.672341500 +0100
+@@ -1033,7 +1033,7 @@
+ 	Void write_image_tile(Char *recImgFile, UChar **frm);
+ 
+ // FPDAM begin: modified by Sharp
+-	Void CVTCDecoder::write_image_to_buffer(UChar **DstImage, 
++	Void write_image_to_buffer(UChar **DstImage, 
+ 		UChar *DstMask[3], // FPDAM added by Sharp
+ 		Int DstWidth, Int DstHeight, Int iTile, Int TileW,
+ 		/* Char *recImgFile,*/ Int colors,
+diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/grayc.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/grayc.hpp
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/grayc.hpp	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/grayc.hpp	2005-12-20 04:21:36.879418750 +0100
+@@ -94,7 +94,7 @@
+ 	own CU8Image* biInterpolate () const; // bilinearly interpolate 
+ 	own CU8Image* downsampleForSpatialScalability () const;
+ //OBSS_SAIT_991015
+-	own CU8Image* CU8Image::upsampleForSpatialScalability (	Int iVerticalSamplingFactorM,
++	own CU8Image* upsampleForSpatialScalability (	Int iVerticalSamplingFactorM,
+ 															Int iVerticalSamplingFactorN,
+ 															Int iHorizontalSamplingFactorM,
+ 															Int iHorizontalSamplingFactorN,
+@@ -104,7 +104,7 @@
+ 															Int iExpandYRefFrame,
+ 															Bool bShapeOnly		
+ 															) const;
+-	own CU8Image* CU8Image::upsampleSegForSpatialScalability (	Int iVerticalSamplingFactorM,
++	own CU8Image* upsampleSegForSpatialScalability (	Int iVerticalSamplingFactorM,
+ 															Int iVerticalSamplingFactorN,
+ 															Int iHorizontalSamplingFactorM,
+ 															Int iHorizontalSamplingFactorN,
+diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/newpred.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/newpred.hpp
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/newpred.hpp	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/newpred.hpp	2005-12-20 04:25:09.540709250 +0100
+@@ -116,7 +116,7 @@
+ 	virtual ~CNewPred();
+ 
+ 	Bool	CheckSlice(int iMBX, int iMBY, Bool bChkTop = TRUE);
+-	int		CNewPred::GetSliceNum(int iMBX, int iMBY);
++	int		GetSliceNum(int iMBX, int iMBY);
+ 	int		NextSliceHeadMBA(int iMBX, int iMBY);
+ 	int		GetCurrentVOP_id();
+ 
+@@ -205,7 +205,7 @@
+ 	void	GetSlicePoint(char * pchSlicePointParam);
+ 	int		getwidth(){return(m_iWidth);}
+ 
+-	int CNewPred::SliceTailMBA(int iMBX, int iMBY);
++	int SliceTailMBA(int iMBX, int iMBY);
+ 
+ #ifdef _DEBUG
+ 	void cdecl NPDebugMessage( char* pszMsg, ... );
+diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopseenc.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopseenc.hpp
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopseenc.hpp	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopseenc.hpp	2005-12-20 04:27:38.902043750 +0100
+@@ -370,13 +370,13 @@
+ 	Void ThreeTapFilter(PixelC *pLow, PixelC *pHight,
+ 		Int iwidth, Int iheight);
+ 	Int DeltaMP(Double *dA, Int in, Double *db, Double *dm);
+-	Int CVideoObjectEncoder::globalme(CoordI iXCurr, CoordI iYCurr,
++	Int globalme(CoordI iXCurr, CoordI iYCurr,
+ 					PixelC *pref);
+-	Void CVideoObjectEncoder::StationalWarpME(Int iXCurr, Int iYCurr,
++	Void StationalWarpME(Int iXCurr, Int iYCurr,
+ 		PixelC* pref, Int& iSumofAD);
+-	Void CVideoObjectEncoder::TranslationalWarpME(Int iXCurr, Int iYCurr,
++	Void TranslationalWarpME(Int iXCurr, Int iYCurr,
+ 		PixelC* pref, Int& iSumofAD);
+-	Void CVideoObjectEncoder::FastAffineWarpME(Int iXCurr, Int iYCurr,
++	Void FastAffineWarpME(Int iXCurr, Int iYCurr,
+ 		PixelC* pref, Int& iSumofAD);
+ 	// ~GMC
+ 
+@@ -680,7 +680,7 @@
+ 		Bool bColocatedMBExist
+ 	);
+ 	// for spatial scalability only
+-	Int CVideoObjectEncoder::motionEstMB_BVOP(
++	Int motionEstMB_BVOP(
+ 		CoordI x, CoordI y, 
+ 		CMotionVector* pmvForward, CMotionVector* pmvBackward,
+ 		CMBMode* pmbmd,
+diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopses.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopses.hpp
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopses.hpp	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopses.hpp	2005-12-20 04:22:01.836978500 +0100
+@@ -807,7 +807,7 @@
+ 	// ~GMC
+ 
+ // RRV insertion
+-	Void	CVideoObject::filterCodedPictureForRRV(PixelC*, PixelC*, PixelC*, 
++	Void	filterCodedPictureForRRV(PixelC*, PixelC*, PixelC*, 
+ 												   Int isizex, Int isizey,
+ 												   Int inumMBx,Int inumMBy, 
+ 												   Int iwidthY, Int iwidthUV);
diff --git a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
index 245f9fbc5acc..574102fd6c07 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.14 2005/11/10 06:15:21 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.15 2005/12/20 05:43:45 tester Exp $
 
 inherit eutils
 
@@ -27,7 +27,9 @@ RDEPEND=">=media-libs/faac-1.20.1
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
-	!media-libs/faad2"
+	!media-libs/faad2
+	!media-libs/libmp4v2"
+
 
 DEPEND="${RDEPEND}
 	sys-devel/libtool
@@ -67,7 +69,7 @@ src_compile() {
 			$(use_enable arts)"
 	use v4l2 || myconf="${myconf} --disable-v4l2"
 
-	econf ${myconf} || die "configure failed"
+	econf ${myconf} --with-pic || die "configure failed"
 
 	cd ${S}
 	emake || die "make failed"
diff --git a/media-video/mpeg4ip/mpeg4ip-1.3.ebuild b/media-video/mpeg4ip/mpeg4ip-1.3.ebuild
deleted file mode 100644
index 7c4084bf1f86..000000000000
--- a/media-video/mpeg4ip/mpeg4ip-1.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.3.ebuild,v 1.4 2005/11/10 06:15:21 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"
-
-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 )
-	)
-	nas? ( media-libs/nas virtual/x11 )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	esd? ( media-sound/esound )
-	!media-libs/faad2"
-
-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 && grep -q /usr/lib/libmp4v2.la /usr/lib/libfaac.la; then
-		eerror "libfaac is compiled against libmp4v2"
-		eerror "Please remove 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)"
-
-
-	# Those are possible for both player and mp4live
-	if use player || ( use server && 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 server && use mp4live && myconf="${myconf}
-			$(use_enable v4l2)
-			$(use_enable lame mp3lame)
-			$(use_enable aac faac)"
-	{ use server && use mp4live; } || myconf="${myconf}
-			--disable-v4l2
-			--disable-mp3lame
-			--disable-faac"
-
-	./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 \
-		${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"
-
-	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 5364a884e753..abef729096df 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-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.1.ebuild,v 1.3 2005/12/19 11:17:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.4 2005/12/20 05:43:45 tester Exp $
 
 inherit eutils multilib
 
@@ -34,10 +34,11 @@ RDEPEND=" media-libs/libsdl
 		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
 		x264? ( media-libs/x264-svn )
 	)
-	nas? ( media-libs/nas virtual/x11 )
+	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-r7 "
 
 DEPEND="${RDEPEND}
@@ -46,15 +47,11 @@ DEPEND="${RDEPEND}
 	sys-devel/automake
 	player? ( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )"
 
+src_unpack() {
+	unpack ${A}
 
-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
-
+	cd ${S}
+	epatch ${FILESDIR}/mpeg4ip-1.4.1-gcc41.patch
 }
 
 src_compile() {
@@ -129,6 +126,9 @@ 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