From: hackbard <hackbard>
Date: Thu, 11 Aug 2005 13:13:29 +0000 (+0000)
Subject: xdirectfb fixes
X-Git-Url: https://hackdaworld.org/gitweb/?a=commitdiff_plain;h=bb663ddd799880b7cf02d41efdc7168ec457028b;p=hdw-linux%2Fhdw-linux.git

xdirectfb fixes
---

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f8b0cd5..eee898f 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,6 +1,7 @@
-*) 2005-08-07
+*) 2005-08-11
 
 - several package updates (stage 4)
+- xdirectfb changes (adapted from malis notebook)
 
 *) 2005-08-07
 
diff --git a/packages/hackbard/xdirectfb/xdirectfb b/packages/hackbard/xdirectfb/xdirectfb
index 2750464..50a6edd 100644
--- a/packages/hackbard/xdirectfb/xdirectfb
+++ b/packages/hackbard/xdirectfb/xdirectfb
@@ -5,18 +5,40 @@
 # [V] cvs
 # [S] 3-5
 # [D] XDirectFB.tar.bz2 cvs:anonymous:directfb.org:cvs/directfb:XDirectFB
-# [D] xc.tar.bz2 sshcvs:anoncvs:anoncvs.xfree86.org:cvs:xc
+## [D] xc.tar.bz2 sshcvs:anoncvs:anoncvs.xfree86.org:cvs:xc
+# [D] X11R6.8.2-src1.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/
+# [D] X11R6.8.2-src2.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/
+# [D] X11R6.8.2-src3.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/
+# [D] X11R6.8.2-src4.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/
+# [D] X11R6.8.2-src5.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/
+# [D] X11R6.8.2-src6.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/
+# [D] X11R6.8.2-src7.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/
 
+xver="6.8.2"; xtype="xorg"
 srcdir="XDirectFB-$ver"
 [ "$ver" = "cvs" ] && srcdir="XDirectFB"
 
 build_main()	{
-	echo "extracting xfree86 xc source ..."
-	tar --use-compress-program=bzip2 -xf $archdir/xc.tar.bz2 -C ../
+
+        if [ "$xtype" = "xorg" ] ; then
+		for i in 1 2 3 4 5 6 7; do
+			echo "extracting $xtype $xver package $i ..."
+			tar --use-compress-program=gzip -C ../ \
+				-xf $archdir/X11R${xver}-src${i}.tar.gz
+		done
+	else 
+		echo "extracting xfree86 xc source ..."
+		tar --use-compress-program=bzip2 -xf $archdir/xc.tar.bz2 -C ../
+	fi
 
 	echo "applying xdirectfb patch ..."
 	cd ../xc &&
-	patch -Nfp0 < ../${srcdir}/xc-directfb.diff &&
+
+	if [ "$xtype" = "xorg" ] ; then
+		patch -Nfp0 < ../${srcdir}/xc-directfb-xorg.diff
+	else
+		patch -Nfp0 < ../${srcdir}/xc-directfb.diff
+	fi
 
 	echo "copying over files ..."
 	cp -a ../${srcdir}/programs/Xserver/hw/directfb \
@@ -31,5 +53,5 @@ build_main()	{
 	mv t~ config/cf/host.def
 
 	echo "building rootless xserver now ..."
-	make World && make install
+	make World && make && make install
 		}