disables DirectFB now if directfb is not in USE

3 files changed, 132 insertions, 1 deletions

diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.5-r1 b/media-libs/libsdl/files/digest-libsdl-1.2.5-r1
new file mode 100644
index 000000000000..7f81a2ad2402
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.5-r1
@@ -0,0 +1 @@
+MD5 cacacf4e4cca546de168fedc23b9b44b SDL-1.2.5.tar.gz 1854550
diff --git a/media-libs/libsdl/libsdl-1.2.5-r1.ebuild b/media-libs/libsdl/libsdl-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..1edda0a70b17
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.5-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5-r1.ebuild,v 1.1 2003/01/19 22:40:11 lordvan Exp $
+
+IUSE="arts xv opengl fbcon aalib nas esd X svga ggi alsa directfb"
+
+S="${WORKDIR}/SDL-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+HOMEPAGE="http://www.libsdl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="x86 alpha ~ppc ~sparc"
+
+RDEPEND=">=media-libs/audiofile-0.1.9
+	X? ( virtual/x11 )
+	esd? ( >=media-sound/esound-0.2.19 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	nas? ( media-libs/nas )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	opengl? ( virtual/opengl )"
+# This create circular deps for the moment ... 
+#	directfb? ( dev-libs/DirectFB )"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src/video/directfb
+	cp SDL_DirectFB_video.c SDL_DirectFB_video.c.orig
+	sed -e "s:DICAPS_ALL, ::" SDL_DirectFB_video.c.orig \
+		> SDL_DirectFB_video.c
+}
+
+src_compile() {
+	local myconf
+
+	use X \
+		&& myconf="${myconf} --enable-video-x11" \
+		|| myconf="${myconf} --disable-video-x11"
+
+	use xv \
+		&& myconf="${myconf} --enable-video-x11-xv" \
+		|| myconf="${myconf} --disable-video-x11-xv"
+
+	use esd \
+		&& myconf="--enable-esd" \
+		|| myconf="--disable-esd"
+
+	use ggi \
+		&& myconf="${myconf} --enable-video-ggi" \
+		|| myconf="${myconf} --disable-video-ggi"
+
+	use nas \
+		&& myconf="${myconf} --enable-nas" \
+		|| myconf="${myconf} --disable-nas"
+
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+	use arts \
+		&& myconf="${myconf} --enable-arts" \
+		|| myconf="${myconf} --disable-arts"
+	
+	use svga \
+		&& myconf="${myconf} --enable-video-svga" \
+		|| myconf="${myconf} --disable-video-svga"
+
+	use aalib \
+		&& myconf="${myconf} --enable-video-aalib" \
+		|| myconf="${myconf} --disable-video-aalib"
+
+	use fbcon \
+		&& myconf="${myconf} --enable-video-fbcon" \
+		|| myconf="${myconf} --disable-video-fbcon"
+
+	use opengl \
+		&& myconf="${myconf} --enable-video-opengl" \
+		|| myconf="${myconf} --disable-video-opengl"
+
+	use directfb \
+		&& myconf="${myconf} --enable-video-directfb" \
+		|| myconf="${myconf} --disable-video-directfb"
+
+	use x86 \
+		&& myconf="${myconf} --enable-nasm" \
+		|| myconf="${myconf} --disable-nasm"
+
+	if use nas || use alsa || use oss || use arts || use esd
+	then
+		myconf="${myconf} --enable-audio"
+	else
+		myconf="${myconf} --disable-audio"
+	fi
+
+	if use X || use xv || use ggi || use aalib || use svga || use directfb || use fbcon || use opengl
+	then
+		myconf="${myconf} --enable-video-dummy"
+	else
+		myconf="${myconf} --disable-video"
+	fi
+
+	econf \
+		--enable-joystick \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-endian \
+		--enable-file \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		install || die
+
+	preplib /usr
+	dodoc BUGS COPYING CREDITS README* TODO WhatsNew
+	dohtml -r ./
+}
diff --git a/media-libs/libsdl/libsdl-1.2.5.ebuild b/media-libs/libsdl/libsdl-1.2.5.ebuild
index 7bccd242b93c..a8c9f2f16cd0 100644
--- a/media-libs/libsdl/libsdl-1.2.5.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5.ebuild,v 1.7 2003/01/16 13:45:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5.ebuild,v 1.8 2003/01/19 22:40:11 lordvan Exp $
 
 IUSE="arts xv opengl fbcon aalib nas esd X svga ggi alsa directfb"
 
@@ -86,6 +86,8 @@ src_compile() {
 #	use directfb \
 #		&& myconf="${myconf} --enable-video-directfb" \
 #		|| myconf="${myconf} --disable-video-directfb"
+	use directfb \
+		|| myconf="${myconf} --disable-video-directfb"
 
 	use x86 \
 		&& myconf="${myconf} --enable-nasm" \