From 2ad6e6f4c71cdf69246794eeb181b238c0dc1751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 2 Jul 2020 17:06:02 +0200 Subject: [PATCH 1/4] [openvr] Update to 1.12.5 https://github.com/ValveSoftware/openvr/releases/tag/v1.12.5 --- ports/openvr/CONTROL | 2 +- ports/openvr/portfile.cmake | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL index ada8687b5f8b82..bf99e3907e77db 100644 --- a/ports/openvr/CONTROL +++ b/ports/openvr/CONTROL @@ -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) \ No newline at end of file diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 0fb02dde1e2270..e2131e6f994bc0 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -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") From aa222ad9f8fdc040dc5929138d9ed3c09ca215cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 2 Jul 2020 19:03:32 +0200 Subject: [PATCH 2/4] [openvr] Fix static build faillure --- ports/openvr/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index e2131e6f994bc0..4612ff0235f827 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(VCPKG_LIBRARY_LINKAGE dynamic) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -37,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) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From f05fcc92f55e846262f325b719755ec712fe584d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 2 Jul 2020 23:11:27 +0200 Subject: [PATCH 3/4] [openvr] revert aa222ad9f8fdc040dc5929138d9ed3c09ca215cd --- ports/openvr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 4612ff0235f827..207bd0f0144a25 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") -set(VCPKG_LIBRARY_LINKAGE dynamic) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From 4b5b7399748dc969364ce0de58174930a2ceae3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 3 Jul 2020 09:21:26 +0200 Subject: [PATCH 4/4] [openvr] update ci.baseline.txt --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 13a6e9943baa5b..a745b7905c4a32 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1357,6 +1357,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