system/nvidia-driver: Updated for version 515.48.07.

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

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

3 files changed, 14 insertions, 64 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index d6acc948e9..42cafa7625 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-510.73.05}
+VERSION=${VERSION:-515.48.07}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -113,9 +113,6 @@ find -L . \
 
 cd $TMP/nvidia-installer-$VERSION
 
-# Let's try to remove the conflicting files and GPU detection
-  patch -p0 < $CWD/skip_conflict-GPU_detect.patch
-
   chown -R root:root .
   find -L . \
    \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index c7d0cfe6da..5eda400203 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="510.73.05"
+VERSION="515.48.07"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/510.73.05/NVIDIA-Linux-x86_64-510.73.05.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-510.73.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-510.73.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-510.73.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-510.73.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-510.73.05.tar.bz2"
-MD5SUM_x86_64="2c381e423082da848b1f6ea1158c69d2 \
-               dab1db965d626947d98f2cef2ecb51b6 \
-               194614d9857eda1acdacc7457d3fb789 \
-               9775b5296276f0293b25a916fc3d063c \
-               de14a66b9cf8eb75d56f2fd89b381edb \
-               99703d94723e8fb4394fb45445f6c841"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/515.48.07/NVIDIA-Linux-x86_64-515.48.07.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.48.07.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.48.07.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.48.07.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.48.07.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.48.07.tar.bz2"
+MD5SUM_x86_64="d8529109092e1db0760becb9296abcfd \
+               07b9394513444c1b72b227de13774bff \
+               4d0b1d0c61e0730a1cba99ba87b86163 \
+               214e8d3a9d2592d4fea94618ba030942 \
+               33b2e4e2361c067e69a8c211aeff7d7c \
+               4a1a040dfbbc0fd2dfe37bf7f957e74f"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-driver/skip_conflict-GPU_detect.patch b/system/nvidia-driver/skip_conflict-GPU_detect.patch
deleted file mode 100644
index a64b671d60..0000000000
--- a/system/nvidia-driver/skip_conflict-GPU_detect.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -uaN command-list.c command-list.c.new
---- command-list.c          2020-01-29 17:56:11.000000000 -0800
-+++ command-list.c.new  2020-03-08 11:24:03.000000000 -0700
-@@ -890,6 +890,8 @@
-     // Allocate enough space for the whole file list, plus two extra files and
-     // a NULL at the end.
-     cfList = nvalloc((p->num_entries + 3) * sizeof(ConflictingFileInfo));
-+    /* let's just return an empty list!  */
-+    return cfList;
-
-     for (i = 0; i < p->num_entries; i++) {
-         PackageEntry *entry = &p->entries[i];
-
-diff -uaN misc.c misc.c.new
---- misc.c          2020-01-29 17:56:11.000000000 -0800
-+++ misc.c.new  2020-03-08 11:42:12.000000000 -0700
-@@ -1153,13 +1153,12 @@
-         }
-
-         if (!install) {
--            ui_warn(op, "The %s module will not be installed. As a result, %s "
--                    "will not function with this installation of the NVIDIA "
--                    "driver.", optional_modules[i].module_name,
-+            ui_warn(op, "The %s module will be installed with no gpu detect. As a result, %s "
-+                    "will function with this installation of the NVIDIA "
-+                    "driver, but only if the card is installed", optional_modules[i].module_name,
-                     optional_modules[i].optional_module_dependee);
--
--            remove_kernel_module_from_package(p,
--                                              optional_modules[i].module_name);
-+//            remove_kernel_module_from_package(p,
-+//                                              optional_modules[i].module_name);
-         }
-     }
- }
-@@ -2036,7 +2035,10 @@
-                  "For further details, please see the appendix SUPPORTED "
-                  "NVIDIA GRAPHICS CHIPS in the README available on the Linux "
-                  "driver download page at www.nvidia.com.", p->version);
--        return FALSE;
-+       /*        return FALSE;
-+        * We're just going to keep the message but skip the result
-+        * so we can run this in a VM.
-+        */
-     }
-
-     if (!found_vga_device)