fix

2 files changed, 9 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a7b96e265a4..16f871dc6a3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,8 @@ pkgbase = osvr-steamvr-git
 	makedepends = cmake
 	depends = osvr-core-git
 	depends = openvr-git
-	depends = osvr-display-git
+	depends = osvr-rendermanager-git
+	conflicts = osvr-display-git
 	source = osvr-steamvr::git+https://github.com/OSVR/SteamVR-OSVR.git
 	source = Findjsoncpp.cmake
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 22200f38e3b5..51943edd3fca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,8 @@ url="https://github.com/OSVR/SteamVR-OSVR"
 #license=('GPL')
 install=osvr-steamvr.install
 makedepends=('git' 'cmake')
-depends=('osvr-core-git' 'openvr-git' 'osvr-display-git') #TODO: add more deps
+depends=('osvr-core-git' 'openvr-git' 'osvr-rendermanager-git') #TODO: add more deps
+conflicts=('osvr-display-git')
 source=("osvr-steamvr::git+https://github.com/OSVR/SteamVR-OSVR.git" #TODO: remove when it is merged
     "Findjsoncpp.cmake")
 
@@ -23,6 +24,11 @@ prepare() {
   cd osvr-steamvr
   git submodule update --init --recursive
 
+#https://github.com/OSVR/SteamVR-OSVR/pull/108
+sed 's!osvr/display/Display.h!osvr/Display/Display.h!g' -i src/OSVRDisplay.h
+sed 's!osvr/display/Display.h!osvr/Display/Display.h!g' -i src/OSVRDisplay.cpp
+sed 's!osvr/display/DisplayIO.h!osvr/Display/DisplayIO.h!g' -i src/OSVRDisplay.cpp
+
   mkdir -p "$srcdir/osvr-steamvr-build"
   cp "$srcdir/Findjsoncpp.cmake" "$srcdir/osvr-steamvr/cmake"
 }