summaryrefslogtreecommitdiff
path: root/system/nvidia-driver/skip_conflict-GPU_detect.patch
diff options
context:
space:
mode:
authorEdward W. Koenig <kingbeowulf@gmail.com>2017-07-03 23:36:48 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-05 08:52:27 +0700
commit8509036382592bb1ad35fa674da3ab94e89022a0 (patch)
tree8f4bcdb97ab935c94f7d6b581fb0e2edacfd9ebe /system/nvidia-driver/skip_conflict-GPU_detect.patch
parent66f3d405a6db28def7eb767e5eb2b65437983f75 (diff)
downloadslackbuilds-8509036382592bb1ad35fa674da3ab94e89022a0.tar.gz
system/nvidia-driver: Updated for version 375.66.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/nvidia-driver/skip_conflict-GPU_detect.patch')
-rw-r--r--system/nvidia-driver/skip_conflict-GPU_detect.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/system/nvidia-driver/skip_conflict-GPU_detect.patch b/system/nvidia-driver/skip_conflict-GPU_detect.patch
new file mode 100644
index 0000000000..b98a12ccbb
--- /dev/null
+++ b/system/nvidia-driver/skip_conflict-GPU_detect.patch
@@ -0,0 +1,28 @@
+diff -uaN nvidia-installer-375.66/command-list.c nvidia-installer-375.66.new/command-list.c
+--- nvidia-installer-375.66/command-list.c 2017-05-01 16:41:24.000000000 -0700
++++ nvidia-installer-375.66.new/command-list.c 2017-07-01 18:15:25.087868229 -0700
+@@ -903,6 +903,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];
+Common subdirectories: nvidia-installer-375.66/common-utils and nvidia-installer-375.66.new/common-utils
+diff -uaN nvidia-installer-375.66/misc.c nvidia-installer-375.66.new/misc.c
+--- nvidia-installer-375.66/misc.c 2017-05-01 16:41:24.000000000 -0700
++++ nvidia-installer-375.66.new/misc.c 2017-07-01 18:19:22.310846284 -0700
+@@ -2290,7 +2290,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)