summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhowetuft2021-04-05 11:37:31 +0200
committerhowetuft2021-04-05 11:37:31 +0200
commitf360c647c65266f32229191d3de1eb50bfb03b67 (patch)
tree6f872079f4b3085e7864be9cb029af9534b63852
parent45f8d3d1c5cfdf5ed018e22ff556b6bfc0b7bc43 (diff)
downloadaur-f360c647c65266f32229191d3de1eb50bfb03b67.tar.gz
Update conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 914ef01bc6a8..c33bd4432dd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,7 @@ pkgbase = ospray-git
depends = openvkl
depends = openimagedenoise
provides = ospray=2.5.0
+ conflicts = ospray
source = https://github.com/ospray/OSPRay/archive/v2.5.0/ospray-git-2.5.0.tar.gz
sha256sums = 074bfd83b5a554daf8da8d9b778b6ef1061e54a1688eac13e0bdccf95593883d
diff --git a/PKGBUILD b/PKGBUILD
index 5d22f655fe63..a9eb8dc349d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,6 +13,7 @@ makedepends=(cmake ispc)
source=("https://github.com/ospray/OSPRay/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha256sums=('074bfd83b5a554daf8da8d9b778b6ef1061e54a1688eac13e0bdccf95593883d')
provides=('ospray=2.5.0')
+conflicts=(ospray)
prepare() {
mkdir -p build