diff --git a/srcpkgs/nvidia/files/dkms.conf b/srcpkgs/nvidia/files/dkms.conf index 6e4e30c927d8c4..af0b3b04b6a35b 100644 --- a/srcpkgs/nvidia/files/dkms.conf +++ b/srcpkgs/nvidia/files/dkms.conf @@ -17,3 +17,5 @@ BUILT_MODULE_NAME[2]="nvidia-modeset" DEST_MODULE_LOCATION[2]="/kernel/drivers/video" BUILT_MODULE_NAME[3]="nvidia-drm" DEST_MODULE_LOCATION[3]="/kernel/drivers/video" +BUILT_MODULE_NAME[4]="nvidia-peermem" +DEST_MODULE_LOCATION[4]="/kernel/drivers/video" diff --git a/srcpkgs/nvidia/patches/nvidia-tegra-bpmp.patch b/srcpkgs/nvidia/patches/nvidia-tegra-bpmp.patch index dcf8fa56ae2d0f..75f016e9807fe6 100644 --- a/srcpkgs/nvidia/patches/nvidia-tegra-bpmp.patch +++ b/srcpkgs/nvidia/patches/nvidia-tegra-bpmp.patch @@ -1,5 +1,5 @@ ---- a/kernel/nvidia/nv-clk.c -+++ b/kernel/nvidia/nv-clk.c +--- a/kernel-open/nvidia/nv-clk.c ++++ b/kernel-open/nvidia/nv-clk.c @@ -27,8 +27,10 @@ #include "nv-linux.h" #include "nv-platform.h" diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index c682cf772d9fd4..8246d7b5145696 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -3,10 +3,10 @@ _desc="NVIDIA drivers for linux" pkgname=nvidia -version=580.126.18 -revision=2 +version=595.45.04 +revision=1 maintainer="Andrew Benson " -license="custom:NVIDIA Proprietary" +license="custom:NVIDIA Proprietary, MIT, GPL-2.0-only" homepage="https://www.nvidia.com/en-us/drivers/unix/" archs="x86_64" @@ -19,7 +19,7 @@ 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=a7781b2e1c2d65c6580914c76e79ed454d02945df84711c033070a092a9ab49d +checksum=cd496549246cba2a3b75291c6c14eec45f9d375d9dea310f1345a01af54e8f5e # subpackages need to be processed in this specific order subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit" depends="nvidia-libs-${version}_${revision} @@ -254,7 +254,7 @@ do_install() { # dkms pkg vmkdir usr/src/nvidia-${version} - vcopy "kernel/*" usr/src/nvidia-${version} + vcopy "kernel-open/*" usr/src/nvidia-${version} vcopy ${FILESDIR}/dkms.conf usr/src/nvidia-${version} sed -e "s/__PKGVER/${version}/g" \ -e 's/__MAKEJOBS/-j$(nproc)/g' \ @@ -323,7 +323,7 @@ nvidia-libs_package() { } nvidia-dkms_package() { - short_desc="${_desc} - DKMS kernel module" + short_desc="${_desc} - DKMS open kernel module" depends="dkms xbps-triggers>=0.121_1" dkms_modules="nvidia ${version}" # dkms must be before initramfs-regenerate to build modules before images