From c30c401dc08205fdf8b4a8389ae4d6767727f5e3 Mon Sep 17 00:00:00 2001
From: Edward W. Koenig
Date: Wed, 4 Jan 2017 03:39:49 -0600
Subject: system/nvidia-kernel: Updated for version 375.26.

Include file to blacklist nouveau module
Note we don't use the package from /extra.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 system/nvidia-kernel/README                   |  3 ++-
 system/nvidia-kernel/blacklist.conf           |  2 ++
 system/nvidia-kernel/nvidia-kernel.SlackBuild |  7 +++++--
 system/nvidia-kernel/nvidia-kernel.info       | 10 +++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 system/nvidia-kernel/blacklist.conf

diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index b43764b191..ca1bb5be90 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -10,4 +10,5 @@ to make sure that X loads the nvidia module.  If you need to make changes,
 copy that file to /etc/X11/xorg.conf.d/ and edit the copy.  You do not need 
 this file at all if you have a proper and complete xorg.conf.
 
-The xf86-video-nouveau-blacklist package from /extra is required.
+This package contains a lib/modprobe.d/nouveau.conf file that blacklists
+the conflicting nouveau kernel module.
diff --git a/system/nvidia-kernel/blacklist.conf b/system/nvidia-kernel/blacklist.conf
new file mode 100644
index 0000000000..447f5f71fb
--- /dev/null
+++ b/system/nvidia-kernel/blacklist.conf
@@ -0,0 +1,2 @@
+# Do not load the nouveau module since it interferes with the nvidia driver
+blacklist nouveau
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index 5773e98d0b..1c53f43189 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -28,7 +28,7 @@
 # see nvidia-driver/changelog.txt
 
 PRGNAM=nvidia-kernel
-VERSION=${VERSION:-367.44}
+VERSION=${VERSION:-375.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,10 +95,13 @@ fi
 # Make sure the X is specified to automagically load the 
 # correct driver, since I always forget. You can remove
 # this file if you have an equivilent entry in /etc/X11/xorg.d
-
 mkdir -p $PKG/usr/share/X11/xorg.conf.d/
 cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
 
+# Blacklist the nouveau kernel module
+mkdir -p $PKG/lib/modprobe.d/
+cat $CWD/blacklist.conf > $PKG/lib/modprobe.d/nouveau.conf
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
 
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index dc7c238639..c1d0dd8b6a 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="367.44"
+VERSION="375.26"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/367.44/NVIDIA-Linux-x86-367.44.run"
-MD5SUM="93ff8e1fe32939ca4fd6522b93825edc"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/367.44/NVIDIA-Linux-x86_64-367.44.run"
-MD5SUM_x86_64="d34b42e64b25bf2a8d7b9a157723a3bd"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/375.26/NVIDIA-Linux-x86-375.26.run"
+MD5SUM="b0706e88ad173f6b9c7bd2e5a838c163"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/375.26/NVIDIA-Linux-x86_64-375.26.run"
+MD5SUM_x86_64="d60819b2e377398c7296999ab5e7c1a4"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
-- 
cgit v1.2.3