From 636b121c89541c8e6b6e3b07cc659a376e70d885 Mon Sep 17 00:00:00 2001
From: Lenard Spencer <lenardrspencer@gmail.com>
Date: Sat, 3 Sep 2022 02:56:35 +0100
Subject: system/nvidia-open-kernel: Patch for 6.0 kernel

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch  | 9 +++++++++
 system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch

(limited to 'system')

diff --git a/system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch b/system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch
new file mode 100644
index 0000000000..f3d780c026
--- /dev/null
+++ b/system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch
@@ -0,0 +1,9 @@
+--- a/kernel-open/nvidia-drm/nvidia-drm-helper.c	2022-07-20 16:42:53.000000000 +0300
++++ b/kernel-open/nvidia-drm/nvidia-drm-helper.c	2022-08-20 16:32:34.836742336 +0300
+@@ -28,6 +28,7 @@
+  */
+ 
+ #include "nvidia-drm-helper.h"
++#include <drm/drm_framebuffer.h>
+ 
+ #include "nvmisc.h"
diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild
index 54a9b00812..578216e2ce 100644
--- a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild
+++ b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-open-kernel
 VERSION=${VERSION:-515.65.01}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -83,10 +83,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch for 6.0 kernel:
+patch -p1 < $CWD/nvidia-open-kernel-6.0.patch
+
 # CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch"
 # message.  If you custom-build your kernel with clang,
 # then pass CC=clang to this script.
-CC=${CC:-gcc} make SYSSRC=$KERNELPATH module || exit 1
+CC=${CC:-gcc} make SYSSRC=$KERNELPATH modules || exit 1
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
 install -m 0664 kernel-open/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-- 
cgit v1.2.3