Changeset 3620

Timestamp:

03/09/09 11:33:55 (12 months ago)

Author:

kris

Message:

Updated nvidia drivers, to 180.37, 173.17 and 96.43.11, also fixes bugs with libwfb being incorrectly replaced when we load a nvidia package

Location:

pcbsd/trunk/system-overlay/PCBSD

Files:

• packages/nvidia-173.14.12.tbz (deleted)
• packages/nvidia-180.35.tbz (deleted)
• packages/nvidia-96.43.07.tbz (deleted)
• packages/nvidia-driver-173.14.17.tbz (added)
• packages/nvidia-driver-180.37.tbz (added)
• packages/nvidia-driver-96.43.11.tbz (added)
• packages/nvidia-settings-180.17.tbz (deleted)
• packages/nvidia-settings-180.37.tbz (added)
• xorg-gui/bin/rundetect.sh (modified) (1 diff)
• xorg-gui/settings/alias.txt (modified) (1 diff)
• xorg-gui/settings/drivers.txt (modified) (1 diff)
• xorg-gui/templates/scripts/ati-3d-enable.sh (modified) (1 diff)
• xorg-gui/templates/scripts/intel-3d-enable.sh (modified) (1 diff)
• xorg-gui/templates/scripts/nvidia.sh (modified) (1 diff)

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

@@ -13 +13 @@
 
 # Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
 export PATH
 

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

@@ -20 +20 @@
 nsc:nsc
 nv:nv
-nvidia-173.14.12:nvidia
-nvidia-96.43.07:nvidia
-nvidia-180.35:nvidia
+nvidia-173.14.17:nvidia
+nvidia-96.43.11:nvidia
+nvidia-180.37:nvidia
 r128:r128
 radeonhd:radeonhd

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

@@ -20 +20 @@
 nsc
 nv
-nvidia-173.14.12
-nvidia-96.43.07
-nvidia-180.35
+nvidia-173.14.17
+nvidia-96.43.11
+nvidia-180.37
 r128
 radeonhd

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/ati-3d-enable.sh

@@ -1 +1 @@
 #!/bin/sh
-# Since we are using the i810 driver allow the beryl autostart
 
-touch /PCBSD/conf/beryl-enable
-

pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/intel-3d-enable.sh

@@ -1 +1 @@
 #!/bin/sh
-# Since we are using the i810 driver allow the beryl autostart
 
-touch /PCBSD/conf/beryl-enable
-

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

@@ -21 +21 @@
 
 # Add the nvidia driver to the system
-pkg_add -f /PCBSD/packages/${DRIVERVER}*.tbz
+PKGNAME="`echo ${DRIVERVER} | sed -e 's|nvidia-|nvidia-driver-|'`"
+pkg_add -f /PCBSD/packages/${PKGNAME}*.tbz
 pkg_add -f /PCBSD/packages/nvidia-settings*.tbz