[Lunar-commits] CVS: crater/x11/xorg-dri BUILD, 1.2, 1.3 CONFIGURE, 1.2, 1.3 DETAILS, 1.2, 1.3

[Nick Hudson]

Update of /var/cvs/lunar/crater/x11/xorg-dri
In directory dbguin.lunar-linux.org:/tmp/cvs-serv3707/xorg-dri

Modified Files:
	BUILD CONFIGURE DETAILS 
Log Message:

Updating the xorg-dri module, this was hacked on by Ranitha <ranitha at optusnet.com.au> and worked.  I will commit this to zbeta in a few days once I have had some time to do some minor testing.  Please if you have a dri based video card please test this.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xorg-dri/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	16 Apr 2004 04:40:56 -0000	1.2
+++ BUILD	24 Apr 2004 05:42:27 -0000	1.3
@@ -1,27 +1,37 @@
 (
-   cp $CONFIG_CACHE/host.def.dri config/cf/host.def &&
+   cp $CONFIG_CACHE/host.def.dri xc/xc/config/cf/host.def &&
    
+   # This must happen or it will cause the module to break
+   # claiming "Kernel only header included in userspace"
+   cp -rL /usr/src/linux/include/linux/{autoconf.h,config.h} /usr/include/linux &&
+
    echo "Compiling DRI Modules for XOrg" &&
    cd $SOURCE_DIRECTORY/xc/xc            &&
    make World                            &&
 
    echo "Installing new DRI Libs and Modules" &&
-   cp -r exports/lib/modules/dri/*.so /usr/X11R6/lib/modules/dri &&
-   cp -r exports/lib/modules/extensions/lib{glx,GLcore,dri}.a /usr/X11R6/lib/modules/extensions &&
-   cp -r exports/lib/modules/linux/libdrm.a /usr/X11R6/lib/modules/linux &&
+   cp -rL exports/lib/modules/dri/*.so /usr/X11R6/lib/modules/dri &&
+   cp -rL exports/lib/modules/extensions/lib{glx,GLcore,dri}.a /usr/X11R6/lib/modules/extensions &&
+   cp -rL exports/lib/modules/linux/libdrm.a /usr/X11R6/lib/modules/linux &&
 
-   cp -r exports/lib/modules/drivers/*_drv.o /usr/X11R6/lib/modules/drivers &&
+   cp -rL exports/lib/modules/drivers/*_drv.o /usr/X11R6/lib/modules/drivers &&
  
-   cp -r exports/lib/*{GL,Mesa}* /usr/X11R6/lib &&
+   cp -rL exports/lib/*{GL,Mesa}* /usr/X11R6/lib &&
+   cd /usr/X11R6/lib &&
+
+# ldconfig will bitch about how these are not symbolic links if they
+# arn't removed
+   rm libGL.so.1 libOSMesa.so.4 &&
+
    ldconfig &&
  
    echo "Building DRM"                   &&
    cd $SOURCE_DIRECTORY/drm/linux        &&
-   make -f Makefile.linux DRM_MODULES="$DriDrivers" 
-
-   #This needs to be fixed later, need to add support for what kernel 
-   #version, and where to install the kernel modules to in 
-   #/lib/modules/$KERNEL
+   make   				 &&
+   mkdir -p /lib/modules/`uname -r`/kernel/drivers/ &&
+   cd $SOURCE_DIRECTORY/drm/linux        &&
+   cp -L *.ko /lib/modules/`uname -r`/kernel/drivers/ &&
+   depmod -a
 
 ) > $C_FIFO 2>&1
    

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xorg-dri/CONFIGURE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CONFIGURE	16 Apr 2004 04:47:13 -0000	1.2
+++ CONFIGURE	24 Apr 2004 05:42:27 -0000	1.3
@@ -81,7 +81,7 @@
 
 generate_host_def()  {
   
-  echo  "#define XFree86CustomVersion "DRI trunk""
+  echo  "#define XFree86CustomVersion \"DRI trunk\""
   echo  "#define DefaultCCOptions      $CFLAGS"
   echo  "#define DefaultGcc2i386Opt    $CFLAGS"
   echo  "#define LibraryCDebugFlags    $CFLAGS"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xorg-dri/DETAILS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DETAILS	16 Apr 2004 04:38:35 -0000	1.2
+++ DETAILS	24 Apr 2004 05:42:27 -0000	1.3
@@ -9,7 +9,7 @@
   SOURCE3_URL[0]=cvs://:pserver:anonymous@dri.freedesktop.org:/cvs/mesa:Mesa
         WEB_SITE=http://dri.freedesktop.org
          ENTERED=20040416
-         UPDATED=20040416
+         UPDATED=20040423
            SHORT="Direct Rendering Infructure modules for the XOrg Xserver"
 cat << EOF
 Direct Rendering Infructure modules for the XOrg Xserver