diff options
author | Christoph Haag | 2019-06-07 07:56:15 +0200 |
---|---|---|
committer | Christoph Haag | 2019-06-07 07:59:07 +0200 |
commit | 2335bd3701b72e045cf1f97e5acbab67d6505faa (patch) | |
tree | cee442c45a63669ea7d4e7205a2d3ac6721fbdab | |
parent | c8b17fa3b6464cf84063168469c077bd27554e16 (diff) | |
download | aur-2335bd3701b72e045cf1f97e5acbab67d6505faa.tar.gz |
add patch to remove openvrpaths check
Not necessary to compile
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | remove-openvrpaths-check.diff | 20 |
3 files changed, 29 insertions, 6 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Thu Feb 21 12:26:51 UTC 2019 pkgbase = openvr-git pkgdesc = API and runtime that allows access to VR hardware from multiple vendors. Contains API and samples. The runtime is under SteamVR in Tools on Steam. - pkgver = 1.2.10.r1.gcdc39c0 + pkgver = 1.4.18.r0.g02bc73b pkgrel = 1 url = https://github.com/ValveSoftware/openvr arch = x86_64 @@ -22,9 +20,11 @@ pkgbase = openvr-git source = git+https://github.com/ValveSoftware/openvr.git source = https://github.com/ValveSoftware/openvr/commit/0fa21ba17748efcca1816536e27bdca70141b074.patch source = 0001-also-add-pragma-pack-around-VRControllerState_t.patch + source = remove-openvrpaths-check.diff md5sums = SKIP md5sums = 7350517830b1a0038d30c6ad33b4bb39 md5sums = 8a9379f8cdf9a38f21942f46378714a5 + md5sums = 904a532900792e7273702a9b45d304f2 pkgname = openvr-git @@ -1,5 +1,5 @@ pkgname=openvr-git -pkgver=1.2.10.r1.gcdc39c0 +pkgver=1.4.18.r0.g02bc73b pkgrel=1 pkgdesc="API and runtime that allows access to VR hardware from multiple vendors. Contains API and samples. The runtime is under SteamVR in Tools on Steam." arch=('x86_64') @@ -15,10 +15,12 @@ options=('!strip' 'staticlibs') source=("git+https://github.com/ValveSoftware/openvr.git" 'https://github.com/ValveSoftware/openvr/commit/0fa21ba17748efcca1816536e27bdca70141b074.patch' - '0001-also-add-pragma-pack-around-VRControllerState_t.patch') + '0001-also-add-pragma-pack-around-VRControllerState_t.patch' + 'remove-openvrpaths-check.diff') md5sums=('SKIP' '7350517830b1a0038d30c6ad33b4bb39' - '8a9379f8cdf9a38f21942f46378714a5') + '8a9379f8cdf9a38f21942f46378714a5' + '904a532900792e7273702a9b45d304f2') pkgver() { cd "$srcdir/openvr" @@ -31,6 +33,7 @@ prepare() { cd "$srcdir/openvr" git apply ../0fa21ba17748efcca1816536e27bdca70141b074.patch #https://github.com/ValveSoftware/openvr/pull/594 git apply ../0001-also-add-pragma-pack-around-VRControllerState_t.patch + git apply ../remove-openvrpaths-check.diff } build() { diff --git a/remove-openvrpaths-check.diff b/remove-openvrpaths-check.diff new file mode 100644 index 000000000000..f7683dc7d8d6 --- /dev/null +++ b/remove-openvrpaths-check.diff @@ -0,0 +1,20 @@ +diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt +index a573f83..ae09188 100644 +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -48,15 +48,6 @@ endif() + set(THIRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) + set(SHARED_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/shared) + +-# Check that the steamVR SDK is installed +-# (needed to prevent a segfault in OpenVR). +-if(CMAKE_HOST_UNIX) +- find_file(OPENVRPATHS openvrpaths.vrpath PATHS $ENV{HOME}/.config/openvr "$ENV{HOME}/Library/Application Support/OpenVR/.openvr") +- if(${OPENVRPATHS} MATCHES OPENVRPATHS-NOTFOUND) +- message(FATAL_ERROR "${OPENVRPATHS} Please install SteamVR SDK to continue..") +- endif() +-endif() +- + # Default output directory. + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${ARCH_TARGET}) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${ARCH_TARGET}) |