nvidia470: update conflicts
This commit is contained in:
parent
30269ae669
commit
fa9089b408
|
@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
|
||||||
|
|
||||||
pkgname=nvidia470
|
pkgname=nvidia470
|
||||||
version=470.103.01
|
version=470.103.01
|
||||||
revision=3
|
revision=4
|
||||||
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,7 +15,7 @@ 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 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"
|
||||||
|
@ -263,6 +263,7 @@ do_install() {
|
||||||
|
|
||||||
nvidia470-gtklibs_package() {
|
nvidia470-gtklibs_package() {
|
||||||
short_desc="${_desc} - GTK+ libraries"
|
short_desc="${_desc} - GTK+ libraries"
|
||||||
|
conflicts="nvidia390-gtklibs>=0"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove "usr/lib/lib*gtk*.so*"
|
vmove "usr/lib/lib*gtk*.so*"
|
||||||
}
|
}
|
||||||
|
@ -273,6 +274,7 @@ nvidia470-libs-32bit_package() {
|
||||||
# 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"
|
||||||
repository="multilib/nonfree"
|
repository="multilib/nonfree"
|
||||||
|
conflicts="nvidia390-libs-32bit>=0"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/lib32
|
vmove usr/lib32
|
||||||
}
|
}
|
||||||
|
@ -282,6 +284,7 @@ nvidia470-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="nvidia390-libs>=0"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/lib
|
vmove usr/lib
|
||||||
}
|
}
|
||||||
|
@ -293,6 +296,7 @@ nvidia470-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="nvidia390-dkms>=0"
|
||||||
|
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/src
|
vmove usr/src
|
||||||
|
@ -303,6 +307,7 @@ nvidia470-dkms_package() {
|
||||||
nvidia470-opencl_package() {
|
nvidia470-opencl_package() {
|
||||||
short_desc="${_desc} - OpenCL implementation"
|
short_desc="${_desc} - OpenCL implementation"
|
||||||
depends="ocl-icd"
|
depends="ocl-icd"
|
||||||
|
conflicts="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*"
|
||||||
|
|
Loading…
Reference in New Issue