From a49a78a3cb5e016f41c925fb070b0e284e8676d2 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Tue, 22 Jun 2021 18:29:41 +0100
Subject: [PATCH] Update to 470.42.01 beta

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

diff --git a/sources b/sources
index 379b579..90e7bc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NVIDIA-Linux-x86_64-465.31.run) = 3ea65eda463320d0e2301e45daa5a725bd07f664ab117053f106b981801ae314faef320304f4b87dd8eb8868f9f86478b23fbca51d27ddc3968a5f5300e8cbf9
+SHA512 (NVIDIA-Linux-x86_64-470.42.01.run) = f933e249b9e0b043283ba164d56bd235240a34098e4ab9d1070809e17f8c2cd24d7319217c02c2417414f4c811216181d7ab8842755cd0d25b00ee51de70b2cc
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a86cbb5..802230f 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -7,6 +7,7 @@
 %global        _dracut_conf_d       %{_prefix}/lib/dracut/dracut.conf.d
 %global        _grubby              %{_sbindir}/grubby --update-kernel=ALL
 %global        _firmwarepath        %{_prefix}/lib/firmware
+%global        _winedir             %{_libdir}/wine/x86_64-windows
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global        _dracutopts          rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1
 %else
@@ -21,7 +22,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           3
-Version:         465.31
+Version:         470.42.01
 Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
@@ -210,6 +211,7 @@ cp -a \
     libnvidia-cbl.so.%{version} \
     libnvidia-cfg.so.%{version} \
     libnvidia-ngx.so.%{version} \
+    libnvidia-nvvm.so.4.0.0 \
     libnvidia-rtcore.so.%{version} \
     libnvoptix.so.%{version} \
 %endif
@@ -248,6 +250,10 @@ popd
 %endif
 
 %ifarch x86_64
+# Install additional cuda lib, ldconfig generates wrong .so name.
+ln -sf libnvidia-nvvm.so.4.0.0 %{buildroot}%{_libdir}/libnvidia-nvvm.so.4.0
+ln -sf libnvidia-nvvm.so.4 %{buildroot}%{_libdir}/libnvidia-nvvm.so
+
 # Vulkan config
 install    -m 0755         -d %{buildroot}%{_datadir}/vulkan/{icd.d,implicit_layer.d}/
 install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
@@ -321,6 +327,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/nvidia
 mkdir -p %{buildroot}%{_datadir}/nvidia-kmod-%{version}
 tar Jcf %{buildroot}%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-x86_64.tar.xz kernel
 
+#Install wine dll
+mkdir -p %{buildroot}%{_winedir}
+install -p -m 0644 _nvngx.dll nvngx.dll %{buildroot}%{_winedir}
+
 #RPM Macros support
 mkdir -p %{buildroot}%{rpmmacrodir}
 cat > %{buildroot}%{rpmmacrodir}/macros.%{name}-kmodsrc<< EOF
@@ -474,6 +484,8 @@ fi ||:
 %{_libdir}/libnvidia-rtcore.so.%{version}
 %{_libdir}/libnvoptix.so.1
 %{_libdir}/libnvoptix.so.%{version}
+%{_winedir}/_nvngx.dll
+%{_winedir}/nvngx.dll
 %endif
 %{_libdir}/libnvidia-eglcore.so.%{version}
 %{_libdir}/libnvidia-fbc.so.1
@@ -518,6 +530,8 @@ fi ||:
 %{_libdir}/libnvidia-opticalflow.so.1
 %{_libdir}/libnvidia-opticalflow.so.%{version}
 %ifarch x86_64
+%{_libdir}/libnvidia-nvvm.so.4.*
+%{_libdir}/libnvvm.so.4
 %{_modprobedir}/nvidia-uvm.conf
 %{_udevrulesdir}/60-nvidia-uvm.rules
 %endif
@@ -525,8 +539,12 @@ fi ||:
 %files devel
 %{_libdir}/libnvcuvid.so
 %{_libdir}/libnvidia-encode.so
+%{_libdir}/libnvidia-nvvm.so
 
 %changelog
+* Tue Jun 22 2021 Leigh Scott <leigh123linux@gmail.com> - 3:470.42.01-1
+- Update to 470.42.01 beta
+
 * Fri May 21 2021 Leigh Scott <leigh123linux@gmail.com> - 3:465.31-1
 - Update to 465.31 release