From fa9089b408c211be6580855f8cf164d927608240 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 6 May 2022 18:14:22 -0500 Subject: [PATCH] nvidia470: update conflicts --- srcpkgs/nvidia470/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template index d746210cc92..def3fee0278 100644 --- a/srcpkgs/nvidia470/template +++ b/srcpkgs/nvidia470/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)" pkgname=nvidia470 version=470.103.01 -revision=3 +revision=4 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" homepage="https://www.nvidia.com/en-us/drivers/unix/" @@ -15,7 +15,7 @@ repository="nonfree" create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" hostmakedepends="tar" -conflicts="xserver-abi-video>25_1" +conflicts="xserver-abi-video>25_1 nvidia390>=0" _pkg="NVIDIA-Linux-x86_64-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" @@ -263,6 +263,7 @@ do_install() { nvidia470-gtklibs_package() { short_desc="${_desc} - GTK+ libraries" + conflicts="nvidia390-gtklibs>=0" pkg_install() { vmove "usr/lib/lib*gtk*.so*" } @@ -273,6 +274,7 @@ nvidia470-libs-32bit_package() { # manually set 32bit depends for libglvnd depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0" repository="multilib/nonfree" + conflicts="nvidia390-libs-32bit>=0" pkg_install() { vmove usr/lib32 } @@ -282,6 +284,7 @@ nvidia470-libs_package() { short_desc="${_desc} - common libraries" depends="libglvnd" nostrip_files="gsp.bin" + conflicts="nvidia390-libs>=0" pkg_install() { vmove usr/lib } @@ -293,6 +296,7 @@ nvidia470-dkms_package() { dkms_modules="nvidia ${version}" # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" + conflicts="nvidia390-dkms>=0" pkg_install() { vmove usr/src @@ -303,6 +307,7 @@ nvidia470-dkms_package() { nvidia470-opencl_package() { short_desc="${_desc} - OpenCL implementation" depends="ocl-icd" + conflicts="nvidia390-opencl>=0" pkg_install() { vmove "usr/lib/libnvidia-compiler*" vmove "usr/lib/libnvidia-opencl*"