libmpeg3 fixes

4 files changed, 36 insertions, 14 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 2ecf5dff6cf9..97de22dcf14e 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.10 2002/06/06 10:01:47 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.11 2002/06/08 09:01:41 seemant Exp $
+
+*DirectFB-0.9.11 (7 Jun 2002)
+
+  7 Jun 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.11-r1.ebuild
+  files/digest-DirectFB-0.9.11-r1 :
+
+  Fixed so that it finds the libmpeg3 headers.
 
 *DirectFB-0.9.11 (6 Jun 2002)
 
diff --git a/dev-libs/DirectFB/DirectFB-0.9.10.ebuild b/dev-libs/DirectFB/DirectFB-0.9.11-r1.ebuild
index f334e6a9d0c9..2ab15fa9b7ab 100644
--- a/dev-libs/DirectFB/DirectFB-0.9.10.ebuild
+++ b/dev-libs/DirectFB/DirectFB-0.9.11-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: system@gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.10.ebuild,v 1.2 2002/05/01 08:28:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.11-r1.ebuild,v 1.1 2002/06/08 09:01:41 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="DirectFB is a thin library on top of the Linux framebuffer devices"
@@ -16,28 +16,38 @@ DEPEND="sys-devel/perl
 	flash? ( >=media-libs/libflash-0.4.10 )
 	truetype? ( >=media-libs/freetype-2.0.1 )
 	quicktime? ( media-libs/quicktime4linux )"
-#	avi? ( =media-video/avifile-0.6* )
+#	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )"
 
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp configure configure.orig
+	sed -e 's:ac_safe=`echo "libmpeg3.h:ac_safe=`echo "libmpeg3/libmpeg3.h:' \
+		-e 's:#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
+		configure.orig > configure
+}
+
 src_compile() {
 	
-	local myconf
+	local myconf=""
 	
-	use mmx	\
-		&& myconf="${myconf} --enable-mmx"	\
+	# Bug in the ./configure script that breaks if you
+	# have --enable-mmx
+	use mmx \
+		&& myconf="${myconf} --enable-mmx" \
 		|| myconf="${myconf} --disable-mmx"
 
-# avifile that is in portage currently does not work with directfb
-# an older one in the 0.6.0 series is required.
+# Still do not work currently
 #	use avi	\
-#		&& myconf="${myconf} --enable-avifile"	\
+#		&& myconf="${myconf} --enable-avifile" \
 #		|| myconf="${myconf} --disable-avifile"
-	
 	myconf="${myconf} --disable-avifile"
 	
 	use mpeg \
-		&& myconf="${myconf} --with-libmpeg3=/usr/include/libmpeg3" \
+		&& myconf="${myconf} --enable-libmpeg3" \
 		|| myconf="${myconf} --disable-libmpeg3"
+	
 
 	use jpeg \
 		&& myconf="${myconf} --enable-jpeg" \
@@ -59,10 +69,14 @@ src_compile() {
 
 	use mpeg && ( \
 		cd ${S}/interfaces/IDirectFBVideoProvider
-		patch < ${FILESDIR}/${PN}-gentoo-patch Makefile
+		cp idirectfbvideoprovider_libmpeg3.c \
+			idirectfbvideoprovider_libmpeg3.c.orig
+	
+		sed s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
+			idirectfbvideoprovider_libmpeg3.c.orig > \
+				idirectfbvideoprovider_libmpeg3.c
 		cd ${S}
 	)
-
 	make || die
 
 }
@@ -79,3 +93,4 @@ src_install () {
 	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
 	dohtml -r docs/html
 }
+
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.10 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.10
deleted file mode 100644
index 291e84890698..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 615898ec754cc8b64345ae0180fb9359 DirectFB-0.9.10.tar.gz 587293
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.11-r1 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.11-r1
new file mode 100644
index 000000000000..42d20eba59ad
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-0.9.11-r1
@@ -0,0 +1 @@
+MD5 f0d6ceb41d83fc75eed59af9915c072d DirectFB-0.9.11.tar.gz 696979