Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[openvr] Update to 1.12.5 #12219

Merged
merged 5 commits into from
Jul 6, 2020
Merged

[openvr] Update to 1.12.5 #12219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ad6e6f
[openvr] Update to 1.12.5
RT2Code Jul 2, 2020
aa222ad
[openvr] Fix static build faillure
RT2Code Jul 2, 2020
f05fcc9
[openvr] revert aa222ad9f8fdc040dc5929138d9ed3c09ca215cd
RT2Code Jul 2, 2020
4b5b739
[openvr] update ci.baseline.txt
RT2Code Jul 3, 2020
fa7db12
Merge branch 'master' into openvr
RT2Code Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/openvr/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: openvr
Version: 1.10.30
Version: 1.12.5
Homepage: https://github.com/ValveSoftware/openvr
Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
Supports: !(arm|uwp|osx|android)
9 changes: 4 additions & 5 deletions ports/openvr/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx")
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ValveSoftware/openvr
REF 26fa19eb86ab3c589af2bdbc77449d61a8ff799b # v1.10.30
SHA512 821e113c6a847a244cd138869b5c8192c67054e6b8d39c0764d4e88f7a839146e9d9ec1f189cd5566f8954ad07ee0c86cbf8d353806c9bceb0f0a45def1a0ca2
REF 3a010f0f668d8de59fcba75b14e08a6a08ec68a0 # v1.12.5
SHA512 a96b8d4bceb23cea64b8f276a4ec70a5ac2a09ec317da37561bf55527bbf3dda2423b4f7323ed93301384c387061498f6089ae1ef50ad6ff77f46f0af662ccd3
HEAD_REF master
)

set(VCPKG_LIBRARY_LINKAGE dynamic)

if(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(ARCH_PATH "win64")
Expand Down Expand Up @@ -38,4 +37,4 @@ file(COPY ${SOURCE_PATH}/bin/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/d

file(INSTALL ${SOURCE_PATH}/headers DESTINATION ${CURRENT_PACKAGES_DIR} RENAME include)

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
3 changes: 2 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,7 @@ openvr:arm64-windows=fail
openvr:arm-uwp=fail
openvr:x64-osx=fail
openvr:x64-uwp=fail
openvr:x64-windows-static=fail
openxr-loader:arm64-windows=fail
openxr-loader:arm-uwp=fail
openxr-loader:x64-osx=fail
Expand Down Expand Up @@ -1950,4 +1951,4 @@ ctp:x64-windows=skip
ctp:x64-windows-static=skip
ctp:x86-windows=skip
protozero:arm-uwp=fail
protozero:x64-uwp=fail
protozero:x64-uwp=fail