fix0rs

8 files changed, 35 insertions, 178 deletions

diff --git a/x11-base/xdirectfb/ChangeLog b/x11-base/xdirectfb/ChangeLog
index 3b9b3e5d3a51..f115e5932f6f 100644
--- a/x11-base/xdirectfb/ChangeLog
+++ b/x11-base/xdirectfb/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for x11-base/xdirectfb
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.6 2002/12/13 11:00:48 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.7 2003/02/02 22:08:15 seemant Exp $
+
+*xdirectfb-1.0_rc3-r1 (02 Feb 2003)
+
+  02 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  xdirectfb-1.0_rc3-r1.ebuild files/digest-xdirectfb-1.0_rc3-r1 :
+
+  Updated to use DirectFB-0.9.16 and the xfree-cvs-4.2.99.4 snapshot.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *xdirectfb-1.0_rc3 (16 Nov 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   16 Nov 2002; Seemant Kulleen <seemant@gentoo.org> xdirectfb-1.0_rc3.ebuild
   files/digest-xdirectfb-1.0_rc3 :
 
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r1 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r1
deleted file mode 100644
index 2f89f2f05e84..000000000000
--- a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 21390561571cf1c34b145e4d2aad9a4a X4299-1.tar.bz2 9228113
-MD5 761753507f6c5d29ef54b4ba27ff8bf7 X4299-2.tar.bz2 13307537
-MD5 15426bacbaf9b9783c0020a9865038a3 X4299-3.tar.bz2 11350279
-MD5 896a27d7b00c100ab80cf0f01f1a10ac X4299-4.tar.bz2 16685884
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606
-MD5 24fbcdbfc02b4e2f6dc2e19c47f35c5a XDirectFB-1.0-rc2.tar.gz 63748
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r2 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r2
deleted file mode 100644
index 0cea0d39a9b5..000000000000
--- a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 41eaeb20d3a8933eb569ca18453bb75f X4299.20020827-1.tar.bz2 17952466
-MD5 e9d5dc6f00d8a819d751b3289aef8bce X4299.20020827-2.tar.bz2 18145127
-MD5 49e2f438bd563f7d5a5cfd5d7f9718df X4299.20020827-3.tar.bz2 16684117
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606
-MD5 24fbcdbfc02b4e2f6dc2e19c47f35c5a XDirectFB-1.0-rc2.tar.gz 63748
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3
deleted file mode 100644
index 7bb71a12a3b4..000000000000
--- a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 20ce3e8ad190ad8ae9aecc18cf168249 X4.2.99.3-1.tar.bz2 16691905
-MD5 a70af970c95a9ec30365bc8ac8fb663f X4.2.99.3-2.tar.bz2 9770253
-MD5 e0751934436f3679b128673aad663afc X4.2.99.3-3.tar.bz2 12774830
-MD5 50dea4abe59a09da7fc1b83f88b9303b X4.2.99.3-4.tar.bz2 16700555
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606
-MD5 6260f09063c4b30ce38bec36f1692af6 XDirectFB-1.0-rc3.tar.gz 63991
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3-r1 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3-r1
new file mode 100644
index 000000000000..ff9f384798cd
--- /dev/null
+++ b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3-r1
@@ -0,0 +1,6 @@
+MD5 26ad45aaa28384e66555d541f036255b X4.2.99.4-1.tar.bz2 16597716
+MD5 f74a12359840f4cb13bbf5a55f66dfb7 X4.2.99.4-2.tar.bz2 9770957
+MD5 dc5d49fe6b6e91b9d6817baff6898388 X4.2.99.4-3.tar.bz2 12811390
+MD5 b308de3cbfdd87bb8436384517e6f924 X4.2.99.4-4.tar.bz2 16671535
+MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606
+MD5 6260f09063c4b30ce38bec36f1692af6 XDirectFB-1.0-rc3.tar.gz 63991
diff --git a/x11-base/xdirectfb/xdirectfb-1.0_rc2-r1.ebuild b/x11-base/xdirectfb/xdirectfb-1.0_rc2-r1.ebuild
deleted file mode 100644
index 1d7330ef4b65..000000000000
--- a/x11-base/xdirectfb/xdirectfb-1.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc2-r1.ebuild,v 1.10 2002/12/09 04:41:17 manson Exp $
-
-MY_PN="XDirectFB"
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-MY_V=X4299
-S=${WORKDIR}/xc
-X=${WORKDIR}/${MY_P}
-DESCRIPTION="XDirectFB is a rootless XServer on top of DirectFB"
-
-SRC_URI="http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-1.tar.bz2
-	http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-2.tar.bz2
-	http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-3.tar.bz2
-	http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-4.tar.bz2
-	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz
-	 http://www.directfb.org/download/${MY_PN}/${MY_P}.tar.gz"
-
-HOMEPAGE="http://www.directfb.org"
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="~x86 ~sparc "
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.3-r2
-	sys-devel/flex
-	sys-devel/perl
-	dev-libs/DirectFB"
-	
-src_unpack () {
-	unpack ${A}
-
-	cd ${X}
-	cp xc-directfb.diff ${S} 
-	cp -a programs/Xserver/hw/directfb ${S}/programs/Xserver/hw
-	cp ${X}/config/cf/directfb.cf ${S}/config/cf
-	cp ${FILESDIR}/host.def ${S}/config/cf/
-	
-	cd ${S}
-	patch -p0 < xc-directfb.diff || die
-# Add any optimazations seems to break the build for some reason.
-#	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> config/cf/host.def
-#	echo "#define GccWarningOptions -Wno" >> config/cf/host.def
-#	echo "#define DefaultCCOptions -ansi" >> config/cf/host.def
-}
-
-src_compile() {
-	emake World || die
-}
-
-src_install() {
-#	make install DESTDIR=${D}
-
-	exeinto /usr/X11R6/bin
-	doexe ${S}/programs/Xserver/XDirectFB 
-	doexe ${FILESDIR}/startxdfb 
-
-	mv ${S}/programs/Xserver/hw/directfb/XDirectFB._man ./XDirectFB.1x
-	insinto /usr/X11R6/man/man1
-	doins ${S}/XDirectFB.1x
-	dodir /etc/skel
-	dodir /etc/X11/xinit
-	cp ${FILESDIR}/.dfbserverrc ${D}/etc/skel
-	cp ${FILESDIR}/dfbserverrc ${D}/etc/X11/xinit
-	
-	dohtml ${S}/programs/Xserver/hw/directfb/XDirectFB.1x.html
-	
-	cd ${X}
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-}
-
-pkg_postinst() {
-	chmod 4711 /usr/X11R6/bin/XDirectFB
-	chmod 755 /usr/X11R6/bin/startxdfb
-
-	einfo "To start XDirectFB use the startxdfb utility."
-}
diff --git a/x11-base/xdirectfb/xdirectfb-1.0_rc2-r2.ebuild b/x11-base/xdirectfb/xdirectfb-1.0_rc2-r2.ebuild
deleted file mode 100644
index e5973d3607d5..000000000000
--- a/x11-base/xdirectfb/xdirectfb-1.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc2-r2.ebuild,v 1.5 2002/12/09 04:41:17 manson Exp $
-
-MY_PN="XDirectFB"
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-MY_V=X4299.20020827
-S=${WORKDIR}/xc
-X=${WORKDIR}/${MY_P}
-DESCRIPTION="XDirectFB is a rootless XServer on top of DirectFB"
-
-SRC_URI="http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-1.tar.bz2
-	http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-2.tar.bz2
-	http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-3.tar.bz2
-	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz
-	 http://www.directfb.org/download/${MY_PN}/${MY_P}.tar.gz"
-
-HOMEPAGE="http://www.directfb.org"
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="~x86 ~sparc "
-
-PROVIDE="virtual/x11"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.3-r2
-	sys-devel/flex
-	sys-devel/perl
-	dev-libs/DirectFB"
-	
-src_unpack () {
-	unpack ${A}
-
-	cd ${X}
-	cp xc-directfb.diff ${S} 
-	cp -a programs/Xserver/hw/directfb ${S}/programs/Xserver/hw
-	cp ${X}/config/cf/directfb.cf ${S}/config/cf
-	cp ${FILESDIR}/host.def ${S}/config/cf/
-	
-	cd ${S}
-	patch -p0 < xc-directfb.diff || die
-}
-
-src_compile() {
-	emake World || die
-}
-
-src_install() {
-#	make install DESTDIR=${D}
-
-	exeinto /usr/X11R6/bin
-	doexe ${S}/programs/Xserver/XDirectFB 
-	doexe ${FILESDIR}/startxdfb 
-
-	mv ${S}/programs/Xserver/hw/directfb/XDirectFB._man ./XDirectFB.1x
-	insinto /usr/X11R6/man/man1
-	doins ${S}/XDirectFB.1x
-	dodir /etc/skel
-	dodir /etc/X11/xinit
-	cp ${FILESDIR}/.dfbserverrc ${D}/etc/skel
-	cp ${FILESDIR}/dfbserverrc ${D}/etc/X11/xinit
-	
-	dohtml ${S}/programs/Xserver/hw/directfb/XDirectFB.1x.html
-	
-	cd ${X}
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-}
-
-pkg_postinst() {
-	chmod 4711 /usr/X11R6/bin/XDirectFB
-	chmod 755 /usr/X11R6/bin/startxdfb
-
-	einfo "To start XDirectFB use the startxdfb utility."
-}
diff --git a/x11-base/xdirectfb/xdirectfb-1.0_rc3.ebuild b/x11-base/xdirectfb/xdirectfb-1.0_rc3-r1.ebuild
index 484e78ac438f..fc2f3cb8ff47 100644
--- a/x11-base/xdirectfb/xdirectfb-1.0_rc3.ebuild
+++ b/x11-base/xdirectfb/xdirectfb-1.0_rc3-r1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc3.ebuild,v 1.3 2002/12/09 04:41:17 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc3-r1.ebuild,v 1.1 2003/02/02 22:08:15 seemant Exp $
+
+inherit eutils
 
 MY_PN="XDirectFB"
 MY_PV=${PV/_/-}
 MY_P=${MY_PN}-${MY_PV}
-MY_V=X4.2.99.3
+MY_V=X4.2.99.4
 S=${WORKDIR}/xc
 X=${WORKDIR}/${MY_P}
 
@@ -20,7 +22,7 @@ HOMEPAGE="http://www.directfb.org"
 
 SLOT="0"
 LICENSE="X11"
-KEYWORDS="~x86 ~sparc "
+KEYWORDS="~x86 ~sparc"
 
 PROVIDE="virtual/x11"
 
@@ -28,7 +30,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
 	sys-devel/flex
 	sys-devel/perl
-	dev-libs/DirectFB"
+	>=dev-libs/DirectFB-0.9.16"
 	
 src_unpack () {
 	unpack ${A}
@@ -40,7 +42,19 @@ src_unpack () {
 	cp ${FILESDIR}/host.def ${S}/config/cf/
 	
 	cd ${S}
-	patch -p0 < xc-directfb.diff || die
+	epatch ./xc-directfb.diff
+
+	cd ${S}/programs/Xserver/hw/directfb
+	cp directfbScreen.c rootlessDirectFB.c ${T}
+
+
+	# update changes in the newer DirectFB versions
+	sed "s:DSPF_RGB15:DSPF_ARGB1555:g" \
+		${T}/directfbScreen.c > directfbScreen.c
+
+	sed "s:DSPF_RGB15:DSPF_ARGB1555:g" \
+		${T}/rootlessDirectFB.c > rootlessDirectFB.c
+	
 }
 
 src_compile() {