[Lunar-commits] CVS: moonbase/x11/XOrg drivers, NONE, 1.1 CONFIGURE, 1.10, 1.11

[Auke Kok]

Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/x11/XOrg

Modified Files:
	CONFIGURE 
Added Files:
	drivers 
Log Message:
Modified the driver list to list proper card names. The list is short and not complete yet.


--- NEW FILE: drivers ---
vga:Generic VGA
vesa:Generic VESA
fbdev:Generic FrameBuffer
nv:NVidia
ati:Ati
i810:Intel IGP
mga:Matrox
i128:driver
sis:Silicon Systems
glint:driver
tga:Targa
s3virge:S3
rendition:driver
neomagic:driver
i740:driver
tdfx:Trident FX
savage:ProSavage
cirrus:Cirrus
vmware:VMWare virtual device
tseng:TSeng
trident:Trident
chips:Chips & technologies
apm:driver
GlideDriver:driver
ark:driver
cyrix:driver
v4l:Video for linux devices
siliconmotion:driver
AgpGartDrivers:driver
DevelDrivers:driver
XF86OSCardDrivers:driver

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/CONFIGURE,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CONFIGURE	23 Nov 2004 16:34:38 -0000	1.10
+++ CONFIGURE	24 Nov 2004 13:04:28 -0000	1.11
@@ -1,7 +1,7 @@
 # only lin -r will trigger the driver chooser
 
 if [ -n "$RECONFIGURE" ] || query "Select specific video drivers to build?" n ; then        
-    ALL_XORG_DRIVERS="vga vesa v4l mga glint nv tga s3virge sis rendition neomagic i740 tdfx savage cirrus vmware tseng trident chips apm GlideDriver fbdev i128 ati i810 ark cyrix siliconmotion AgpGartDrivers DevelDrivers XF86OSCardDrivers"
+    ALL_XORG_DRIVERS=$(cat $SCRIPT_DIRECTORY/drivers | cut -d: -f1)
     XORG_DRIVERS=$(get_module_config XORG_DRIVERS)
     if [ -z "$XORG_DRIVERS" ]; then
         XORG_DRIVERS="$ALL_XORG_DRIVERS"
@@ -10,18 +10,21 @@
     # if it's empty we just enable all
     list_xorg_drivers()
     {
+      (
+        unset IFS
         for DRIVER in $ALL_XORG_DRIVERS; do
             echo $DRIVER
-            echo "driver"	
+            echo $(grep ^$DRIVER: $SCRIPT_DIRECTORY/drivers | cut -d: -f2-)
             if echo $XORG_DRIVERS | grep -qw $DRIVER; then
                 echo on
             else
                 echo off
             fi
         done
+      )
     }
 
-    XORG_DRIVERS=`dialog --backtitle "XOrg video driver selection" --stdout --separate-output --checklist "Key:  [X] = on, [ ] = off" 0 0 0 $(list_xorg_drivers)`
+    IFS="$TAB_ENTER_IFS" XORG_DRIVERS=`dialog --backtitle "XOrg video driver selection" --stdout --separate-output --checklist "Key:  [X] = on, [ ] = off" 0 0 0 $(list_xorg_drivers)`
     # hack to strip newlines
     set_module_config XORG_DRIVERS "$(echo $XORG_DRIVERS)"
 fi