Added conflicts

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17c897418112..a509777da811 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vc4c-git
 	pkgdesc = Compiler for the VC4CL OpenCL-implementation
 	pkgver = 1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/doe300/VC4C
 	arch = any
 	license = MIT
@@ -16,6 +16,7 @@ pkgbase = vc4c-git
 	provides = opencl-pi
 	provides = opencl-vc4
 	provides = opencl-driver
+	conflicts = vc4clstdlib-git
 	source = VC4C.tar.gz::https://github.com/doe300/VC4C/archive/master.tar.gz
 	source = VC4CLStdLib.tar.gz::https://github.com/doe300/VC4CLStdLib/archive/master.tar.gz
 	source = auto_dummy.patch
diff --git a/PKGBUILD b/PKGBUILD
index 7f1371557414..c1725a0c24ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=vc4c-git
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Compiler for the VC4CL OpenCL-implementation"
 arch=('any')
 url="https://github.com/doe300/VC4C"
@@ -11,6 +11,7 @@ groups=()
 depends=('llvm' 'clinfo' 'ocl-icd')
 makedepends=('wget' 'gcc' 'cmake' 'clang' 'opencl-headers')
 optdepends=()
+conflicts=('vc4clstdlib-git')
 provides=('opencl-pi' 'opencl-vc4' 'opencl-driver')
 source=("VC4C.tar.gz::https://github.com/doe300/VC4C/archive/master.tar.gz" "VC4CLStdLib.tar.gz::https://github.com/doe300/VC4CLStdLib/archive/master.tar.gz" "auto_dummy.patch")
 md5sums=('SKIP' 'SKIP' 'e409cafcdc79aa53aef1484e53bd25e7')