From 638e307e58e51ad1dc4b12681949585e30a6467e Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Fri, 8 Jan 2021 10:34:57 +0100
Subject: [PATCH] up to 460.32.03

---
 kernel-5.7.patch              | 22 ----------------------
 xorg-driver-video-nvidia.spec |  6 ++----
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 kernel-5.7.patch

diff --git a/kernel-5.7.patch b/kernel-5.7.patch
deleted file mode 100644
index a6821b5..0000000
--- a/kernel-5.7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index 8f807a1..af29636 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -143,6 +143,7 @@ test_headers() {
-     FILES="$FILES video/nv_internal.h"
-     FILES="$FILES asm/book3s/64/hash-64k.h"
-     FILES="$FILES asm/set_memory.h"
-+    FILES="$FILES asm/pgtable.h"
-     FILES="$FILES asm/prom.h"
-     FILES="$FILES asm/powernv.h"
-     FILES="$FILES asm/tlbflush.h"
-@@ -466,6 +467,9 @@ compile_test() {
-             # It does not exist on all architectures.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #include <asm/set_memory.h>
-             #else
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 6b4a8b7..9b816bd 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -33,19 +33,18 @@ Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 # when updating version here, keep nvidia-settings.spec in sync as well
-Version:	455.45.01
+Version:	460.32.03
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
 Source0:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-# Source0-md5:	f0161877350aa9155eada811ff2844a8
+# Source0-md5:	360228c8de0e47f4245c7e2b108ef6cd
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
 Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-desktop.patch
-Patch1:		kernel-5.7.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}}
@@ -246,7 +245,6 @@ rm -rf NVIDIA-Linux-x86_64-%{version}
 /bin/sh %{SOURCE0} --extract-only
 %setup -qDT -n NVIDIA-Linux-x86_64-%{version}
 %patch0 -p1
-%patch1 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
-- 
2.43.0