version bump to cvs snapshot for DirectFB compatbility

11 files changed, 34 insertions, 353 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index c62c4ea96e54..53a5452c3bcc 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.6 2002/04/23 02:20:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.7 2002/06/08 12:57:44 seemant Exp $
+
+*libsdl-1.2.4-20020601 (7 Jun 2002)
+
+  7 June 2002; Seemant Kulleen <seemant@gentoo.org>
+  libsdl-1.2.4-20020601.ebuild files/digest-libsdl-1.2.4-20020601 :
+
+  Version bump to CVS snapshot which compiles against DirectFB-0.9.11
 
 *libsdl-1.2.4-r1 (22 Apr 2002)
 
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.3 b/media-libs/libsdl/files/digest-libsdl-1.2.3
deleted file mode 100644
index edc753ea635f..000000000000
--- a/media-libs/libsdl/files/digest-libsdl-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a942c605c0f36752a4df5709a449ae7a SDL-1.2.3.tar.gz 1568671
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.3-r1 b/media-libs/libsdl/files/digest-libsdl-1.2.3-r1
deleted file mode 100644
index edc753ea635f..000000000000
--- a/media-libs/libsdl/files/digest-libsdl-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a942c605c0f36752a4df5709a449ae7a SDL-1.2.3.tar.gz 1568671
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.4 b/media-libs/libsdl/files/digest-libsdl-1.2.4
deleted file mode 100644
index d7cf1782b39d..000000000000
--- a/media-libs/libsdl/files/digest-libsdl-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 116c083aad99faae691c6ca8dcdf406d SDL-1.2.4.tar.gz 1806163
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.4-r1 b/media-libs/libsdl/files/digest-libsdl-1.2.4-r1
deleted file mode 100644
index d7cf1782b39d..000000000000
--- a/media-libs/libsdl/files/digest-libsdl-1.2.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 116c083aad99faae691c6ca8dcdf406d SDL-1.2.4.tar.gz 1806163
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.4.20020601 b/media-libs/libsdl/files/digest-libsdl-1.2.4.20020601
new file mode 100644
index 000000000000..156946157c72
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.4.20020601
@@ -0,0 +1 @@
+MD5 ca849a0f02c81eb3dc9d34f665f72aaf libsdl-1.2.4.20020601.tar.bz2 1399318
diff --git a/media-libs/libsdl/libsdl-1.2.3-r1.ebuild b/media-libs/libsdl/libsdl-1.2.3-r1.ebuild
deleted file mode 100644
index 29d7a2bbc9fe..000000000000
--- a/media-libs/libsdl/libsdl-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.3-r1.ebuild,v 1.2 2002/03/21 16:33:20 seemant Exp $
-
-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/"
-
-DEPEND="virtual/glibc
-	>=dev-lang/nasm-0.98
-	>=media-libs/audiofile-0.1.9
-	opengl? ( virtual/opengl )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	esd? ( >=media-sound/esound-0.2.19 )
-	X? ( virtual/x11 )
-	arts? ( >=kde-base/kdelibs-2.0.1 )
-	nas? ( media-libs/nas )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	alsa? ( media-libs/alsa-lib )
-	directfb? ( >=dev-libs/DirectFB-0.9.7 )"
-
-RDEPEND="virtual/glibc
-	>=media-libs/audiofile-0.1.9
-	opengl? ( virtual/opengl )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	esd? ( >=media-sound/esound-0.2.19 )
-	X? ( virtual/x11 )
-	arts? ( >=kde-base/kdelibs-2.0.1 )
-	nas? ( media-libs/nas )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	alsa? ( media-libs/alsa-lib )
-	directfb? ( >=dev-libs/DirectFB-0.9.7 )"
-
-src_compile() {
-	local myconf
-	if [ -z "`use esd`" ]
-	then
-		myconf="--disable-esd"
-	else
-		myconf="--enable-esd"
-	fi
-	if [ -z "`use xv`" ]
-	then
-		myconf="${myconf} --disable-video-x11-xv"
-	else
-		myconf="${myconf} --enable-video-x11-xv"
-	fi
-	if [ -z "`use arts`" ]
-	then
-		myconf="${myconf} --disable-arts"
-	else
-		myconf="${myconf} --enable-arts"
-	fi
-	
-	if [ -z "`use nas`" ]
-	then
-		myconf="${myconf} --disable-nas"
-	else
-		myconf="${myconf} --enable-nas"
-	fi
-	if [ -z "`use X`" ]
-	then
-		myconf="${myconf} --disable-video-x11"
-	else
-		myconf="${myconf} --enable-video-x11"
-	fi
-	if [ "`use svga`" ]
-	then
-		myconf="${myconf} --enable-video-svga"
-	else
-		myconf="${myconf} --disable-video-svga"
-	fi
-	if [ -z "`use fbcon`" ]
-	then
-		myconf="${myconf} --disable-video-fbcon"
-	else
-		myconf="${myconf} --enable-video-fbcon"
-	fi
-	if [ "`use aalib`" ]
-	then
-		myconf="${myconf} --enable-video-aalib"
-	else
-		myconf="${myconf} --disable-video-aalib"
-	fi
-	if [ "`use ggi`" ]
-	then
-		myconf="${myconf} --enable-video-ggi"
-	else
-		myconf="${myconf} --disable-video-ggi"
-	fi
-	if [ -z "`use opengl`" ]
-	then
-		myconf="${myconf} --disable-video-opengl"
-	else
-		myconf="${myconf} --enable-video-opengl"
-	fi
-	if [ -z "`use directfb`" ]
-	then
-		myconf="${myconf} --disable-video-directfb"
-	else
-		myconf="${myconf} --enable-video-directfb"
-	fi
-	if [ -n "`use alsa`" ]
-	then
-		myconf="${myconf} --enable-alsa"
-	else
-		myconf="${myconf} --disable-alsa"
-	fi	
-	./configure --host=${CHOST} --enable-input-events --prefix=/usr --mandir=/usr/share/man ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	cd ${S}
-	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.3.ebuild b/media-libs/libsdl/libsdl-1.2.3.ebuild
deleted file mode 100644
index 8953bb70c6c7..000000000000
--- a/media-libs/libsdl/libsdl-1.2.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.3.ebuild,v 1.3 2002/02/07 06:50:24 drobbins Exp $
-
-A=SDL-${PV}.tar.gz
-S=${WORKDIR}/SDL-${PV}
-DESCRIPTION="Simple Direct Media Layer"
-SRC_URI="http://www.libsdl.org/release/${A}"
-HOMEPAGE="http://www.libsdl.org/"
-
-DEPEND="virtual/glibc
-    >=dev-lang/nasm-0.98
-    >=media-libs/audiofile-0.1.9
-    opengl? ( virtual/opengl )
-    svga? ( >=media-libs/svgalib-1.4.2 )
-    esd? ( >=media-sound/esound-0.2.19 )
-    X? ( virtual/x11 )
-    arts? ( >=kde-base/kdelibs-2.0.1 )
-    nas? ( media-libs/nas )
-    ggi? ( >=media-libs/libggi-2.0_beta3 )
-    alsa? ( media-libs/alsa-lib )
-    directfb? ( >=dev-libs/DirectFB-0.9.7 )"
-
-RDEPEND="virtual/glibc
-    >=media-libs/audiofile-0.1.9
-    opengl? ( virtual/opengl )
-    svga? ( >=media-libs/svgalib-1.4.2 )
-    esd? ( >=media-sound/esound-0.2.19 )
-    X? ( virtual/x11 )
-    arts? ( >=kde-base/kdelibs-2.0.1 )
-    nas? ( media-libs/nas )
-    ggi? ( >=media-libs/libggi-2.0_beta3 )
-    alsa? ( media-libs/alsa-lib )
-    directfb? ( >=dev-libs/DirectFB-0.9.7 )"
-
-src_compile() {
-
-  local myconf
-	
-  if [ -z "`use esd`" ]
-  then
-    myconf="--disable-esd"
-  else
-    myconf="--enable-esd"
-  fi
-
-  if [ -z "`use arts`" ]
-  then
-    myconf="${myconf} --disable-arts"
-  else
-    myconf="${myconf} --enable-arts"
-  fi
-
-  if [ -z "`use nas`" ]
-  then
-    myconf="${myconf} --disable-nas"
-  else
-    myconf="${myconf} --enable-nas"
-  fi
-
-  if [ -z "`use X`" ]
-  then
-    myconf="${myconf} --disable-video-x11"
-  else
-    myconf="${myconf} --enable-video-x11"
-  fi
-  if [ "`use svga`" ]
-  then
-    myconf="${myconf} --enable-video-svga"
-  else
-    myconf="${myconf} --disable-video-svga"
-  fi
-  if [ -z "`use fbcon`" ]
-  then
-    myconf="${myconf} --disable-video-fbcon"
-  else
-    myconf="${myconf} --enable-video-fbcon"
-  fi
-  if [ "`use aalib`" ]
-  then
-    myconf="${myconf} --enable-video-aalib"
-  else
-    myconf="${myconf} --disable-video-aalib"
-  fi
-  if [ "`use ggi`" ]
-  then
-    myconf="${myconf} --enable-video-ggi"
-  else
-    myconf="${myconf} --disable-video-ggi"
-  fi
-  if [ -z "`use opengl`" ]
-  then
-    myconf="${myconf} --disable-video-opengl"
-  else
-    myconf="${myconf} --enable-video-opengl"
-  fi
-  if [ -z "`use directfb`" ]
-  then
-    myconf="${myconf} --disable-video-directfb"
-  else
-    myconf="${myconf} --enable-video-directfb"
-  fi
-  if [ -n "`use alsa`" ]
-  then
-    myconf="${myconf} --enable-alsa"
-  else
-    myconf="${myconf} --disable-alsa"
-  fi	
-
-  try ./configure --host=${CHOST} --enable-input-events --prefix=/usr --mandir=/usr/share/man ${myconf}
-
-  try make
-
-}
-
-src_install() {
-  cd ${S}
-  try make DESTDIR=${D} install
-  preplib /usr
-  dodoc BUGS COPYING CREDITS README* TODO WhatsNew
-  docinto html
-  dodoc *.html
-  docinto html/docs
-  dodoc docs/*.html
-  
-}
diff --git a/media-libs/libsdl/libsdl-1.2.4-r2.ebuild b/media-libs/libsdl/libsdl-1.2.4-r2.ebuild
index 21af2b451607..6a4452b58319 100644
--- a/media-libs/libsdl/libsdl-1.2.4-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4-r2.ebuild,v 1.1 2002/04/23 02:20:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4-r2.ebuild,v 1.2 2002/06/08 12:57:44 seemant Exp $
 
 S=${WORKDIR}/SDL-${PV}
 DESCRIPTION="Simple Direct Media Layer"
@@ -22,6 +22,7 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 DEPEND="${RDEPEND}
 	dev-lang/nasm"
 
+LICENSE="LGPL"
 
 src_compile() {
 	local myconf
diff --git a/media-libs/libsdl/libsdl-1.2.4-r1.ebuild b/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
index bb436be62a6a..a295063862a5 100644
--- a/media-libs/libsdl/libsdl-1.2.4-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4-r1.ebuild,v 1.1 2002/04/19 20:54:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild,v 1.1 2002/06/08 12:57:44 seemant Exp $
 
-S=${WORKDIR}/SDL-${PV}
+S=${WORKDIR}/SDL12
 DESCRIPTION="Simple Direct Media Layer"
-SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+SRC_URI="http://www.libsdl.org/release/${P}.tar.bz2"
 HOMEPAGE="http://www.libsdl.org/"
 
 RDEPEND=">=media-libs/audiofile-0.1.9
@@ -14,14 +14,30 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
 	nas? ( media-libs/nas )
 	alsa? ( media-libs/alsa-lib )
-	arts? ( >=kde-base/kdelibs-2.0.1 )
+	arts? ( kde-base/arts )
 	svga? ( >=media-libs/svgalib-1.4.2 )
 	opengl? ( virtual/opengl )
-	directfb? ( >=dev-libs/DirectFB-0.9.7 )"
+	directfb? ( >=dev-libs/DirectFB-0.9.11 )"
 
 DEPEND="${RDEPEND}
 	dev-lang/nasm"
 
+LICENSE="LGPL"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}/src/video/directfb
+	cp SDL_DirectFB_events.c SDL_DirectFB_events.c.orig
+	sed -e "s:DIKI_CTRL:DIKI_CONTROL_L:" \
+		-e "s:DIKI_SHIFT:DIKI_SHIFT_L:" \
+		-e "s:DIKI_ALT:DIKI_ALT_L:" \
+		-e "s:DIKI_ALT_LGR:DIKI_ALT_R:" \
+		-e "s:DIKI_CAPSLOCK:DIKI_CAPS_LOCK:" \
+		-e "s:DIKI_NUMLOCK:DIKI_NUM_LOCK:" \
+		-e "s:DIKI_SCRLOCK:DIKI_SCROLL_LOCK:" \
+		SDL_DirectFB_events.c.orig > SDL_DirectFB_events.c
+}
 
 src_compile() {
 	local myconf
@@ -74,6 +90,8 @@ src_compile() {
 		&& myconf="${myconf} --enable-video-directfb" \
 		|| myconf="${myconf} --disable-video-directfb"
 
+	./autogen.sh
+
 	./configure \
 		--host=${CHOST} \
 		--enable-input-events \
diff --git a/media-libs/libsdl/libsdl-1.2.4.ebuild b/media-libs/libsdl/libsdl-1.2.4.ebuild
deleted file mode 100644
index 6b3c733305eb..000000000000
--- a/media-libs/libsdl/libsdl-1.2.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4.ebuild,v 1.2 2002/04/17 17:11:50 seemant Exp $
-
-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/"
-
-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/kdelibs-2.0.1 )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	opengl? ( virtual/opengl )
-	directfb? ( >=dev-libs/DirectFB-0.9.7 )"
-
-DEPEND="${RDEPEND}
-	dev-lang/nasm"
-
-
-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} --disable-video-opengl" \
-		|| myconf="${myconf} --enable-video-opengl"
-
-	use directfb \
-		&& myconf="${myconf} --enable-video-directfb" \
-		|| myconf="${myconf} --disable-video-directfb"
-
-	./configure \
-		--host=${CHOST} \
-		--enable-input-events \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		install || die
-
-	preplib /usr
-	dodoc BUGS COPYING CREDITS README* TODO WhatsNew
-	dohtml -r ./
-}