nvidia: update to 510.68.02.

Also update conflicts.
This commit is contained in:
Andrew Benson 2022-05-06 17:56:52 -05:00 committed by Andrew Benson
parent ce34af8772
commit 30269ae669
1 changed files with 9 additions and 4 deletions

View File

@ -3,8 +3,8 @@
_desc="NVIDIA drivers for linux" _desc="NVIDIA drivers for linux"
pkgname=nvidia pkgname=nvidia
version=510.60.02 version=510.68.02
revision=2 revision=1
maintainer="Andrew Benson <abenson+void@gmail.com>" maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary" license="custom:NVIDIA Proprietary"
homepage="https://www.nvidia.com/en-us/drivers/unix/" homepage="https://www.nvidia.com/en-us/drivers/unix/"
@ -15,11 +15,11 @@ repository="nonfree"
create_wrksrc=yes create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities" short_desc="${_desc} - Libraries and Utilities"
hostmakedepends="tar" hostmakedepends="tar"
conflicts="xserver-abi-video>25_1" conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
_pkg="NVIDIA-Linux-x86_64-${version}" _pkg="NVIDIA-Linux-x86_64-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
checksum=a800dfc0549078fd8c6e8e6780efb8eee87872e6055c7f5f386a4768ce07e003 checksum=bd2c344ac92b2fc12b06043590a4fe8d4eb0ccb74d0c49352f004cf2d299f4c5
# subpackages need to be processed in this specific order # 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-opencl nvidia-libs nvidia-libs-32bit"
depends="nvidia-libs-${version}_${revision} depends="nvidia-libs-${version}_${revision}
@ -279,6 +279,7 @@ do_install() {
nvidia-gtklibs_package() { nvidia-gtklibs_package() {
short_desc="${_desc} - GTK+ libraries" short_desc="${_desc} - GTK+ libraries"
conflicts="nvidia470-gtklibs>=0 nvidia390-gtklibs>=0"
pkg_install() { pkg_install() {
vmove "usr/lib/lib*gtk*.so*" vmove "usr/lib/lib*gtk*.so*"
} }
@ -288,6 +289,7 @@ nvidia-libs-32bit_package() {
short_desc="${_desc} - common libraries (32bit)" short_desc="${_desc} - common libraries (32bit)"
# manually set 32bit depends for libglvnd # manually set 32bit depends for libglvnd
depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0" depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0"
conflicts="nvidia470-libs-32bit>=0 nvidia390-libs-32bit>=0"
repository="multilib/nonfree" repository="multilib/nonfree"
pkg_install() { pkg_install() {
vmove usr/lib32 vmove usr/lib32
@ -298,6 +300,7 @@ nvidia-libs_package() {
short_desc="${_desc} - common libraries" short_desc="${_desc} - common libraries"
depends="libglvnd" depends="libglvnd"
nostrip_files="gsp.bin" nostrip_files="gsp.bin"
conflicts="nvidia470-libs>=0 nvidia390-libs>=0"
pkg_install() { pkg_install() {
vmove usr/lib vmove usr/lib
} }
@ -309,6 +312,7 @@ nvidia-dkms_package() {
dkms_modules="nvidia ${version}" dkms_modules="nvidia ${version}"
# dkms must be before initramfs-regenerate to build modules before images # dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate" triggers="dkms initramfs-regenerate"
conflicts="nvidia470-dkms>=0 nvidia390-dkms>=0"
pkg_install() { pkg_install() {
vmove usr/src vmove usr/src
@ -319,6 +323,7 @@ nvidia-dkms_package() {
nvidia-opencl_package() { nvidia-opencl_package() {
short_desc="${_desc} - OpenCL implementation" short_desc="${_desc} - OpenCL implementation"
depends="ocl-icd" depends="ocl-icd"
conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
pkg_install() { pkg_install() {
vmove "usr/lib/libnvidia-compiler*" vmove "usr/lib/libnvidia-compiler*"
vmove "usr/lib/libnvidia-opencl*" vmove "usr/lib/libnvidia-opencl*"