Merge remote-tracking branch 'origin/main' into reinterop-exceptions

CesiumGS · Jan 31, 2025 · ddc0eba · ddc0eba
2 parents e75bc1c + 852ebae
commit ddc0eba
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 62 deletions.
diff --git a/native~/vcpkg/ports/ktx/0005-no-vendored-libs.patch b/native~/vcpkg/ports/ktx/0005-no-vendored-libs.patch
@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d7ca937..ffcbe95 100644
+index e99fb143..0f69adf7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1059,10 +1059,10 @@ endif()
- # except for building the ktx library.
+@@ -1071,10 +1071,10 @@ endif()
  if((KTX_FEATURE_TOOLS OR KTX_FEATURE_TESTS) AND NOT TARGET fmt::fmt)
+     set(FMT_INSTALL OFF)
      set(FMT_SYSTEM_HEADERS ON)
 -    add_subdirectory(other_projects/fmt)
 +    find_package(fmt CONFIG REQUIRED)

diff --git a/native~/vcpkg/ports/ktx/0006-fix-ios-install.patch b/native~/vcpkg/ports/ktx/0006-fix-ios-install.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e99fb143..072ea889 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -489,7 +489,7 @@ macro(common_libktx_settings target enable_write library_type)
+         CXX_STANDARD_REQUIRED YES
+
+     )
+-    if(IOS)
++    if(0)
+         set_target_properties(${target} PROPERTIES
+             FRAMEWORK TRUE
+         )
+@@ -1145,7 +1145,7 @@ endif()
+ # Use of this to install KHR/khr_df.h is due to CMake's failure to
+ # preserve the include source folder hierarchy.
+ # See https://gitlab.kitware.com/cmake/cmake/-/issues/16739.
+-if (IOS)
++if (0)
+     set_source_files_properties(
+           include/KHR/khr_df.h
+           PROPERTIES MACOSX_PACKAGE_LOCATION Headers/KHR
diff --git a/native~/vcpkg/ports/ktx/CESIUM-0002-not-a-framework.patch b/native~/vcpkg/ports/ktx/CESIUM-0002-not-a-framework.patch
diff --git a/native~/vcpkg/ports/ktx/CESIUM-0003-ios-normal-header-path.patch b/native~/vcpkg/ports/ktx/CESIUM-0003-ios-normal-header-path.patch
diff --git a/native~/vcpkg/ports/ktx/portfile.cmake b/native~/vcpkg/ports/ktx/portfile.cmake
@@ -1,18 +1,17 @@
-vcpkg_from_github(
+vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO KhronosGroup/KTX-Software
-    REF "v${VERSION}"
-    SHA512 5a89f8986464705ec36ac1becaddd0ff335e4c3c235468aaef0e963fcfeda4c0d669a086b91e61c16a3ae9e1fa5bf456dccf12cc65720e1a22e7cc0f30552541
-    HEAD_REF master
+    URL "https://github.com/KhronosGroup/KTX-Software.git"
+    REF 91ace88675ac59a97e55d0378a6602a9ae6b98bd
+    FETCH_REF "v${VERSION}"
+    HEAD_REF main
     PATCHES
         0001-Use-vcpkg-zstd.patch
         0002-Fix-versioning.patch
         0003-mkversion.patch
         0004-quirks.patch
         0005-no-vendored-libs.patch
+        0006-fix-ios-install.patch
         CESIUM-0001-do-not-define-_DEBUG.patch
-        CESIUM-0002-not-a-framework.patch
-        CESIUM-0003-ios-normal-header-path.patch
 )
 file(REMOVE "${SOURCE_PATH}/other_include/zstd_errors.h")
 
@@ -50,8 +49,6 @@ vcpkg_cmake_configure(
         -DKTX_FEATURE_STATIC_LIBRARY=${ENABLE_STATIC}
         ${FEATURE_OPTIONS}
         ${OPTIONS}
-        # Do not regenerate headers (needs more dependencies)
-        -DCMAKE_DISABLE_FIND_PACKAGE_Vulkan=1
     DISABLE_PARALLEL_CONFIGURE
 )
 

diff --git a/native~/vcpkg/ports/ktx/vcpkg.json b/native~/vcpkg/ports/ktx/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ktx",
-  "version-semver": "4.3.0-beta1",
-  "port-version": 1,
+  "version-semver": "4.3.2",
   "description": [
     "The Khronos KTX library and tools.",
     "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them."
@@ -23,7 +22,7 @@
   "features": {
     "tools": {
       "description": "Build tools",
-      "supports": "!android",
+      "supports": "!android & !uwp",
       "dependencies": [
         "cxxopts",
         "fmt"