avifile and libmpeg3 support disabled for now

4 files changed, 157 insertions, 28 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 4e7268b4aff5..f754b681b017 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,8 +1,16 @@
 # 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.4 2002/04/12 21:09:14 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.5 2002/04/16 03:15:43 seemant Exp $
 
 
+*DirectFB-0.9.9-r2 (15 Apr 2002)
+
+  15 Apr 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.9-r2.ebuild :
+
+  avi support is broken, and libmpeg3 support is broken as well.  Upstream
+  has been made aware of the libmpeg3 issue, so that will hopefully get
+  sorted out soon.
+
 *DirectFB-0.9.9-r1 (12 Apr 2002)
   12 Apr 2002; Spider <spider@gentoo.org> DirectFB-0.9.9-r1.ebuild :
   Versionbump, libpng update
diff --git a/dev-libs/DirectFB/DirectFB-0.9.9-r1.ebuild b/dev-libs/DirectFB/DirectFB-0.9.9-r1.ebuild
index b0699cd219d9..756e093ffc06 100644
--- a/dev-libs/DirectFB/DirectFB-0.9.9-r1.ebuild
+++ b/dev-libs/DirectFB/DirectFB-0.9.9-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.9-r1.ebuild,v 1.1 2002/04/12 21:09:14 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.9-r1.ebuild,v 1.2 2002/04/16 03:15:43 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="DirectFB is a thin library on top of the Linux framebuffer devices"
@@ -9,36 +9,67 @@ SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
 HOMEPAGE="http://www.directfb.org"
 
 DEPEND="sys-devel/perl
-	>=media-libs/freetype-2.0.1
-	>=media-libs/jpeg-6
-	>=media-libs/libpng-1.2.1
-	>=media-libs/libflash-0.4.10
 	avi? ( =media-video/avifile-0.6* )
-	libmpeg3? ( >=media-libs/libmpeg3-1.2.3 )"
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	flash? ( >=media-libs/libflash-0.4.10 )
+	libmpeg3? ( >=media-libs/libmpeg3-1.2.3 )
+	truetype? ( >=media-libs/freetype-2.0.1 )
+	quicktime? ( media-libs/quicktime4linux )"
 
 RDEPEND="${DEPEND}"
 
 extralibinfo=""
 use libmpeg3 && extralibinfo="LIBMPEG3_DIR=/usr/lib LIBMPEG3_LIBS=-lmpeg3"
 
-src_compile() {
+src_unpack() {
+
+	unpack ${A}
+
+	use libmpeg3 \
+		&& cp /usr/lib/libmpeg3.a ${S}/interfaces/IDirectFBVideoProvider/no
+}
 
-    use mmx	\
-      && myconf="--enable-mmx"	\
-      || myconf="--disable-mmx"
+src_compile() {
+	
+	
+	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.
 #	use avi	\
-#      && myconf="${myconf} --enable-avifile"	\
-#      || myconf="${myconf} --disable-avifile"
-    
-	use libmpeg3	\
-      && myconf="${myconf} --with-libmpeg3=/usr/include/libmpeg3"	\
-      && mkdir ${S}/interfaces/IDirectFBVideoProvider/no	\
-      && cp /usr/lib/libmpeg3.a ${S}/interfaces/IDirectFBVideoProvider/no	\
-      || myconf="${myconf} --disable-libmpeg3"
+#		&& myconf="${myconf} --enable-avifile"	\
+#		|| myconf="${myconf} --disable-avifile"
+	
+	myconf="${myconf} --disable-avifile"
     
+	use libmpeg3 \
+		&& myconf="${myconf} --with-libmpeg3=/usr/include/libmpeg3"	\
+		&& mkdir ${S}/interfaces/IDirectFBVideoProvider/no	\
+		|| myconf="${myconf} --without-libmpeg3"
+
+#	use libmpeg3 \
+#		&& myconf="${myconf} --with-libmpeg3=/usr/include/libmpeg3" \
+#		|| myconf="${myconf} --without-libmpeg3"
+
+	use jpeg \
+		&& myconf="${myconf} --enable-jpeg" \
+		|| myconf="${myconf} --disable-jpeg"
+
+	use png \
+		&& myconf="${myconf} --enable-png" \
+		|| myconf="${myconf} --disable-png"
+
+	use gif \
+		&& myconf="${myconf} --enable-gif" \
+		|| myconf="${myconf} --disable-gif"
+
+	use truetype \
+		&& myconf="${myconf} --enable-freetype" \
+		|| myconf="${myconf} --disable-freetype"
 	
 	if [ "$DEBUG" ] ; then
       myconf="${myconf} --enable-debug"
@@ -47,16 +78,11 @@ src_compile() {
     fi
 	
     ./configure	\
-		--prefix=/usr 	\
-		--host=${CHOST}	\
-		--disable-avifile	\
-		--enable-jpeg 	\
-		--enable-png	\
-		--enable-gif	\
+		--prefix=/usr \
 		${myconf} || die
 
-	make 	\
-		${extralibinfo} || die
+	make \
+		"${extralibinfo}" || die
 
 }
 
@@ -66,7 +92,6 @@ src_install () {
 	doins fb.modes
 
 	make 	\
-	   	${extralibinfo} 	\
 		DESTDIR=${D}	\
 		install || die
 
diff --git a/dev-libs/DirectFB/DirectFB-0.9.9-r2.ebuild b/dev-libs/DirectFB/DirectFB-0.9.9-r2.ebuild
new file mode 100644
index 000000000000..6112182d7d8f
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-0.9.9-r2.ebuild
@@ -0,0 +1,94 @@
+# 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.9-r2.ebuild,v 1.1 2002/04/16 03:15:43 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="DirectFB is a thin library on top of the Linux framebuffer devices"
+SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
+HOMEPAGE="http://www.directfb.org"
+
+DEPEND="sys-devel/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	flash? ( >=media-libs/libflash-0.4.10 )
+	truetype? ( >=media-libs/freetype-2.0.1 )
+	quicktime? ( media-libs/quicktime4linux )"
+#	avi? ( =media-video/avifile-0.6* )
+#	mpeg? ( >=media-libs/libmpeg3-1.5 )
+
+RDEPEND="${DEPEND}"
+
+#extralibinfo=""
+#use mpeg && extralibinfo="LIBMPEG3_DIR=/usr/lib LIBMPEG3_LIBS=-lmpeg3"
+
+src_compile() {
+	
+	local myconf
+	
+	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.
+#	use avi	\
+#		&& myconf="${myconf} --enable-avifile"	\
+#		|| myconf="${myconf} --disable-avifile"
+	
+#	use mpeg \
+#		&& myconf="${myconf} --with-libmpeg3=/usr/include/libmpeg3"	\
+#		&& mkdir ${S}/interfaces/IDirectFBVideoProvider/no	\
+#		|| myconf="${myconf} --without-libmpeg3"
+
+	myconf="${myconf} --disable-avifile --disable-libmpeg3"
+    
+	use jpeg \
+		&& myconf="${myconf} --enable-jpeg" \
+		|| myconf="${myconf} --disable-jpeg"
+
+	use png \
+		&& myconf="${myconf} --enable-png" \
+		|| myconf="${myconf} --disable-png"
+
+	use gif \
+		&& myconf="${myconf} --enable-gif" \
+		|| myconf="${myconf} --disable-gif"
+
+	use truetype \
+		&& myconf="${myconf} --enable-freetype" \
+		|| myconf="${myconf} --disable-freetype"
+	
+	if [ "$DEBUG" ] ; then
+      myconf="${myconf} --enable-debug"
+    else
+      myconf="${myconf} --disable-debug"
+    fi
+
+	
+    ./configure	\
+		--prefix=/usr \
+		${myconf} || die
+
+	use mpeg && ( \
+		make "${extralibinfo}" || die "libmpeg3 sucks"
+	) || ( \
+		make || die "why did I die?"
+	)
+			
+
+}
+
+src_install () {
+	
+	insinto /etc
+	doins fb.modes
+
+	make 	\
+		DESTDIR=${D}	\
+		install || die
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
+	dohtml -r docs/html
+}
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.9-r2 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.9-r2
new file mode 100644
index 000000000000..598823352fd4
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-0.9.9-r2
@@ -0,0 +1,2 @@
+MD5 46cff64fa95e927bdbce38fc37f5baf6 DirectFB-0.9.9.tar.gz 594770
+MD5 1800adbd17cb6cdca2e11858cb25649a libmpeg3-1.5.tar.gz 203235