diff options
-rw-r--r-- | system/nvidia-driver/nvidia-driver.SlackBuild | 6 | ||||
-rw-r--r-- | system/nvidia-driver/nvidia-driver.info | 49 | ||||
-rw-r--r-- | system/nvidia-driver/nvidia-switch | 14 |
3 files changed, 34 insertions, 35 deletions
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 6232c28480f45..edc471e98cb20 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -40,10 +40,10 @@ # 2.2 22-NOV-2012 new version -Long Lived Branch. Updates: libs, apps # 2.3 15-FEB-2013 new version -Long Lived Branch. # 2.4 19-MAY-2013 new version -Long Lived Branch. -# 2.5 06-JUL-2013 new version -Long Lived Branch. +# 2.6 20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove PRGNAM=nvidia-driver -VERSION=319.32 +VERSION=319.60 MVERS=319 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -121,6 +121,7 @@ install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-encode.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ +install -m 755 libnvidia-ifr.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/ @@ -146,6 +147,7 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-encode.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/ + install -m 755 32/libnvidia-ifr.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/ install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/ install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/ diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index d4de16ad7e080..e393d4e31b06a 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,30 +1,31 @@ PRGNAM="nvidia-driver" -VERSION="319.32" +VERSION="319.60" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/319.32/NVIDIA-Linux-x86-319.32.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-319.32.tar.bz2" -MD5SUM="978339ff37c3207f3a39d3952721dcdb \ +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/319.60/NVIDIA-Linux-x86-319.60.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-319.60.tar.bz2" +MD5SUM="893958183acc35feb0740747c7da306b \ + 1c50d854267ebecd6633c8f15a5e13bb \ + bfa6c140a8c034bcd7bbc512c27412b4 \ + b0c652cb6c56a149ee72956874b4e578 \ + e84788f85a000bfe7ecfec739e7b6457 \ + 60298a026d970d8e0920f8c55e5589a6" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/319.60/NVIDIA-Linux-x86_64-319.60.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-319.60.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-319.60.tar.bz2" +MD5SUM_x86_64="e31404d2e5aa0fa90b5b138ed9c666a3 \ 0c912f69ee42fd398970676a5d5b1b4c \ - fec790ab79825d78a20ef3fc8c9ac9ed \ - ac2bd2f0820adc29b2c70d6748aaf95a \ - e79e4cae77ceaa8da8dbcaf6b3c9eb39 \ - ac5041ab0337c5ee509cc159cab55d5b" -DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/319.32/NVIDIA-Linux-x86_64-319.32.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-319.32.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-319.32.tar.bz2" -MD5SUM_x86_64="608767a3e1bee8a030f31cdc9251182e \ - 0c912f69ee42fd398970676a5d5b1b4c \ - fec790ab79825d78a20ef3fc8c9ac9ed \ - ac2bd2f0820adc29b2c70d6748aaf95a \ - e79e4cae77ceaa8da8dbcaf6b3c9eb39 \ - ac5041ab0337c5ee509cc159cab55d5b" + 1c50d854267ebecd6633c8f15a5e13bb \ + bfa6c140a8c034bcd7bbc512c27412b4 \ + b0c652cb6c56a149ee72956874b4e578 \ + e84788f85a000bfe7ecfec739e7b6457 \ + 60298a026d970d8e0920f8c55e5589a6" REQUIRES="libvdpau nvidia-kernel" MAINTAINER="Edward Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch index 8369e993f0104..1dc6e5f5ee974 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -40,7 +40,7 @@ LIB32="${ROOT}usr/lib" XMOD="${LIB}/xorg/modules" XLIB="$XMOD/extensions" NV_VERSION='PKGVERSION' # This will be replaced in the build script -GL_VERSION="1.2" +GL_VERSION="1.2.0" NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf" save_GL(){ @@ -64,20 +64,16 @@ save_GL(){ fi elif [ "$1" = "xorg" ]; then mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION - ln -sf libGL.so.$GL_VERSION libGL.so.1 + ln -sf libGL.so.$GL_VERSION libGL.so.1 ln -sf libGL.so.1 libGL.so rm -f libGL.so.$NV_VERSION # Check for multilib and reverse any "damage" if [ "$COMPAT32" = "yes" ]; then cd $LIB32 - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGL.so.$NV_VERSION - if [ -f libGL.so.$GL_VERSION-xorg ]; then - mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION - fi - ln -sf libGL.so.$GL_VERSION libGL.so.1 + mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION + ln -sf libGL.so.$GL_VERSION libGL.so.1 ln -sf libGL.so.1 libGL.so + rm -f libGL.so.$NV_VERSION fi fi cd "$CWD" |