diff options
3 files changed, 23 insertions, 29 deletions
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild index 46e2d48bf6..1c54c67605 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild @@ -37,10 +37,12 @@ # 1.7 21-OCT-2011 version bump # 1.8 24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W. # 1.9 02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only -# 3.0 06-JUL-2013 Legacy 304 branch +# 3.0 06-JUL-2013 Legacy 304 branch, removed 32-bit compatibility +# 3.1 22-SEP-2013 version update +# 3.1a 04-NOV-2013 minor fixes for 14.1 release PRGNAM=nvidia-legacy304-driver -VERSION=304.88 +VERSION=304.108 MVERS=304 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -111,7 +113,7 @@ install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/ install -m 444 libXvMCNVIDIA.a $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libXvMCNVIDIA.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ -install -m 755 libnvidia-opencl.so.304.88 $PKG/usr/lib$LIBDIRSUFFIX/ +install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/ install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info index 23427e0618..dbf4c70cd5 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info @@ -1,22 +1,16 @@ PRGNAM="nvidia-legacy304-driver" -VERSION="304.88" +VERSION="304.108" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.88/NVIDIA-Linux-x86-304.88.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.88.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.88.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.88.tar.bz2" -MD5SUM="4f60d4aef766029c98914ed665235029a \ - 05b669981433cad26eab002cad2851cb \ - c13f9dc2ff86a532608d1bb3e92d0323 \ - f9f29159408b08d5d166a08233690a2e" -DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.88/NVIDIA-Linux-x86_64-304.88-no-compat32.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.88.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.88.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.88.tar.bz2" -MD5SUM_x86_64="35e0c7d30de795cccb6b95bda991fb77 \ - 05b669981433cad26eab002cad2851cb \ - c13f9dc2ff86a532608d1bb3e92d0323 \ - f9f29159408b08d5d166a08233690a2e" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.108/NVIDIA-Linux-x86-304.108.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.108.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.108.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.108.tar.bz2" +MD5SUM="ef453e32515c2176c67ebd95c770dc0e \ + 32383742e807f3b142eb1c75c0155fe3 \ + 479225668f016e0b03be3c085ebbe89b \ + 18846fbff53aef67beb875e41aa0b979" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.108/NVIDIA-Linux-x86_64-304.108-no-compat32.run" +MD5SUM_x86_64="4e0e54de6735023f44c858a3006b3e18" REQUIRES="libvdpau nvidia-legacy304-kernel" MAINTAINER="Edward Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/system/nvidia-legacy304-driver/nvidia-switch b/system/nvidia-legacy304-driver/nvidia-switch index ef8e8e5fc9..66a9901163 100644 --- a/system/nvidia-legacy304-driver/nvidia-switch +++ b/system/nvidia-legacy304-driver/nvidia-switch @@ -35,23 +35,21 @@ LIB="${ROOT}usr/lib${LIBSUFFIX}" 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(){ cd "$LIB" if [ "$1" = "nvidia" ]; then - if [ ! -e libGL.so.$GL_VERSION-xorg ]; then - mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg - fi + mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg ln -sf libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION ln -sf libGL.so.$NV_VERSION libGL.so.1 ln -sf libGL.so.1 libGL.so 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.1 libGL.so - rm -f libGL.so.$NV_VERSION + mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION + rm -f libGL.so.$NV_VERSION + ln -sf libGL.so.$GL_VERSION libGL.so.1 + ln -sf libGL.so.$GL_VERSION libGL.so fi cd "$CWD" } @@ -125,7 +123,7 @@ nvidia_remove(){ rm -f $NV_CONF fi - LD_NVIDIA="${LIB}/libGL.so.1.2" + LD_NVIDIA="${LIB}/libGL.so.$GL_VERSION" nvidia_ldconfig $LD_NVIDIA } |