Update OpenXR to 1.0 (#7488)

5 files changed, 4 insertions, 98 deletions

diff --git a/ports/openxr-loader/0001-fix-embedded-python-path.patch b/ports/openxr-loader/0001-fix-embedded-python-path.patch
deleted file mode 100644
index 3fe7e61e8..000000000
--- a/ports/openxr-loader/0001-fix-embedded-python-path.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/specification/scripts/genxr.py b/specification/scripts/genxr.py

-index 906c044..b0a414f 100755

---- a/specification/scripts/genxr.py

-+++ b/specification/scripts/genxr.py

-@@ -17,6 +17,12 @@

- import argparse

- import re

- import sys

-+import os

-+

-+base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))

-+sys.path.append(os.path.join(base_dir, 'src', 'scripts'))

-+sys.path.append(os.path.join(base_dir, 'specification', 'scripts'))

-+

- import time

- import xml.etree.ElementTree as etree

- 

-diff --git a/src/scripts/src_genxr.py b/src/scripts/src_genxr.py

-index 960b6cd..6f49296 100755

---- a/src/scripts/src_genxr.py

-+++ b/src/scripts/src_genxr.py

-@@ -14,7 +14,12 @@

- # See the License for the specific language governing permissions and

- # limitations under the License.

- 

--import argparse, cProfile, pdb, string, sys, time

-+import argparse, cProfile, pdb, string, sys, time, os

-+

-+base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))

-+sys.path.append(os.path.join(base_dir, 'src', 'scripts'))

-+sys.path.append(os.path.join(base_dir, 'specification', 'scripts'))

-+

- from reg import *

- from generator import write

- from cgenerator import CGeneratorOptions, COutputGenerator

diff --git a/ports/openxr-loader/0002-fix-linux-pkgconfig-dependency.patch b/ports/openxr-loader/0002-fix-linux-pkgconfig-dependency.patch
deleted file mode 100644
index 3f9cbc328..000000000
--- a/ports/openxr-loader/0002-fix-linux-pkgconfig-dependency.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/cmake/presentation.cmake b/src/cmake/presentation.cmake
-index 3970546..c2e7bc3 100644
---- a/src/cmake/presentation.cmake
-+++ b/src/cmake/presentation.cmake
-@@ -12,21 +12,17 @@ endif()
- 
- message(STATUS "Using presentation backend: ${PRESENTATION_BACKEND}")
- 
--find_package(PkgConfig REQUIRED)
- 
- if( PRESENTATION_BACKEND MATCHES "xlib" )
--    pkg_search_module(X11 REQUIRED x11)
--    pkg_search_module(XXF86VM REQUIRED xxf86vm)
--    pkg_search_module(XRANDR REQUIRED xrandr)
--
-     add_definitions( -DSUPPORT_X )
-     add_definitions( -DOS_LINUX_XLIB )
-     set( XLIB_LIBRARIES
--            ${X11_LIBRARIES}
--            ${XXF86VM_LIBRARIES}
--            ${XRANDR_LIBRARIES} )
-+            X11
-+            Xxf86vm
-+            Xrandr)
- 
- elseif( PRESENTATION_BACKEND MATCHES "xcb" )
-+    find_package(PkgConfig REQUIRED)
-     # XCB + XCB GLX is limited to OpenGL 2.1
-     # add_definitions( -DOS_LINUX_XCB )
-     # XCB + Xlib GLX 1.3
-@@ -49,6 +45,7 @@ elseif( PRESENTATION_BACKEND MATCHES "xcb" )
-             ${X11_LIBRARIES} )
- 
- elseif( PRESENTATION_BACKEND MATCHES "wayland" )
-+    find_package(PkgConfig REQUIRED)
-     pkg_search_module(WAYLAND_CLIENT REQUIRED wayland-client)
-     pkg_search_module(WAYLAND_EGL REQUIRED wayland-egl)
-     pkg_search_module(WAYLAND_SCANNER REQUIRED wayland-scanner)
diff --git a/ports/openxr-loader/0003-windows-path-python-fix.patch b/ports/openxr-loader/0003-windows-path-python-fix.patch
deleted file mode 100644
index a68f87722..000000000
--- a/ports/openxr-loader/0003-windows-path-python-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/specification/scripts/generator.py b/specification/scripts/generator.py
-index d6a1afe..5f9d0b6 100644
---- a/specification/scripts/generator.py
-+++ b/specification/scripts/generator.py
-@@ -516,9 +516,10 @@ class OutputGenerator:
-         # Generator can be used without writing to a file.
-         if self.genOpts.filename is not None:
-             if sys.platform == 'win32':
--                directory = Path(self.genOpts.directory)
-+                directory = self.genOpts.directory
-                 if not os.path.exists(directory):
-                     os.makedirs(directory)
--                self.outFile = io.open(directory / self.genOpts.filename, 'w', encoding='utf-8')
-+                self.outFile = io.open(directory + '/' + self.genOpts.filename, 'w', encoding='utf-8')
-             else:
-                 filename = self.genOpts.directory + '/' + self.genOpts.filename
diff --git a/ports/openxr-loader/CONTROL b/ports/openxr-loader/CONTROL
index 7fd84105b..025b15f80 100644
--- a/ports/openxr-loader/CONTROL
+++ b/ports/openxr-loader/CONTROL
@@ -1,5 +1,5 @@
 Source: openxr-loader
-Version: 0.90.1-1
+Version: 1.0.0-1
 Description: Khronos API for abstracting VR/MR/AR hardware
 
 Feature: vulkan
diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake
index c1de0d142..70c6dc688 100644
--- a/ports/openxr-loader/portfile.cmake
+++ b/ports/openxr-loader/portfile.cmake
@@ -12,16 +12,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/OpenXR-SDK
-    REF release-0.90.1
-    SHA512 99b16b52511fef740fa7a1e234213310a4490b8d7baf4d1e003b93cf4f37b28abf526f6ed2d1e27e9ee2b4949b1957f15c20d4e0f8d30687806fe782780697af
+    REF release-1.0.0
+    SHA512 423079b841a01f3b51283839c565cfa1b8ff38348c3f3d6f62e9120569d4ad540d8d6bfe8010e74d9bbb76aeaedcf273e5e3b1717bb0b424898793fb4712aa58
     HEAD_REF master
     PATCHES
-        # embedded python uses ignores PYTHONPATH
-        0001-fix-embedded-python-path.patch
-        # Pkg-config is not available on the Vcpkg CI systems, don't depend on it for the xlib backend
-        0002-fix-linux-pkgconfig-dependency.patch
-        # Python < 3.6 doesn't allow a WindowsPath object to act as a pathlike in os.path functions
-        0003-windows-path-python-fix.patch
         0004-fix-fatal-errorC1189.patch
 )
 
@@ -45,6 +39,7 @@ vcpkg_configure_cmake(
     OPTIONS
         -DBUILD_API_LAYERS=OFF
         -DBUILD_TESTS=OFF
+        -DBUILD_CONFORMANCE_TESTS=OFF
         -DDYNAMIC_LOADER=${DYNAMIC_LOADER}
         -DPYTHON_EXECUTABLE=${PYTHON3}
 )