summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Haag2021-03-15 01:11:37 +0100
committerChristoph Haag2021-03-15 01:11:37 +0100
commit084d333e20d0324a29343e82e678347a1562369e (patch)
tree2ebc68a543db578b065f684a1b6befa2253b4da4
parent7fc22be4d823ac8e9a01bdd2b6b5d10c7b762dbd (diff)
downloadaur-084d333e20d0324a29343e82e678347a1562369e.tar.gz
conflict with openvr
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e679a0fba61..abb2a96e8c68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,6 +15,7 @@ pkgbase = openvr-git
depends = jsoncpp
optdepends = steam: SteamVR must be installed through Steam, also contains vive udev rules
provides = openvr
+ conflicts = openvr
options = !strip
source = git+https://github.com/ValveSoftware/openvr.git
source = 0001-openvr_capi-Add-pragma-pack-around-VRControllerState.patch
diff --git a/PKGBUILD b/PKGBUILD
index 5a1c900c37ac..5f7f96d76d67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,6 +9,7 @@ depends=('libgl' 'sdl2' 'glew' 'jsoncpp')
optdepends=('steam: SteamVR must be installed through Steam, also contains vive udev rules')
makedepends=('git' 'cmake' 'vulkan-headers' 'qt5-base') #qt5 for the overlayexample
provides=("openvr")
+conflicts=("openvr")
options=('!strip')
source=("git+https://github.com/ValveSoftware/openvr.git"