diff options
-rw-r--r-- | system/nvidia-driver/README | 5 | ||||
-rw-r--r-- | system/nvidia-driver/nvidia-driver.SlackBuild | 40 | ||||
-rw-r--r-- | system/nvidia-driver/nvidia-driver.info | 36 |
3 files changed, 41 insertions, 40 deletions
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README index 8521adb0e7..562b415727 100644 --- a/system/nvidia-driver/README +++ b/system/nvidia-driver/README @@ -4,10 +4,7 @@ part of the nvidia-kernel package at SlackBuilds.org. Installing the 32-bit compatibility libraries is available, so pass -SRCSUFFIX="" ./nvidia-driver.SlackBuild - -You will need to download the NVIDIA-Linux-x86_64-xxx.yy.zz.run version -instead of NVIDIA-Linux-x86_64-xxx.yy.zz-no-compat32.run +COMPAT32="yes" ./nvidia-driver.SlackBuild Since this nvidia-driver conflicts with some files of xorg, it's a bit complex to install/uninstall the driver. However, installation of the diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 5fc3c92121..759dc2224d 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -29,9 +29,13 @@ # 1.0 20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com> # 1.1 10-APR-2011 updated to new version, testing 13.37rc4.6692 # 1.2 27-MAY-2011 new version, allow multilib option, minor edits +# 1.2.1 20-JUNE-2011 minor edits, thanks to Robby and Roberto +# 1.5 01-JUNLY-2011 new version, single driver download, add switch to select +# pure x86_64 or x86_64 with 32-bit compatibility. +# PRGNAM=nvidia-driver -VERSION=270.41.19 +VERSION=275.09.07 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,26 +55,23 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" TARGET="x86" - SRCSUFFIX="" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" TARGET="x86" - SRCSUFFIX="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" TARGET="x86_64" - SRCSUFFIX=${SCRSUFFIX:--no-compat32} -# Pass SRCSUFFIX="" if you d/l the pure full package with 32-bit compatibility. - LIBDIRSUFFIX="64" + LIBDIRSUFFIX="64" +# Set 32-bit compatibility flag default + COMPAT32=${COMPAT32:-no} else SLKCFLAGS="-O2" - SRCSUFFIX="" LIBDIRSUFFIX="" fi -SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}${SRCSUFFIX} +SRCNAM=NVIDIA-Linux-$TARGET-${VERSION} set -e @@ -96,23 +97,24 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \ install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/ install -m 755 libglx.so.$VERSION \ $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia -install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/ install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/ -install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ +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 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/vdpau/ install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ -install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/ -install -m 755 libOpenCL.so.1.0.0 $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/ +install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ +install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ - install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/ +install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/ # Optional 32-bit support; NOTE! nvidia-switch does not operate here. -if [ "$ARCH" = "x86_64" -a "${SRCSUFFIX}" != "-no-compat32" ]; then +if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then mkdir -p $PKG/usr/lib/{tls,vdpau} install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/ @@ -125,7 +127,7 @@ if [ "$ARCH" = "x86_64" -a "${SRCSUFFIX}" != "-no-compat32" ]; then install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/ fi -# # Next come the apps +# Next come the apps for i in nvidia-smi nvidia-bug-report.sh; do install -m 755 $i $PKG/usr/bin/ done @@ -143,6 +145,8 @@ cd $PKG/usr/lib$LIBDIRSUFFIX ln -sf libOpenCL.so.1.0.0 libOpenCL.so.1.0 ln -sf libOpenCL.so.1.0 libOpenCL.so.1 ln -sf libOpenCL.so.1 libOpenCL.so + ln -sf libnvcuvid.so.$VERSION libnvcuvid.so.1 + ln -sf libnvcuvidv.so.$VERSION libnvcuvid.so ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION cd - @@ -156,8 +160,10 @@ cd $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules cd - # symlinks for optional 32-bit support -if [ "${SRCSUFFIX}" != "-no-compat32" ]; then +if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then cd $PKG/usr/lib + ln -sf libGL.so.$VERSION libGL.so.1 + ln -sf libGL.so.1 libGL.so ln -sf libcuda.so.$VERSION libcuda.so.1 ln -sf libcuda.so.1 libcuda.so ln -sf libOpenCL.so.1.0.0 libOpenCL.so.1.0 @@ -214,7 +220,7 @@ cd - # Self written bash script which I (H.W.) use to switch between nvidia and nv. # It is now also used by doinst.sh to switch to the nvidia-driver right -# after installation. For pure 64-bit only (EWK). +# after installation. For 32-bit and pure 64-bit only (EWK). install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index 3d4a882ec4..422f4a4658 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,24 +1,22 @@ PRGNAM="nvidia-driver" -VERSION="270.41.19" +VERSION="275.09.07" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/270.41.19/NVIDIA-Linux-x86-270.41.19.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-270.41.19.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-270.41.19.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-270.41.19.tar.bz2" -MD5SUM="c167e32702f56599bd600add97943312 \ - 023a6cf43efa7a42073f1e69f70c089c \ - 521dcb2f1261c303a915e20ad528b44b \ - cad8553d213c698b11932197d40c59b4" -DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19-no-compat32.run \ - ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19.run - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-270.41.19.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-270.41.19.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-270.41.19.tar.bz2" -MD5SUM_x86_64="cb518bdd70f356425b8c4a5a48c0ad9c \ - b84143ecb5c0511c5ef9e53e732d9136 - 023a6cf43efa7a42073f1e69f70c089c \ - 521dcb2f1261c303a915e20ad528b44b \ - cad8553d213c698b11932197d40c59b4" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/275.09.07/NVIDIA-Linux-x86-275.09.07.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-275.09.07.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-275.09.07.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-275.09.07.tar.bz2" +MD5SUM="d779057af3a2f96a05ddda201606618b \ + bd2250e2a0015cf1b1a34d4b45e5743b \ + ebfe17b431ff121d53a41535f59aeb99 \ + 1f3277830932034f4e348d3040c13629" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/275.09.07/NVIDIA-Linux-x86_64-275.09.07.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-275.09.07.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-275.09.07.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-275.09.07.tar.bz2" +MD5SUM_x86_64="29f28cd59e2647cdb517eca2381d3dbd \ + bd2250e2a0015cf1b1a34d4b45e5743b \ + ebfe17b431ff121d53a41535f59aeb99 \ + 1f3277830932034f4e348d3040c13629" MAINTAINER="Edward Koenig" EMAIL="kingbeowulf@gmail.com" APPROVED="rworkman" |