summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Stryker2018-11-14 16:45:56 -0500
committerJason Stryker2018-11-14 16:45:56 -0500
commitac92350fd8540d75a6d6a49373529a31ffcfd77f (patch)
tree3bd671b8850aa9cccae0f9ce6495565804bb11ac
parentbba4ed7dd6168a7815eaec3dda7f6aecc3e5da8f (diff)
downloadaur-ac92350fd8540d75a6d6a49373529a31ffcfd77f.tar.gz
conflict with lib32-opencl-nvidia-390xx
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 26620007a66..7802bd2e7a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -91,4 +91,5 @@ pkgname = lib32-opencl-nvidia-vulkan
provides = lib32-opencl-driver
provides = lib32-opencl-nvidia=396.54.09
conflicts = lib32-opencl-nvidia
+ conflicts = lib32-opencl-nvidia-390xx
diff --git a/PKGBUILD b/PKGBUILD
index 27973546458..6e394ca04bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -262,7 +262,7 @@ package_lib32-opencl-nvidia-vulkan() {
depends=('lib32-zlib' 'lib32-gcc-libs')
optdepends=('opencl-headers: headers necessary for OpenCL development')
provides=('lib32-opencl-driver' "lib32-opencl-nvidia=${pkgver}")
- conflicts=('lib32-opencl-nvidia')
+ conflicts=('lib32-opencl-nvidia' 'lib32-opencl-nvidia-390xx')
cd "${_pkg}"/32