system/nvidia-legacy390-driver: Updated for version 390.154.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 32 insertions, 34 deletions

diff --git a/system/nvidia-legacy390-driver/README b/system/nvidia-legacy390-driver/README
index bcbb279a9d4a8..6c11d937c56da 100644
--- a/system/nvidia-legacy390-driver/README
+++ b/system/nvidia-legacy390-driver/README
@@ -28,8 +28,8 @@ the nvidia-legacy390-driver package backs up the conflicting files and
 puts the nvidia-specific files into place by automatically running
 nvidia-switch --install in doinst.sh.
 
-NEW!  This package now includes a douninst.sh script, so it is no
-longer necessary to run nvidia-switch --remove before uninstalling or
+This package now includes a douninst.sh script, so it is no longer
+necessary to run nvidia-switch --remove before uninstalling or
 upgrading.  However, nvidia-switch is still included for use when
 xorg-server is upgraded.  Usage of nvidia-switch:
 
@@ -50,7 +50,3 @@ or older as it WILL corrupt the mesa and xorg installations.
 Please use the script from those repos instead.
 
 The Nvidia 390.xx series will be supported through December 2022.
-
-BIG FAT NOTE!  If you are installing this on -current, please note
-that while the Nvidia legacy390 kernel module has been updated for
-the 5.17 kernel, it WILL NOT BUILD on 5.18.
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index 1b4c1aee21d50..f6568a0a11986 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-legacy390-driver
-VERSION=${VERSION:-390.151}
+VERSION=${VERSION:-390.154}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -270,12 +270,14 @@ fi
 # These add or correct wrong paths
 sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
+# Remove depcrecated entry in nvidia-settings.desktop
+sed -i '/Encoding/d' $PKG/usr/share/applications/nvidia-settings.desktop
 
 # rename wrong/conficting files as needed; remove conflicting symlinks created by installer
 cd $PKG/usr/lib$LIBDIRSUFFIX
   rm libGL.la
-  rm libOpenCL.so.1.0.0
+  rm libOpenCL.so*
   rm -f xorg/modules/libwfb.so
   if [ -e xorg/modules/extensions/libglx.so ]; then
     rm -f xorg/modules/extionsions/libglx.so
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
index 2b8f6b08e8e55..6f512b21d1193 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-legacy390-driver"
-VERSION="390.151"
+VERSION="390.154"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.151/NVIDIA-Linux-x86-390.151.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.151.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.151.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.151.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.151.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.151.tar.bz2"
-MD5SUM="fe68121d6846dc23ceec22ff005cc478 \
-        0833ec7486f18361614b17cdcf5f5889 \
-        e933ec2d5023c3762ef780b4fbf1bfd3 \
-        ecf7af88fb5ba73f82adc0aae10de252 \
-        aa7929c353442027a2aa9934c7c6293d \
-        c1f634f367b56471a2c82b5c7f1c4cad"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.151/NVIDIA-Linux-x86_64-390.151.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.151.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.151.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.151.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.151.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.151.tar.bz2"
-MD5SUM_x86_64="4f545ea0f8da13b387f3c16d0a57b446 \
-               0833ec7486f18361614b17cdcf5f5889 \
-               e933ec2d5023c3762ef780b4fbf1bfd3 \
-               ecf7af88fb5ba73f82adc0aae10de252 \
-               aa7929c353442027a2aa9934c7c6293d \
-               c1f634f367b56471a2c82b5c7f1c4cad"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.154/NVIDIA-Linux-x86-390.154.run \
+          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.154.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.154.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.154.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.154.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.154.tar.bz2"
+MD5SUM="6166b031a618a7a2ef824abdae075610 \
+        d1127cbac9a3068c971aa21845364c0a \
+        47a7952d6f5e910486f62ab2871122bb \
+        e34bc3b52a555cfe3b21f7c877bdfa1f \
+        990d888f52a315829b00b21b44f93f4f \
+        c4e4084653432112b279ae36c413f293"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.154.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.154.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.154.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.154.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.154.tar.bz2"
+MD5SUM_x86_64="1050874ea7f8f20f5b8dbd89bdb64229 \
+               d1127cbac9a3068c971aa21845364c0a \
+               47a7952d6f5e910486f62ab2871122bb \
+               e34bc3b52a555cfe3b21f7c877bdfa1f \
+               990d888f52a315829b00b21b44f93f4f \
+               c4e4084653432112b279ae36c413f293"
 REQUIRES="nvidia-legacy390-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"