Changeset 2219

Timestamp:

07/01/08 09:20:16 (5 months ago)

Author:

kris

Message:

Updated the xorg-gui to sue the latest nvidia driver 73.14.09, and simplified
the process a bit

Location:

pcbsd/trunk/system-overlay/PCBSD/xorg-gui

Files:

• bin/setupconf.sh (modified) (2 diffs)
• settings/alias.txt (modified) (1 diff)
• settings/drivers.txt (modified) (1 diff)
• templates/header/ati-3d-enable.xorg.conf (modified) (1 diff)
• templates/header/ati.xorg.conf (modified) (1 diff)
• templates/header/intel-3d-enable.xorg.conf (modified) (1 diff)
• templates/header/intel.xorg.conf (modified) (1 diff)
• templates/header/mga-3d-enable.xorg.conf (modified) (1 diff)
• templates/header/nvidia-169.12.xorg.conf (deleted)
• templates/header/nvidia-71.86.04.xorg.conf (deleted)
• templates/header/nvidia-96.43.05.xorg.conf (deleted)
• templates/header/nvidia.xorg.conf (added)
• templates/header/xorg.conf.generic (modified) (1 diff)
• templates/scripts/nvidia-169.12.sh (deleted)
• templates/scripts/nvidia-71.86.04.sh (deleted)
• templates/scripts/nvidia-96.43.05.sh (deleted)
• templates/scripts/nvidia.sh (added)

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh

@@ -19 +19 @@
 
 # Check if the driver has a special header to use in place of the generic one
-if [ -e "/PCBSD/xorg-gui/templates/header/${SELDRIVER}.xorg.conf" ]
+if [ -e "/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" ]
 then
-  cp "/PCBSD/xorg-gui/templates/header/${SELDRIVER}.xorg.conf" $TMPFILE 
+  cp "/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" $TMPFILE 
 else
   cp /PCBSD/xorg-gui/templates/header/xorg.conf.generic $TMPFILE 
@@ -125 +125 @@
 
 # See if this driver needs any post-setup operations to run
-if [ -e "/PCBSD/xorg-gui/templates/scripts/${SELDRIVER}.sh" ]
+if [ -e "/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" ]
 then
   # We found the file, so run it
-  sh "/PCBSD/xorg-gui/templates/scripts/${SELDRIVER}.sh"
+  sh "/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" "${SELDRIVER}"
 fi

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt

@@ -20 +20 @@
 nvidia-71.86.04:nvidia
 nvidia-96.43.05:nvidia
-nvidia-169.12:nvidia
+nvidia-173.14.09:nvidia
 rendition:rendition
 s3:s3

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt

@@ -20 +20 @@
 nvidia-71.86.04
 nvidia-96.43.05
-nvidia-169.12
+nvidia-173.14.09
 rendition
 s3

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf

@@ -41 +41 @@
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf

@@ -41 +41 @@
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf

@@ -42 +42 @@
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf

@@ -39 +39 @@
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf

@@ -42 +42 @@
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic

@@ -39 +39 @@
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection