more fixed to media-video/mpeg4ip-1.1

3 files changed, 44 insertions, 21 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 9dc26617b9bf..5b878c242937 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.8 2004/06/01 15:25:04 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.9 2004/06/05 15:25:52 tester Exp $
+
+  05 Jun 2004; <tester@gentoo.org> mpeg4ip-1.1.ebuild:
+  Made xvid, nas, alsa, esd, arts support use flags. Fixed a few bugs (including
+  #52693 and 52071). And disabled mp4live because I can't get it to build.
 
   01 Jun 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.1.ebuild:
   only --disable-v4l2 is valid, fixes bug #52649, removed useless cruft from
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index 3b58557288b8..e69286cce8de 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,6 +1,6 @@
 MD5 b79546362aeeb90c04e462e02c81aa24 mpeg4ip-1.0.ebuild 2235
-MD5 aa5c220c6150d2880ff821aafdb604c1 ChangeLog 1807
+MD5 cd46e25cd147f1415411a0561b1da37c ChangeLog 2019
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 aa20cc1c3b38e60d72bbc6d9647f963a mpeg4ip-1.1.ebuild 1132
+MD5 f58577cd0b3995749854f58c43576bd3 mpeg4ip-1.1.ebuild 1569
 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
 MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
diff --git a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
index 1f3a41d91b17..975664e9db11 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.2 2004/06/01 15:25:04 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.3 2004/06/05 15:25:52 tester Exp $
 
 DESCRIPTION="MPEG 4 implementation library"
 
@@ -14,32 +14,51 @@ SLOT="0"
 
 KEYWORDS="~x86 ~amd64"
 
-IUSE="ipv6 mmx gtk v4l2"
-
-DEPEND="sys-devel/libtool
-		sys-devel/autoconf
-		sys-devel/automake
-		media-libs/faac
-		>=media-sound/lame-3.92
-		gtk? ( >=x11-libs/gtk+-2 )
-		x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )
-		media-video/ffmpeg
-		media-libs/libid3tag"
+IUSE="ipv6 mmx gtk v4l2 xvid nas alsa esd arts"
+
+RDEPEND="sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake
+	>=media-libs/faac-1.20.1
+	>=media-sound/lame-3.92
+	gtk? ( >=x11-libs/gtk+-2 )
+	media-libs/libid3tag
+	xvid? ( media-libs/xvid )
+	nas? ( media-libs/nas virtual/x11 )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	!media-libs/faad2"
+
+DEPENDS="${RDEPEND}
+	x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )"
 
 S="${WORKDIR}/${P}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's/-Wmissing-prototypes//g' configure
+
+	cd ${S}/lib/SDLAudio
+	sed -i -e 's:-laudio:-L/usr/X11R6/lib -laudio:' configure
+}
+
 src_compile() {
 
 	cd ${S}
 
 	local myconf
-	myconf=" `use_enable ipv6`
-			`use_enable mmx`
-			` use_enable ppc`"
-	use v4l2 || myconf="${myconf} --disable-v4l2"
 
-	use amd64 && myconf="$myconf --disable-mp4live" && \
-		ewarn "mp4live disabled on amd64"
+	# mp4live doesnt build, disable it..
+	myconf=" --disable-mp4live --disable-ffmpeg $(use_enable ipv6)
+			$(use_enable mmx)
+			$(use_enable ppc)
+			$(use_enable nas)
+			$(use_enable esd)
+			$(use_enable alsa)
+			$(use_enable arts)"
+	use v4l2 || myconf="${myconf} --disable-v4l2"
 
 	econf ${myconf} || die "configure failed"