Fix for #9760

3 files changed, 106 insertions, 12 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index c315832de946..51721bfbf461 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,43 +1,42 @@
 # 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.14 2002/10/19 20:54:53 cselkirk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.15 2002/10/30 17:02:28 vapier Exp $
+
+*DirectFB-0.9.13-r1 (30 Oct 2002)
+
+  30 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added a gcc3.x fix for libflash and a library linkage fix for libpng-1.2.5
 
 *DirectFB-0.9.13 (27 Aug 2002)
 
   27 Aug 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.13.ebuild
   files/digest-DirectFB-0.9.13 :
-
   Version bump.
 
 *DirectFB-0.9.12 (20 Jun 2002)
 
   19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> DirectFB-0.9.12.ebuild :
-
   Added ppc to KEYWORDS.
 
   20 Jun 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.12.ebuild
   files/digest-DirectFB-0.9.12 :
-
   Version bump.
 
 *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)
 
   6 Jun 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.11.ebuild
   files/digest-DirectFB-0.9.11 :
-
   Version bump.
 
 *DirectFB-0.9.10-r1 (26 Apr 2002)
 
   26 May 2002; Martin Schlemmer <azarah@gentoo.org> DirectFB-0.9.10-r1.ebuild :
-
   Having "mmx" in use did not enable it .. fixed.  Updated avifile DEPEND
   for now ... this will be needed when I can get it patched to work with
   avifile-0.7.4.
@@ -46,13 +45,11 @@
 
   26 Apr 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.10.ebuild
   files/digest-DirectFB-0.9.10 :
-
   Version bump to bugfix release.
 
 *DirectFB-0.9.9-r2 (15 Apr 2002)
 
   15 Apr 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.9-r2.ebuild :
-
   Update: still blah.  I have removed the necessity of the libmpeg3 tarball
   at least.  These people need to learn about libtool.  Anyway, by patching
   the Makefile to point it to the static libmpeg3.a file in /usr/lib, it
@@ -72,20 +69,17 @@
 *DirectFB-0.9.9 (12 Apr 2002)
 
   12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.9.ebuild :
-
   Version bump, but avi support is still broken.  Note that the avifile
   USE toggle is now just avi.
 
 *DirectFB-0.9.7 (21 Mar 2002)
   
   21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> DirectFB-0.9.7.ebuild :
-
   HTML documentation need not be gzipped.
 
 *DirectFB-0.9.7 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/dev-libs/DirectFB/DirectFB-0.9.13-r1.ebuild b/dev-libs/DirectFB/DirectFB-0.9.13-r1.ebuild
new file mode 100644
index 000000000000..0c41f8e8610d
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-0.9.13-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.13-r1.ebuild,v 1.1 2002/10/30 17:02:33 vapier Exp $
+
+IUSE="gif quicktime mpeg png truetype flash jpeg mmx"
+
+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/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+
+DEPEND="sys-devel/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	mpeg? ( media-libs/libmpeg3 )
+	flash? ( >=media-libs/libflash-0.4.10 )
+	truetype? ( >=media-libs/freetype-2.0.1 )
+	quicktime? ( media-libs/quicktime4linux )"
+#	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=""
+	
+	# Bug in the ./configure script that breaks if you
+	# have --enable-mmx
+	use mmx \
+		&& myconf="${myconf} --enable-mmx" \
+		|| myconf="${myconf} --disable-mmx"
+
+# Still do not work currently
+#	use avi	\
+#		&& myconf="${myconf} --enable-avifile" \
+#		|| myconf="${myconf} --disable-avifile"
+	myconf="${myconf} --disable-avifile"
+	
+	use mpeg \
+		&& myconf="${myconf} --enable-libmpeg3" \
+		|| myconf="${myconf} --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"
+
+	# fix gcc3.x linking with libflash
+	cp configure configure.old
+	sed -e 's:-lflash:-lflash -lstdc++:' configure.old > configure
+	econf ${myconf}
+
+	use mpeg && ( \
+		cd ${S}/interfaces/IDirectFBVideoProvider
+		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}
+	)
+
+	# add extra -lstdc++ so libpng/libflash link correctly
+	make LDFLAGS="${LDFLAGS} -lstdc++" || 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.13-r1 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.13-r1
new file mode 100644
index 000000000000..b81063d97232
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-0.9.13-r1
@@ -0,0 +1 @@
+MD5 7a1079c6c3a63ba628a2a43e5ec68331 DirectFB-0.9.13.tar.gz 774553