X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=packages%2Fhackbard%2Fxdirectfb%2Fxdirectfb;h=270a5a0f6e23dff87a3f5942a249c1214a636559;hb=cb9510dd5388d6ba1ce2f42e239d8e83d805fc5f;hp=9a5b71de0e491ca23176a91eb74279117d32d044;hpb=6ae193981fcc05dcc495b4bde92cb8fd290ee4dd;p=hdw-linux%2Fhdw-linux.git

diff --git a/packages/hackbard/xdirectfb/xdirectfb b/packages/hackbard/xdirectfb/xdirectfb
index 9a5b71d..270a5a0 100644
--- a/packages/hackbard/xdirectfb/xdirectfb
+++ b/packages/hackbard/xdirectfb/xdirectfb
@@ -5,25 +5,65 @@
 # [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 &&
-	patch -Nfp1 < ../${srcdir}/xc-transparency-extension.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 \
-		programs/Xserver/hw/ &&
-	cp -a ../${srcdir}/config/cf/* config/cf/ &&
+		programs/Xserver/hw/
+	#cp -a ../${srcdir}/programs/Xserver/GL/directfb \
+	#	programs/Xserver/GL/
+	#cp -a ../${srcdir}/lib/GL/directfb lib/GL/
+	cp -a ../${srcdir}/config/cf/* config/cf/
+
+	echo "patching host.def - prefix /opt/xdirectfb ..."
+	sed "s%/usr/local/X11R6%$root/opt/xdirectfb%g" config/cf/host.def > t~
+	mv t~ config/cf/host.def
+
+	echo "building rootless xserver now ..."
+	make World && make && make install
+
+	cd ../$srcdir
+
+		}
 
-	echo "not patching host.def - we build this in $prefix/local ..."
-	make World && make install
+post_install()	{
+	docdir="$root/opt/xdirectfb/doc"
+	mkdir -p $docdir
+	cp -v README $docdir
+	cp -v $confdir/xdfbserverrc.example $docdir
+	cp -v $confdir/startdfbx $root/opt/xdirectfb/bin
+	chmod 755 $root/opt/xdirectfb/bin/startdfbx
 		}