From 8bf5ae1a95c57618b5610ae12035b85d4ac8bedc Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Tue, 17 Oct 2023 20:00:27 +0100
Subject: [PATCH] Update to 545.23.06 beta

---
 sources                  |  4 ++--
 xorg-x11-drv-nvidia.spec | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sources b/sources
index 8e69a91..0a95ff3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (NVIDIA-Linux-x86_64-535.113.01.run) = bf939843404bc163246b710ca336236f28af489f77ee1830a2d20d4ca926a434b6fbc2156d5777dc004692d5d1adbef77ce79071247f81da2db9adf42c32bfa7
-SHA512 (NVIDIA-Linux-aarch64-535.113.01.run) = b096ffb63d2f113bb1ac5a8cec9a79a643ccab7fc8e9b20e547d96bda4960f0bc70fa2be806d19d47eae5fe2ee6e762e0638f1600ceb54744f46af38251a7f73
+SHA512 (NVIDIA-Linux-x86_64-545.23.06.run) = 5b36accd10b5d5768ac6c6865148c750485f24ad4346f9f2f7e9d7d323297b0b5c5e7369bd8b82bca10e3d518b0ca820ae4865df8beaa49eb3fd5ad184702194
+SHA512 (NVIDIA-Linux-aarch64-545.23.06.run) = 0de770e0871a909f8738acc14eb0eca53a947201cd5acd2af7852f93fce82a6e0de3f52309357a3777f1041a902be9790e7a1531437108d0eec6897f6a62501b
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 3ef246b..bcbfa66 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -10,7 +10,7 @@
 %global        _firmwarepath        %{_prefix}/lib/firmware
 %global        _winedir             %{_libdir}/nvidia/wine
 %if 0%{?fedora} || 0%{?rhel} > 7
-%global        _dracutopts          rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1
+%global        _dracutopts          rd.driver.blacklist=nouveau modprobe.blacklist=nouveau
 %else
 %global        _dracutopts          nouveau.modeset=0 rd.driver.blacklist=nouveau
 %global        _modprobedir         %{_prefix}/lib/modprobe.d
@@ -26,7 +26,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           3
-Version:         535.113.01
+Version:         545.23.06
 Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
@@ -88,7 +88,7 @@ Conflicts:       xorg-x11-drv-nvidia-340xx
 Conflicts:       xorg-x11-drv-nvidia-390xx
 
 %global         __provides_exclude ^(lib.*GL.*\\.so.*)$
-%global         __requires_exclude ^libnvidia-vulkan-producer.so|^libglxserver_nvidia.so|^(lib.*GL.*\\.so.*)$
+%global         __requires_exclude ^libglxserver_nvidia.so|^(lib.*GL.*\\.so.*)$
 
 
 %description
@@ -246,6 +246,7 @@ cp -a \
     libnvidia-glcore.so.%{version} \
     libnvidia-glsi.so.%{version} \
     libnvidia-glvkspirv.so.%{version} \
+    libnvidia-gpucomp.so.%{version} \
     libnvidia-ml.so.%{version} \
     libnvidia-nvvm.so.%{version} \
     libnvidia-opticalflow.so.%{version} \
@@ -266,7 +267,6 @@ cp -a \
 %endif
 %endif
     libnvidia-rtcore.so.%{version} \
-    libnvidia-vulkan-producer.so.%{version} \
     libnvoptix.so.%{version} \
 %endif
     %{buildroot}%{_libdir}/
@@ -301,7 +301,6 @@ popd
 install    -m 0755         -d %{buildroot}%{_datadir}/vulkan/{icd.d,implicit_layer.d}/
 install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
 install -p -m 0644 nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/
-ln -sf libnvidia-vulkan-producer.so.%{version} %{buildroot}%{_libdir}/libnvidia-vulkan-producer.so
 
 # X DDX driver and GLX extension
 install -p -D -m 0755 libglxserver_nvidia.so.%{version} %{buildroot}%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so
@@ -437,7 +436,7 @@ if [ "$1" -eq "1" ]; then
   sed -i -e 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="%{_dracutopts} /g' /etc/default/grub
 fi || :
 
-%triggerun -- xorg-x11-drv-nvidia < 3:535.98-2
+%triggerun -- xorg-x11-drv-nvidia < 3:545.23.06-1
 if [ -f %{_sysconfdir}/default/grub ] ; then
   sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub
   . %{_sysconfdir}/default/grub
@@ -521,6 +520,7 @@ fi ||:
 %{_libdir}/libnvidia-glcore.so.%{version}
 %{_libdir}/libnvidia-glsi.so.%{version}
 %{_libdir}/libnvidia-glvkspirv.so.%{version}
+%{_libdir}/libnvidia-gpucomp.so.%{version}
 %{_libdir}/libnvidia-tls.so.%{version}
 %{_libdir}/gbm/
 %{_libdir}/vdpau/libvdpau_nvidia.so.1
@@ -545,10 +545,6 @@ fi ||:
 %{_libdir}/libnvidia-ngx.so.1
 %{_libdir}/libnvidia-ngx.so.%{version}
 %{_libdir}/libnvidia-rtcore.so.%{version}
-%{_libdir}/libnvidia-vulkan-producer.so.%{version}
-%{_libdir}/libnvidia-vulkan-producer.so
-# Fix f38 screw up
-%exclude %{_libdir}/libnvidia-vulkan-producer.so.530
 %{_libdir}/libnvoptix.so.1
 %{_libdir}/libnvoptix.so.%{version}
 %ifarch x86_64
@@ -642,6 +638,10 @@ fi ||:
 %endif
 
 %changelog
+* Tue Oct 17 2023 Leigh Scott <leigh123linux@gmail.com> - 3:545.23.06-1
+- Update to 545.23.06 beta
+- Remove  nvidia-drm.modeset from boot options
+
 * Fri Sep 22 2023 Leigh Scott <leigh123linux@gmail.com> - 3:535.113.01-1
 - Update to 535.113.01