[openxr-loader] Update to 1.0.18 (#19574)

6 files changed, 40 insertions, 46 deletions

diff --git a/ports/openxr-loader/001-fix-array-decl.patch b/ports/openxr-loader/001-fix-array-decl.patch
deleted file mode 100644
index 9bd25eb31..000000000
--- a/ports/openxr-loader/001-fix-array-decl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- openxr.hpp	2020-08-16 14:42:30.845279600 -0700
-+++ openxr.hpp	2020-08-16 14:45:19.707229200 -0700
-@@ -18249,9 +18249,9 @@
-    public:
-         // ctor
-               SpatialGraphNodeSpaceCreateInfoMSFT (
--                  const SpatialGraphNodeTypeMSFT& nodeType_ = {},
--                  uint8_t nodeId[16]_ = 0,
--                  const Posef& pose_ = {}
-+                  const SpatialGraphNodeTypeMSFT& nodeType_,
-+                  uint8_t nodeId_[16],
-+                  const Posef& pose_
-                   )
-             :
- 
-@@ -18259,9 +18259,9 @@
-               ) ,
- 
-               nodeType {nodeType_} ,
--              nodeId {nodeId_} ,
-               pose {pose_} 
-         {
-+            memcpy(nodeId, nodeId_, 16);
-         }
-         operator const XrSpatialGraphNodeSpaceCreateInfoMSFT&() const { return *reinterpret_cast<const XrSpatialGraphNodeSpaceCreateInfoMSFT*>(this); }
-         operator XrSpatialGraphNodeSpaceCreateInfoMSFT &() {
diff --git a/ports/openxr-loader/002-fix-hpp-gen.patch b/ports/openxr-loader/002-fix-hpp-gen.patch
new file mode 100644
index 000000000..9f58f7626
--- /dev/null
+++ b/ports/openxr-loader/002-fix-hpp-gen.patch
@@ -0,0 +1,16 @@
+diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py
+index 6b95fe4..3a19058 100755
+--- a/scripts/hpp_genxr.py
++++ b/scripts/hpp_genxr.py
+@@ -80,6 +80,11 @@ def genTarget(args):
+             "XR_MSFT_controller_model",
+             # Projection of static string fails
+             "XR_MSFT_spatial_graph_bridge",
++            "XR_MSFT_spatial_anchor_persistence",
++            "XR_MSFT_holographic_window_attachment",
++            # Projection of UuidMSFT fails
++            "XR_MSFT_scene_understanding",
++            "XR_MSFT_scene_understanding_serialization",
+         ))
+ 
+     # Turn lists of names/patterns into matching regular expressions
diff --git a/ports/openxr-loader/CONTROL b/ports/openxr-loader/CONTROL
index 06e6273c7..12cfd6a2c 100644
--- a/ports/openxr-loader/CONTROL
+++ b/ports/openxr-loader/CONTROL
@@ -1,5 +1,5 @@
 Source: openxr-loader
-Version: 1.0.11
+Version: 1.0.18
 Port-Version: 1
 Description: Khronos API for abstracting VR/MR/AR hardware
 Build-Depends: jsoncpp
diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake
index f68094d18..c3046fdf9 100644
--- a/ports/openxr-loader/portfile.cmake
+++ b/ports/openxr-loader/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/OpenXR-SDK
-    REF e3a4e41d61544d8e2eba73f00da99b6818ec472b
-    SHA512 26c6b547aa30d89895efcc835dddc3b58ab57f0e450a4ae82655a990a816dd57c70e43267a10da75b1c2bd160189942e443c8e27367d6648417d1c9c134e7694
+    REF 960c4a6aa8cc9f47e357c696b5377d817550bf88
+    SHA512 515494520a31491587418ab6cb1b28333481e0a20cb25d3f9bc875ac211faf1636641afdfee2ecdf816ea1222305ea52565992953b3bab68fffe40fa25e23145
     HEAD_REF master
     PATCHES
         fix-openxr-sdk-jsoncpp.patch
@@ -13,8 +13,8 @@ vcpkg_from_github(
 vcpkg_from_github(
     OUT_SOURCE_PATH SDK_SOURCE_PATH
     REPO KhronosGroup/OpenXR-SDK-Source
-    REF 6dee6e228f47857adf5d7673eb90c64f04d33c60
-    SHA512 0c522eef95b4d8bdc8e4f1ca852cd9798ff2bca9ef8511446d9cdf80bc314b0da454ab5c203658bbe43d3e7ff3d757b9427c3f75829b2a022a25041d1a2d2b12
+    REF 09cbbc9d3bc540a53d5f2d76b8074ddc0b96e933
+    SHA512 1fc777d7aaea585dd8e9f9ac60a71a7eb55017183f33e51f987b94af6bba8d7808771abf9fc377c6e2b613f282db08a095595b4bc6899d4eaa6eabb45405dc1b
     HEAD_REF master
     PATCHES
         fix-openxr-sdk-jsoncpp.patch
@@ -23,9 +23,11 @@ vcpkg_from_github(
 vcpkg_from_github(
     OUT_SOURCE_PATH HPP_SOURCE_PATH
     REPO KhronosGroup/OpenXR-hpp
-    REF 097a7535563fc84bb7648ea9c5a4531a1e909458
-    SHA512 fe953405724e9c4a8218cd269a23317ebc8164330a519eb82de75e832bc05e2c51d24bca24e4ce13724bf275c33b26f6646e25f29eeffe6840ffc552f3351ad0
+    REF 6fcea9e472622c9c7f4df0b5f0bfe7ff5d8553f7
+    SHA512 04d1f9db6fd0a01cdf3274089ab17bf17974ff799b4690561c16067e83710e1422a2aefd070b26023ff832eb58e6a3365297a818c9546ea4c531328bd1fb2de4
     HEAD_REF master
+    PATCHES
+        002-fix-hpp-gen.patch
 )
 
 # Weird behavior inside the OpenXR loader.  On Windows they force shared libraries to use static crt, and
@@ -56,19 +58,16 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+# Generate the OpenXR C++ bindings 
 set(ENV{OPENXR_REPO} ${SDK_SOURCE_PATH})
-
-vcpkg_execute_required_process(
-    COMMAND ${PYTHON3} ${HPP_SOURCE_PATH}/scripts/hpp_genxr.py -registry ${SDK_SOURCE_PATH}/specification/registry/xr.xml -o ${CURRENT_PACKAGES_DIR}/include/openxr openxr.hpp
-    WORKING_DIRECTORY ${HPP_SOURCE_PATH}
-    LOGFILE openxrhpp
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include/openxr
-    PATCHES
-        001-fix-array-decl.patch
-)
+file(STRINGS ${HPP_SOURCE_PATH}/headers.txt HEADER_LIST REGEX "^openxr.*")
+foreach(HEADER ${HEADER_LIST})
+    vcpkg_execute_required_process(
+        COMMAND ${PYTHON3} ${HPP_SOURCE_PATH}/scripts/hpp_genxr.py -registry ${SDK_SOURCE_PATH}/specification/registry/xr.xml -o ${CURRENT_PACKAGES_DIR}/include/openxr ${HEADER}
+        WORKING_DIRECTORY ${HPP_SOURCE_PATH}
+        LOGNAME openxrhpp
+    )
+endforeach()
 
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/OpenXR)
diff --git a/versions/baseline.json b/versions/baseline.json
index 123b7a950..c443aaa5c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4741,7 +4741,7 @@
       "port-version": 0
     },
     "openxr-loader": {
-      "baseline": "1.0.11",
+      "baseline": "1.0.18",
       "port-version": 1
     },
     "optional-bare": {
diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json
index 633b80825..66251650c 100644
--- a/versions/o-/openxr-loader.json
+++ b/versions/o-/openxr-loader.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "6674369c2498960b44d097881c3573857a7da92e",
+      "version-string": "1.0.18",
+      "port-version": 1
+    },
+    {
       "git-tree": "0ba3ab397dde99a678c135d6fd91e42966bf8d88",
       "version-string": "1.0.11",
       "port-version": 1