diff --git a/srcpkgs/nvidia340/files/kernel-4.11.patch b/srcpkgs/nvidia340/files/kernel-4.11.patch deleted file mode 100644 index b2b3a7a9d95..00000000000 --- a/srcpkgs/nvidia340/files/kernel-4.11.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:50:46.334075042 +0200 -+++ kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:56:06.358041280 +0200 -@@ -818,7 +818,11 @@ - } - - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else -+int _fault(struct vm_fault *vmf) -+#endif - { - #if defined(NV_VM_FAULT_HAS_ADDRESS) - unsigned long vaddr = vmf->address; -@@ -828,7 +832,11 @@ - struct page *page = NULL; - int retval; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - retval = _fault_common(vma, vaddr, &page, vmf->flags); -+#else -+ retval = _fault_common(NULL, vaddr, &page, vmf->flags); -+#endif - - vmf->page = page; - -@@ -866,7 +874,11 @@ - // it's dealing with anonymous mapping (see handle_pte_fault). - // - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else -+int _sigbus_fault(struct vm_fault *vmf) -+#endif - { - vmf->page = NULL; - return VM_FAULT_SIGBUS; diff --git a/srcpkgs/nvidia340/files/kernel-4.14.patch b/srcpkgs/nvidia340/files/kernel-4.14.patch deleted file mode 100644 index a733817e83a..00000000000 --- a/srcpkgs/nvidia340/files/kernel-4.14.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- kernel/nv-drm.c.orig 2017-11-15 21:28:26.896689841 +0100 -+++ kernel/nv-drm.c 2017-11-15 21:31:01.579707509 +0100 -@@ -173,7 +173,11 @@ - { - int ret = 0; - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) - ret = drm_pci_init(&nv_drm_driver, pci_driver); -+#else -+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); -+#endif - #endif - return ret; - } -@@ -183,7 +187,11 @@ - ) - { - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) - drm_pci_exit(&nv_drm_driver, pci_driver); -+#else -+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); -+#endif - #endif - } - diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template index 65ac5a83571..a01b5c39c60 100644 --- a/srcpkgs/nvidia340/template +++ b/srcpkgs/nvidia340/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)" pkgname=nvidia340 -version=340.104 -revision=3 +version=340.106 +revision=1 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -24,11 +24,11 @@ subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" - checksum=e39015f8e2c6c87037be340fd1899f703ac15356c5694ad8187cd67e71491cd1 + checksum=5d5bddf28f4462b1d024110152e74e131a602e175e0e99822d8474d0a751d2a4 else _pkg="NVIDIA-Linux-x86_64-${version}-no-compat32" distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" - checksum=ed112523ae424aea46904d2dcfc769b0263cf552f5bfec0e30601f6f0f95eada + checksum=c0d5dacd7be6c096400b9a5fd54676af36210ab480f2498335a612cfd1814467 fi do_extract() { @@ -38,12 +38,6 @@ do_extract() { rm -f ${_pkg}.run } -do_configure() { - cd ${_pkg} - patch -p0 < ${FILESDIR}/kernel-4.11.patch - patch -p0 < ${FILESDIR}/kernel-4.14.patch -} - do_install() { cd ${_pkg}