From f7a09af90ebdd66d703c7a8ec52172290ae23904 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 2 Dec 2022 18:45:57 -0600
Subject: [PATCH] nvidia: update to 525.60.11

Firmware is moved to its own package since it will be needed when we add
`nvidia-open`.
---
 srcpkgs/nvidia-firmware |  1 +
 srcpkgs/nvidia/template | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/nvidia-firmware

diff --git a/srcpkgs/nvidia-firmware b/srcpkgs/nvidia-firmware
new file mode 120000
index 000000000000..746a30838a69
--- /dev/null
+++ b/srcpkgs/nvidia-firmware
@@ -0,0 +1 @@
+nvidia
\ No newline at end of file
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index c8f5dbc937f0..dae89b4a8dee 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=515.86.01
-revision=3
+version=525.60.11
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -19,12 +19,13 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=141777e1ca2f11e97d8d33260213f1be327eb73922ae22f4ddab404bb2ef4664
+checksum=816ee6c2e0813ccc3d4a7958f71fc49a37c60efe1d51d6146c1ce72403983d5d
 # subpackages need to be processed in this specific order
-subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
+subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
  nvidia-gtklibs-${version}_${revision}
- nvidia-dkms-${version}_${revision}"
+ nvidia-dkms-${version}_${revision}
+ nvidia-firmware-${version}_${revision}"
 
 _install_libs() {
 	local libdir=$1
@@ -116,7 +117,9 @@ do_install() {
 	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
 
 	# firmware
-	vinstall firmware/gsp.bin 644 usr/lib/firmware/nvidia/${version}
+	for fw in gsp_tu10x.bin gsp_ad10x.bin; do
+		vinstall "firmware/${fw}" 644 "usr/lib/firmware/nvidia/${version}"
+	done
 
 	# GLX extension module for X
 	vinstall libglxserver_nvidia.so.${version} 755 usr/lib/nvidia/xorg
@@ -126,8 +129,8 @@ do_install() {
 		${DESTDIR}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1
 
 	# Wayland/GBM
-	vinstall libnvidia-egl-wayland.so.1.1.9 755 usr/lib
-	ln -sf libnvidia-egl-wayland.so.1.1.9 \
+	vinstall libnvidia-egl-wayland.so.1.1.10 755 usr/lib
+	ln -sf libnvidia-egl-wayland.so.1.1.10 \
 		${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1
 	vinstall libnvidia-egl-gbm.so.1.1.0 755 usr/lib
 	ln -sf libnvidia-egl-gbm.so.1.1.0 \
@@ -328,3 +331,10 @@ nvidia-opencl_package() {
 		vmove etc/OpenCL
 	}
 }
+
+nvidia-firmware_package() {
+	short_desc="${_desc} - Firmware"
+	pkg_install() {
+		vmove usr/lib/firmware
+	}
+}