handle vdeo cards properly #41261

5 files changed, 7 insertions, 170 deletions

diff --git a/dev-libs/DirectFB/DirectFB-0.9.12.ebuild b/dev-libs/DirectFB/DirectFB-0.9.12.ebuild
deleted file mode 100644
index 58d402494340..000000000000
--- a/dev-libs/DirectFB/DirectFB-0.9.12.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 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.12.ebuild,v 1.17 2004/01/02 17:30:40 bazik Exp $
-
-DESCRIPTION="a thin library that sits on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 -sparc ppc alpha"
-IUSE="gif quicktime mpeg png truetype flash jpeg mmx"
-
-DEPEND="dev-lang/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? ( virtual/quicktime )"
-#	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"
-
-	econf ${myconf} || die
-
-	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}
-	)
-	make || 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/DirectFB-0.9.19-r1.ebuild b/dev-libs/DirectFB/DirectFB-0.9.19-r1.ebuild
deleted file mode 100644
index 9e65b7a465c4..000000000000
--- a/dev-libs/DirectFB/DirectFB-0.9.19-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2003 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.19-r1.ebuild,v 1.8 2004/01/02 17:30:40 bazik Exp $
-
-IUSE_VIDEO_CARDS="ati128 cyber5k i810 matrox neomagic nsc nvidia radeon savage tdfx"
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc -sparc ~alpha hppa"
-IUSE="jpeg gif png truetype mpeg mmx sse fusion"
-
-DEPEND="dev-lang/perl
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mpeg? ( media-libs/libmpeg3 )
-	truetype? ( >=media-libs/freetype-2.0.1 )"
-
-pkg_setup() {
-	if [ -z "${VIDEO_CARDS}" ] ; then
-		ewarn "All video drivers will be built since you did not specify"
-		ewarn "via the VIDEO_CARDS variable what video card you use."
-		einfo "DirectFB supports: ${IUSE_VIDEO_CARDS} all none"
-	fi
-}
-
-src_compile() {
-	local vidcards
-	[ -z "${VIDEO_CARDS}" ] \
-		&& vidcards="all" \
-		|| vidcards="${VIDEO_CARDS// /,}"
-
-	local mycppflags
-	use mpeg && mycppflags="-I/usr/include/libmpeg3"
-	econf CPPFLAGS="${mycppflags}" \
-		`use_enable mmx` \
-		`use_enable sse` \
-		`use_enable mpeg libmpeg3` \
-		`use_enable jpeg` \
-		`use_enable png` \
-		`use_enable gif` \
-		`use_enable truetype freetype` \
-		`use_enable fusion multi` \
-		--with-gfxdrivers="${vidcards}" \
-		|| die
-
-	use mpeg && \
-		sed -i \
-			s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
-			${S}/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c
-
-	# add extra -lstdc++ so libpng/libflash link correctly
-	make CPPFLAGS="${mycppflags}" 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/DirectFB-0.9.20.ebuild b/dev-libs/DirectFB/DirectFB-0.9.20.ebuild
index d4efb1148e18..792938be3db4 100644
--- a/dev-libs/DirectFB/DirectFB-0.9.20.ebuild
+++ b/dev-libs/DirectFB/DirectFB-0.9.20.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/dev-libs/DirectFB/DirectFB-0.9.20.ebuild,v 1.10 2004/02/10 03:29:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.20.ebuild,v 1.11 2004/02/22 09:55:49 vapier Exp $
 
 inherit eutils
 
@@ -39,9 +39,13 @@ src_unpack() {
 
 src_compile() {
 	local vidcards
-	[ -z "${VIDEO_CARDS}" ] \
+	local card
+	for card in ${VIDEO_CARDS} ; do
+		has ${card} ${IUSE_VIDEO_CARDS} && vidcards="${vidcards},${card}"
+	done
+	[ -z "${vidcards}" ] \
 		&& vidcards="all" \
-		|| vidcards="${VIDEO_CARDS// /,}"
+		|| vidcards="${vidcards:1}"
 
 	local mycppflags
 	use mpeg && mycppflags="-I/usr/include/libmpeg3"
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.12 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.12
deleted file mode 100644
index ae42bfd66658..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd06ae7df746679bca62a407d9bc83bb DirectFB-0.9.12.tar.gz 707052
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.19-r1 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.19-r1
deleted file mode 100644
index 76103097d029..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.19-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8af7f3b5d2c3cc2cb7aba4662ec0b73f DirectFB-0.9.19.tar.gz 1148437