[vcpkg baseline][qtquick3d,openxr-loader] Fix config, control depende…

…ncy (#42588)
microsoft · Dec 9, 2024 · 061862c · 061862c
1 parent aafb8b7
commit 061862c
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 33 deletions.
diff --git a/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch b/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch
@@ -1,8 +1,8 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c75b145..386494c 100644
+index e618325..21d977f 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -89,7 +89,7 @@ if(NOT VULKAN_INCOMPATIBLE)
+@@ -107,7 +107,7 @@ if(NOT VULKAN_INCOMPATIBLE)
  endif()
 
  find_package(Threads REQUIRED)
@@ -11,3 +11,15 @@ index c75b145..386494c 100644
 
  ### All options defined here
  option(BUILD_LOADER "Build loader" ON)
+diff --git a/src/loader/OpenXRConfig.cmake.in b/src/loader/OpenXRConfig.cmake.in
+index 81b12e7..4c24771 100644
+--- a/src/loader/OpenXRConfig.cmake.in
++++ b/src/loader/OpenXRConfig.cmake.in
+@@ -6,6 +6,7 @@
+
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
++find_dependency(jsoncpp CONFIG)
+
+ include("${CMAKE_CURRENT_LIST_DIR}/OpenXRTargets.cmake")
+
diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake
@@ -1,25 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO KhronosGroup/OpenXR-SDK
-    REF "release-${VERSION}"
-    SHA512 cfcabbd130f89d1d46899f3a9a34e9b5d9b21903b6d0fc48c62e233401cf200107a9fa8da926fc0036937a9ed647a2376bee58db925654c41acc7580f8f3a053
-    HEAD_REF master
-    PATCHES
-        fix-openxr-sdk-jsoncpp.patch
-        msvc-crt.diff
-)
-file(GLOB gl_headers "${SOURCE_PATH}/external/include/GL/*")
-list(REMOVE_ITEM gl_headers "${SOURCE_PATH}/external/include/gl_format.h")
-file(REMOVE ${gl_headers})
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SDK_SOURCE_PATH
     REPO KhronosGroup/OpenXR-SDK-Source
     REF "release-${VERSION}"
     SHA512 c2cfab927e6ff8a5a7b90360c99192ae9cd598614965fbd4816361b19c5bf25e5524f0e73ce56774e32903addbce8a8dbcb9520203f845421d33cb33f832977b
     HEAD_REF master
     PATCHES
         fix-openxr-sdk-jsoncpp.patch
+        msvc-crt.diff
 )
 
 vcpkg_from_github(
@@ -51,21 +38,25 @@ vcpkg_cmake_install()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
+# "openxr-loader" matches "<name>*" for "OpenXR", so use the default.
 if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_cmake_config_fixup(PACKAGE_NAME openxr CONFIG_PATH cmake)
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 else()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME openxr CONFIG_PATH lib/cmake/openxr)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/openxr)
 endif()
 
 # Generate the OpenXR C++ bindings
-set(ENV{OPENXR_REPO} "${SDK_SOURCE_PATH}")
+set(ENV{OPENXR_REPO} "${SOURCE_PATH}")
 vcpkg_execute_required_process(
-    COMMAND "${PYTHON3}" "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -quiet  -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr"
+    COMMAND "${PYTHON3}" "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -quiet  -registry "${SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr"
     WORKING_DIRECTORY "${HPP_SOURCE_PATH}"
     LOGNAME "openxr-hpp"
 )
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/share/doc"
+)
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "openxr-loader",
   "version": "1.0.34",
+  "port-version": 1,
   "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices",
   "homepage": "https://github.com/KhronosGroup/OpenXR-SDK",
   "license": "Apache-2.0",
-  "supports": "!uwp & !osx",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "egl",

diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt",
   "version": "6.8.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A cross-platform application and UI framework.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -205,6 +205,13 @@
           ],
           "platform": "windows"
         },
+        {
+          "name": "qtquick3d",
+          "features": [
+            "openxr"
+          ],
+          "platform": "!uwp"
+        },
         {
           "name": "qtwayland",
           "features": [

diff --git a/ports/qtquick3d/portfile.cmake b/ports/qtquick3d/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 FEATURES
     "assimp"  FEATURE_quick3d_assimp
     #"assimp"  CMAKE_REQUIRE_FIND_PACKAGE_WrapQuick3DAssimp
+    "openxr"  FEATURE_quick3dxr_openxr
 INVERTED_FEATURES
     "assimp"  CMAKE_DISABLE_FIND_PACKAGE_WrapQuick3DAssimp
     )

diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtquick3d",
   "version": "6.8.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Quick 3D provides a high-level API for creating 3D content and 3D user interfaces based on Qt Quick.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -23,18 +23,18 @@
     "qtquicktimeline",
     "qtshadertools"
   ],
-  "default-features": [
-    "default-features"
-  ],
   "features": {
     "assimp": {
       "description": "assimp",
       "dependencies": [
         "assimp"
       ]
     },
-    "default-features": {
-      "description": "Platform-dependent default features"
+    "openxr": {
+      "description": "OpenXR support",
+      "dependencies": [
+        "openxr-loader"
+      ]
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6790,7 +6790,7 @@
     },
     "openxr-loader": {
       "baseline": "1.0.34",
-      "port-version": 0
+      "port-version": 1
     },
     "optimus-cpp": {
       "baseline": "0.3.0",
@@ -7358,7 +7358,7 @@
     },
     "qt": {
       "baseline": "6.8.0",
-      "port-version": 1
+      "port-version": 2
     },
     "qt-advanced-docking-system": {
       "baseline": "4.3.1",
@@ -7646,7 +7646,7 @@
     },
     "qtquick3d": {
       "baseline": "6.8.0",
-      "port-version": 1
+      "port-version": 2
     },
     "qtquick3dphysics": {
       "baseline": "6.8.0",

diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "99e60fce9807f7ccd2e2b1be1e993dd5f3c98f05",
+      "version": "1.0.34",
+      "port-version": 1
+    },
     {
       "git-tree": "7ac79e9eb86bad29f5fc6d3f6f25389df13e5b9f",
       "version": "1.0.34",

diff --git a/versions/q-/qt.json b/versions/q-/qt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1e889e4d37a790d59b44e0dd16990f96aae9cb7b",
+      "version": "6.8.0",
+      "port-version": 2
+    },
     {
       "git-tree": "c35f477d2ccb76098f070d81c1c5fea927f82c1c",
       "version": "6.8.0",

diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "111fb04b5b7c6c17c730867e78152b4499ce545e",
+      "version": "6.8.0",
+      "port-version": 2
+    },
     {
       "git-tree": "fa68693ed85805d15372607e762b2fd23050ad38",
       "version": "6.8.0",