nvidia: update to 390.59

Closes https://github.com/voidlinux/void-packages/issues/14756

Closes #14762.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>

common/shlibs

@@ -143,7 +143,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.390.48 nvidia-libs-390.48_1 ignore
+libnvidia-fatbinaryloader.so.390.59 nvidia-libs-390.59_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
 librsvg-2.so.2 librsvg-2.26.0_1

srcpkgs/nvidia/files/nvidia-swiotlb-linux_4_16.patch

@@ -1,14 +0,0 @@
-disable check for swiotlb for kernels newer as 4.16 because it uses a symbol
-that isn't exported anymore
-
---- kernel/common/inc/nv-linux.h.orig	2018-04-23 14:33:53.184275029 +0200
-+++ kernel/common/inc/nv-linux.h	2018-04-23 15:26:38.892322165 +0200
-@@ -1209,7 +1209,7 @@
- static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
- {
-     NvBool swiotlb_in_use = NV_FALSE;
--#if defined(CONFIG_SWIOTLB)
-+#if defined(CONFIG_SWIOTLB) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
-   #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
-     /*
-      * We only use the 'dma_ops' symbol on older x86_64 kernels; later kernels,

srcpkgs/nvidia/files/nvidia-x86_64-uvm8_va_block-linux_4_14_9.patch

@@ -1,17 +0,0 @@
-Since linux-4.14.9 there has been some kernel headers reordering.
-Fix that issue by including linux/sched/task_stack.h for kernels
-newer than 4.14.9.
-
---- NVIDIA-Linux-x86_64-390.48-no-compat32/kernel/nvidia-uvm/uvm8_va_block.c	2017-10-27 01:19:54.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.48-no-compat32/kernel/nvidia-uvm/uvm8_va_block.c	2018-01-02 02:50:05.260588964 +0100
-@@ -36,6 +36,10 @@
- #include "uvm8_perf_prefetch.h"
- #include "uvm8_mem.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,9)
-+#include <linux/sched/task_stack.h>
-+#endif
-+
- typedef enum
- {
-     BLOCK_PTE_OP_MAP,

srcpkgs/nvidia/template

@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux (long-lived series)"
 
 pkgname=nvidia
-version=390.48
+version=390.59
 revision=1
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Proprietary NVIDIA license"
@@ -15,7 +15,7 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config"
-conflicts="catalyst>=0 xserver-abi-video>23_1"
+conflicts="catalyst>=0 xserver-abi-video>24_1"
 
 build_options="glvnd"
 desc_option_glvnd="Add support for NVIDIA's GL Vendor Neutral Dispatch implementation"
@@ -24,11 +24,11 @@ build_options_default="glvnd"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=5115894ebb9d5d4c75c11e73a79093b7687328ebcf85d1de81a0edf41d14d6f8
+	checksum=7a27c26e8985428b87ce7466e12d3f33e4b0e0b19a2584f8f3cedd9b2b762e37
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=2d4bf72801f101a85df6fd1464021380ad51f5a30df05dadaf1fb546a175a441
+	checksum=397adf2f725f6d27aaf583431efe8d1182d926930e73f1bfd6f9e6fbc03c0484
 fi
 
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs"
@@ -38,16 +38,6 @@ do_extract() {
 	cd ${wrksrc}
 	./${_pkg}.run --extract-only
 	rm -f ${_pkg}.run
-	#
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		cp ${FILESDIR}/nvidia-x86_64-uvm8_va_block-linux_4_14_9.patch \
-			nvidia-uvm8_va_block-linux_4_14_9.patch
-		patch -p0 < nvidia-uvm8_va_block-linux_4_14_9.patch
-	fi
-	cd ${_pkg}
-	cp ${FILESDIR}/nvidia-swiotlb-linux_4_16.patch \
-		nvidia-swiotlb-linux_4_16.patch
-	patch -p0 < nvidia-swiotlb-linux_4_16.patch
 }
 
 pre_install() {