[openxr-loader,qtquick3d] Fix installation order quirks (#46436)

ports/openxr-loader/portfile.cmake

@@ -19,6 +19,11 @@ vcpkg_from_github(
         python3_8_compatibility.patch
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        vulkan  VCPKG_LOCK_FIND_PACKAGE_Vulkan
+)
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DYNAMIC_LOADER)
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -26,12 +31,12 @@ vcpkg_find_acquire_program(PYTHON3)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${FEATURE_OPTIONS}
         -DBUILD_API_LAYERS=OFF
         -DBUILD_CONFORMANCE_TESTS=OFF
         -DBUILD_TESTS=OFF
         -DCMAKE_INSTALL_INCLUDEDIR=include
         -DDYNAMIC_LOADER=${DYNAMIC_LOADER}
-        "-DPYTHON_EXECUTABLE=${PYTHON3}"
         "-DPython3_EXECUTABLE=${PYTHON3}"
 )
 

ports/openxr-loader/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "openxr-loader",
   "version": "1.1.45",
+  "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",

ports/qtquick3d/android-openxr-vulkan.diff

@@ -0,0 +1,15 @@
+diff --git a/src/xr/quick3dxr/openxr/qquick3dxrmanager_openxr.cpp b/src/xr/quick3dxr/openxr/qquick3dxrmanager_openxr.cpp
+index f0d2963..8db003b 100644
+--- a/src/xr/quick3dxr/openxr/qquick3dxrmanager_openxr.cpp
++++ b/src/xr/quick3dxr/openxr/qquick3dxrmanager_openxr.cpp
+@@ -2036,8 +2036,10 @@ XrResult QQuick3DXrManagerPrivate::createXrInstance()
+ 
+     auto graphicsAPI = QQuickWindow::graphicsApi();
+     if (graphicsAPI == QSGRendererInterface::Vulkan) {
++#ifdef XR_USE_GRAPHICS_API_VULKAN
+         if (isExtensionSupported(XR_FB_SWAPCHAIN_UPDATE_STATE_VULKAN_EXTENSION_NAME, extensionProperties))
+             enabledExtensions.append(XR_FB_SWAPCHAIN_UPDATE_STATE_VULKAN_EXTENSION_NAME);
++#endif
+     } else if (graphicsAPI == QSGRendererInterface::OpenGL) {
+         if (isExtensionSupported(XR_FB_SWAPCHAIN_UPDATE_STATE_OPENGL_ES_EXTENSION_NAME, extensionProperties))
+             enabledExtensions.append(XR_FB_SWAPCHAIN_UPDATE_STATE_OPENGL_ES_EXTENSION_NAME);

ports/qtquick3d/portfile.cmake

@@ -1,5 +1,8 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
-set(${PORT}_PATCHES 0001-devendor-meshoptimizer.patch)
+set(${PORT}_PATCHES
+    0001-devendor-meshoptimizer.patch
+    android-openxr-vulkan.diff
+)
 
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 

ports/qtquick3d/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "qtquick3d",
   "version": "6.8.3",
+  "port-version": 1,
   "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,

scripts/ci.feature.baseline.txt

@@ -415,7 +415,6 @@ qt5-webengine(!(arm & windows) & !uwp) = fail # Missing prerequisites for CI suc
 qt5-x11extras(osx)=fail # Missing system libraries
 qt5-x11extras(windows)=fail # Missing libraries
 qtmultimedia(android)=fail
-qtquick3d(android)=fail
 qtvirtualkeyboard[t9write] = skip # depends on the port 't9write' that does not exists
 qtwayland(android | osx)=fail # Missing system libraries
 qwt-qt6:x64-osx=fail

versions/baseline.json

@@ -7102,7 +7102,7 @@
     },
     "openxr-loader": {
       "baseline": "1.1.45",
-      "port-version": 0
+      "port-version": 1
     },
     "optimus-cpp": {
       "baseline": "0.3.0",
@@ -8014,7 +8014,7 @@
     },
     "qtquick3d": {
       "baseline": "6.8.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qtquick3dphysics": {
       "baseline": "6.8.3",

versions/o-/openxr-loader.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3b47fb6babbac5b293d473f955337cc170e3e8a1",
+      "version": "1.1.45",
+      "port-version": 1
+    },
     {
       "git-tree": "fc57b91bda0eb17a4f5902c2029bd9a9d7f28a05",
       "version": "1.1.45",

versions/q-/qtquick3d.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec9f37be62615a932d10fd6cf5fc512282f35b07",
+      "version": "6.8.3",
+      "port-version": 1
+    },
     {
       "git-tree": "fd5155e24d32095ef64e575516e488a1a56a3537",
       "version": "6.8.3",