From 5afa0a6e85a0564a43eaa2113aa5600f318403bd Mon Sep 17 00:00:00 2001
From: Lenard Spencer
Date: Sat, 5 Sep 2020 08:19:11 +0700
Subject: system/nvidia-driver: Updated for version 450.66.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/nvidia-driver/nvidia-driver.SlackBuild | 28 ++++++---------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'system/nvidia-driver/nvidia-driver.SlackBuild')

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 4427a56ca9..2838b0fe39 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -27,7 +27,7 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-440.100}
+VERSION=${VERSION:-450.66}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,7 +77,7 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
   $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \
   $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
   $PKG/usr/include/GL $PKG/etc/vulkan/{icd.d,implicit_layer.d} $PKG/etc/X11/xorg.conf.d \
-  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64}
+  $PKG/etc/X11/glvnd/egl_vendor.d
 
 if [ "$COMPAT32" = "yes" ]; then
   mkdir -p $PKG/usr/lib/tls
@@ -171,33 +171,17 @@ if [ -z "$(ls -A /etc/vulkan)" ]; then
 fi
 
 if [ "$CURRENT" = "yes" ]; then
-# Don't ship .la files.  Also, libOpenCL.so is now included
-# in current (in ocl-icd), so we don't need this one.
-    rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+# libOpenCL.so is now included in current (in ocl-icd),
+# so we don't need this one.
     rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so.1.0.0
     if [ "${COMPAT32}" = "yes" ]; then
-        rm -f $PKG/usr/lib/*.la
         rm -f $PKG/usr/lib/libOpenCL.so.1.0.0
     fi
 else
-# Correct wrong paths in /usr/lib{,64}/libGL.la
-    sed -i "s|$PKG||" $PKG/usr/lib${LIBDIRSUFFIX}/libGL.la
-    if [ "${COMPAT32}" = "yes" ]; then
-# This one points to /usr/ instead of /usr/lib/, so we need to fix it anyway
-        sed -i "s|$PKG/usr|/usr/lib|" $PKG/usr/lib/libGL.la
-    fi
-# save libGL.la for 14.2
-    cd $PKG/usr/lib$LIBDIRSUFFIX
-    mv libGL.la libGL.la-nvidia
-    cd -
-    if [ "${COMPAT32}" = "yes" ]; then
-        cd $PKG/usr/lib
-	mv libGL.la libGL.la-nvidia
-        cd -
-    fi
 # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia
-# files so we don't stomp on the overlapping xorg files.
+# files so we don't stomp on any overlapping xorg files.
 # Note: switching can be problematic ;-)
+    mkdir -p  $PKG/var/log/nvidia/{32,64}
     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
-- 
cgit v1.2.3