diff --git a/common/shlibs b/common/shlibs index 8ed7c948eed..0541c2dea7e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -138,7 +138,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.390.87 nvidia390-libs-390.87_1 ignore libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore -libnvidia-fatbinaryloader.so.390.147 nvidia390-libs-390.147_1 ignore +libnvidia-fatbinaryloader.so.390.151 nvidia390-libs-390.151_1 ignore libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore libglapi.so.0 libglapi-7.11_1 libgbm.so.1 libgbm-9.0_1 diff --git a/srcpkgs/nvidia390/files/dkms.conf b/srcpkgs/nvidia390/files/dkms.conf index 88c29ff8404..e97d73975b3 100644 --- a/srcpkgs/nvidia390/files/dkms.conf +++ b/srcpkgs/nvidia390/files/dkms.conf @@ -11,9 +11,7 @@ MAKE[0]="'make' __MAKEJOBS NV_EXCLUDE_BUILD_MODULES='' KERNEL_UNAME=${kernelver} # The list of kernel modules was generated by nvidia-installer at runtime. BUILT_MODULE_NAME[0]="nvidia" DEST_MODULE_LOCATION[0]="/kernel/drivers/video" -BUILT_MODULE_NAME[1]="nvidia-uvm" +BUILT_MODULE_NAME[1]="nvidia-modeset" DEST_MODULE_LOCATION[1]="/kernel/drivers/video" -BUILT_MODULE_NAME[2]="nvidia-modeset" +BUILT_MODULE_NAME[2]="nvidia-drm" DEST_MODULE_LOCATION[2]="/kernel/drivers/video" -BUILT_MODULE_NAME[3]="nvidia-drm" -DEST_MODULE_LOCATION[3]="/kernel/drivers/video" diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template index 903c74f394f..86132388ee9 100644 --- a/srcpkgs/nvidia390/template +++ b/srcpkgs/nvidia390/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)" pkgname=nvidia390 -version=390.147 -revision=2 +version=390.151 +revision=1 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" homepage="https://www.nvidia.com/en-us/drivers/unix/" @@ -22,11 +22,11 @@ conflicts="xserver-abi-video>25_1" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" - checksum=2ac4b05d0de612f13f5f080dff6c73f06ea8b1d8ea21b7505441027ab4d55b01 + checksum=94e399b459659c12b1344e8c8f4f5eee1ed5915ff459fc8bb831c9e1d44677db else _pkg="NVIDIA-Linux-x86_64-${version}-no-compat32" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" - checksum=3fc4b5a7c64326cea79156fc31e8160a89621219df09a4cd268844c3e318accc + checksum=6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c fi subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs" @@ -195,14 +195,6 @@ do_install() { sed -e "s/__PKGVER/${version}/g" \ -e "s/__MAKEJOBS/-j$(nproc)/g" \ -i ${DESTDIR}/usr/src/nvidia-${version}/dkms.conf - # The "uvm" submodule uses GPL only symbols and can no longer be built. - # Remove 2 lines for "nvidia-uvm" and repair consecutive enumeration following. - vsed -e '/nvidia-uvm/,+1d' \ - -e 's/\[2\]/[1]/g' \ - -e 's/\[3\]/[2]/g' \ - -i ${DESTDIR}/usr/src/nvidia-${version}/dkms.conf - vsed -e 's/ nvidia-uvm//' \ - -i ${DESTDIR}/usr/src/nvidia-${version}/Makefile # Blacklist nouveau vmkdir usr/lib/modprobe.d