diff options
| -rw-r--r-- | system/nvidia-driver/nvidia-driver.SlackBuild | 3 | ||||
| -rw-r--r-- | system/nvidia-driver/nvidia-driver.info | 34 | ||||
| -rw-r--r-- | system/nvidia-driver/nvidia-switch | 35 |
3 files changed, 49 insertions, 23 deletions
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 1db56923bb5ca..ebc913b722b82 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -34,9 +34,10 @@ # pure x86_64 or x86_64 with 32-bit compatibility. # 1.6 27-AUG-2011 version bump, minor edits # 1.7 21-OCT-2011 version bump +# 1.8 24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W. PRGNAM=nvidia-driver -VERSION=290.10 +VERSION=295.33 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index a94b98036ad52..ad2507a5749a6 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,22 +1,22 @@ PRGNAM="nvidia-driver" -VERSION="290.10" +VERSION="295.33" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/290.10/NVIDIA-Linux-x86-290.10.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-290.10.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-290.10.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-290.10.tar.bz2" -MD5SUM="50319a4b3818c12c9c7243525e0e6316 \ - ac5fb2293d5a3a8f9fd40a8fc4e9d907 \ - 34bfcb2944558d4fbe09f8a634fce4c1 \ - 1fcc534a733bce5614ccf2c575a7ff76" -DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/290.10/NVIDIA-Linux-x86_64-290.10.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-290.10.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-290.10.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-290.10.tar.bz2" -MD5SUM_x86_64="c07c8ebbf36eb20199b980fddc13737d \ - ac5fb2293d5a3a8f9fd40a8fc4e9d907 \ - 34bfcb2944558d4fbe09f8a634fce4c1 \ - 1fcc534a733bce5614ccf2c575a7ff76" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/295.33/NVIDIA-Linux-x86-295.33.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-295.33.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-295.33.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-295.33.tar.bz2" +MD5SUM="1634fb3115526caeae5eb8227282bf17 \ + c93582703033ea0946bc61de05e53fb0 \ + 5416e9ff2d198147ec786b0f0889d14c \ + c19449c1de82a0d78e774e96e31587bd" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/295.33/NVIDIA-Linux-x86_64-295.33.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-295.33.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-295.33.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-295.33.tar.bz2" +MD5SUM_x86_64="9e172ac5bd8f722d5f4931b5c687942e \ + c93582703033ea0946bc61de05e53fb0 \ + 5416e9ff2d198147ec786b0f0889d14c \ + c19449c1de82a0d78e774e96e31587bd" MAINTAINER="Edward Koenig" EMAIL="kingbeowulf@gmail.com" APPROVED="rworkman" diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch index e88534c40a355..6fb27c2bd1001 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -19,11 +19,16 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# nvidia-switch utility 0.9.1 +# +# New maintainer: version 1.x +# Edward Koenig, Vancouver, United States of America +# portions Copyright 2007-2011 Heinz Wiesinger (above) +# +# nvidia-switch utility 1.0.0 # # A tool to switch between nvidia-binary-driver and stock xorg-driver # if both are installed in parallel. +# set -e @@ -36,6 +41,7 @@ XMOD="${LIB}/xorg/modules" XLIB="$XMOD/extensions" NV_VERSION='PKGVERSION' # This will be replaced in the build script GL_VERSION="1.2" +NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf" remove_link(){ if [ -L "$1" ]; then @@ -222,6 +228,22 @@ nvidia_ldconfig(){ /sbin/ldconfig -l $1 } +# Make sure system wide 10-nvidia.conf gets swapped out. +xorg_conf(){ + if [ "$1" = "nvidia" -a ! -e $NV_CONF ]; then + cat <<- EOF > $NV_CONF + Section "Device" + Identifier "Device0" + Driver "nvidia" + VendorName "Nvidia Corporation" + BoardName "" + EndSection + EOF + else + rm -f $NV_CONF + fi +} + check(){ echo -n "checking $2...." if [ -e "$1/$2" ]; then @@ -357,7 +379,8 @@ nvidia(){ libgl_nvidia libs "nvidia" libglx_nvidia - + xorg_conf "nvidia" + LD_NVIDIA="${LIB}/libGL.so.$NV_VERSION-nvidia" nvidia_ldconfig $LD_NVIDIA } @@ -367,7 +390,8 @@ xorg(){ if [ "$1" = "cleanup" ]; then echo $'Cleaning up symlinks.\n' fi - echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf." + echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf" + echo "and in /etc/X11/xorg.conf.d." echo "Otherwise, this may lead to improperly working drivers." libs_basic @@ -378,7 +402,8 @@ xorg(){ else libglx_xorg "xorg" fi - + xorg_conf "xorg" + LD_NVIDIA="${LIB}/libGL.so.1.2" nvidia_ldconfig $LD_NVIDIA "xorg" } |