[PC-BSD Commits] r2219 - in pcbsd/trunk/system-overlay/PCBSD/xorg-gui: bin settings templates/header templates/scripts

svn at pcbsd.org svn at pcbsd.org
Tue Jul 1 09:20:25 PDT 2008


Author: kris
Date: 2008-07-01 09:20:16 -0700 (Tue, 01 Jul 2008)
New Revision: 2219

Added:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia.sh
Removed:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-169.12.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-71.86.04.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-96.43.05.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-169.12.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-71.86.04.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-96.43.05.sh
Modified:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic
Log:

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



Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2008-07-01 16:20:16 UTC (rev 2219)
@@ -18,9 +18,9 @@
 fi
 
 # 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 
 fi
@@ -124,8 +124,8 @@
 
 
 # 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

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt	2008-07-01 16:20:16 UTC (rev 2219)
@@ -19,7 +19,7 @@
 nv:nv
 nvidia-71.86.04:nvidia
 nvidia-96.43.05:nvidia
-nvidia-169.12:nvidia
+nvidia-173.14.09:nvidia
 rendition:rendition
 s3:s3
 s3virge:s3virge

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt	2008-07-01 16:20:16 UTC (rev 2219)
@@ -19,7 +19,7 @@
 nv
 nvidia-71.86.04
 nvidia-96.43.05
-nvidia-169.12
+nvidia-173.14.09
 rendition
 s3
 s3virge

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf	2008-07-01 16:20:16 UTC (rev 2219)
@@ -40,7 +40,7 @@
     Driver         "keyboard"
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf	2008-07-01 16:20:16 UTC (rev 2219)
@@ -40,7 +40,7 @@
     Driver         "keyboard"
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf	2008-07-01 16:20:16 UTC (rev 2219)
@@ -41,7 +41,7 @@
     Driver         "keyboard"
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2008-07-01 16:20:16 UTC (rev 2219)
@@ -38,7 +38,7 @@
     Driver         "keyboard"
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf	2008-07-01 16:20:16 UTC (rev 2219)
@@ -41,7 +41,7 @@
     Driver         "keyboard"
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-169.12.xorg.conf

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-71.86.04.xorg.conf

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-96.43.05.xorg.conf

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2008-06-30 22:03:36 UTC (rev 2218)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2008-07-01 16:20:16 UTC (rev 2219)
@@ -38,7 +38,7 @@
     Driver         "keyboard"
     Option         "XkbModel" "pc105"
     Option         "XkbLayout" "us"
-    Option         "XkbVariant" "intl"
+    Option         "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-169.12.sh

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-71.86.04.sh

Deleted: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-96.43.05.sh

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia.sh


Property changes on: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia.sh
___________________________________________________________________
Name: svn:executable
   + *



More information about the Commits mailing list