[ktx] update to 4.0.0 release (#18644)

* [ktx] update to 4.0.0

* update version

* fix-arm64-error

* update version

* fix ci error

* update version

5 files changed, 114 insertions, 17 deletions

diff --git a/ports/ktx/0001-Use-vcpkg-zstd.patch b/ports/ktx/0001-Use-vcpkg-zstd.patch
index 9a39573bf..8dff4a59a 100644
--- a/ports/ktx/0001-Use-vcpkg-zstd.patch
+++ b/ports/ktx/0001-Use-vcpkg-zstd.patch
@@ -1,16 +1,108 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de38d5fe..1244ce55 100644
+index 0bdb708..356c160 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -283,9 +283,10 @@ macro(commom_lib_settings lib write )
+@@ -121,7 +121,6 @@ set(KTX_MAIN_SRC
+     lib/basisu/transcoder/basisu_transcoder.cpp
+     lib/basisu/transcoder/basisu_transcoder.h
+     lib/basisu/transcoder/basisu.h
+-    lib/basisu/zstd/zstd.c
+     lib/checkheader.c
+     lib/dfdutils/createdfd.c
+     lib/dfdutils/colourspaces.c
+@@ -227,7 +226,6 @@ macro(commom_lib_settings lib write)
+         $<INSTALL_INTERFACE:lib/basisu/transcoder>
+ 
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu/transcoder>
+-        $<INSTALL_INTERFACE:lib/basisu/zstd>
+ 
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
+         $<INSTALL_INTERFACE:other_include>
+@@ -309,6 +307,11 @@ macro(commom_lib_settings lib write)
      endif()
  
      if(WIN32)
 +        find_package(zstd CONFIG REQUIRED)
-         target_link_libraries(
-             ${lib}
--            ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/win/Release-x64/zstd_static.lib
++        target_link_libraries(
++            ${lib}
 +            $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
-         )
++        )        
          # By wrapping in generator expression we force multi configuration generators (like Visual Studio)
          # to take the exact path and not change it.
+         set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$<CONFIG>>)
+diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt
+index 78dd110..e155896 100644
+--- a/lib/basisu/CMakeLists.txt
++++ b/lib/basisu/CMakeLists.txt
+@@ -118,7 +118,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST}
+ 	)
+ 
+ if (ZSTD)
+-	set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c)
++	set(ZSTD_LIBRARIES "$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>")
+ endif()
+ 
+ if (APPLE)
+@@ -137,6 +137,10 @@ else()
+ 	target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
+ endif()
+ 
++if(ZSTD_LIBRARIES)
++    target_link_libraries(basisu ${ZSTD_LIBRARIES})
++endif()
++
+ if (NOT MSVC)
+    target_link_libraries(basisu m pthread)
+ endif()
+diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt
+index e365e1b..6e6a7a5 100644
+--- a/lib/basisu/webgl/encoder/CMakeLists.txt
++++ b/lib/basisu/webgl/encoder/CMakeLists.txt
+@@ -36,9 +36,7 @@ if (EMSCRIPTEN)
+   )
+ 
+   if (KTX2_ZSTANDARD)
+-  	set(SRC_LIST ${SRC_LIST}
+-		../../zstd/zstd.c
+-	)
++    set(ZSTD_LIBRARIES "$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>")
+ 	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1)
+   else()
+   	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0)
+@@ -58,6 +56,10 @@ if (EMSCRIPTEN)
+   
+   target_include_directories(basis_encoder.js PRIVATE ../../transcoder)
+ 
++  if(ZSTD_LIBRARIES)
++      target_link_libraries(basis_encoder.js ${ZSTD_LIBRARIES})
++  endif()
++  
+   set_target_properties(basis_encoder.js PROPERTIES
+       OUTPUT_NAME "basis_encoder"
+       SUFFIX ".js"
+diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt
+index 372653d..2e19ece 100644
+--- a/lib/basisu/webgl/transcoder/CMakeLists.txt
++++ b/lib/basisu/webgl/transcoder/CMakeLists.txt
+@@ -28,9 +28,7 @@ if (EMSCRIPTEN)
+   endif()
+   
+   if (KTX2_ZSTANDARD)
+- 	set(SRC_LIST ${SRC_LIST}
+-		../../zstd/zstddeclib.c
+-	)
++    set(ZSTD_LIBRARIES "$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>")
+ 	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1)
+   else()
+   	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0)
+@@ -44,7 +42,9 @@ if (EMSCRIPTEN)
+   target_compile_definitions(basis_transcoder.js PRIVATE NDEBUG BASISD_SUPPORT_UASTC=1 BASISD_SUPPORT_BC7=1 BASISD_SUPPORT_ATC=0 BASISD_SUPPORT_ASTC_HIGHER_OPAQUE_QUALITY=0 BASISD_SUPPORT_PVRTC2=0 BASISD_SUPPORT_FXT1=0 BASISD_SUPPORT_ETC2_EAC_RG11=0 BASISU_SUPPORT_ENCODING=0 ${KTX2_DEFINITION} ${ZSTD_DEFINITION} )
+   target_compile_options(basis_transcoder.js PRIVATE -O3 -fno-strict-aliasing)
+   target_include_directories(basis_transcoder.js PRIVATE ../../transcoder)
+-
++  if(ZSTD_LIBRARIES)
++      target_link_libraries(basis_transcoder.js ${ZSTD_LIBRARIES})
++  endif()
+   set_target_properties(basis_transcoder.js PROPERTIES
+       OUTPUT_NAME "basis_transcoder"
+       SUFFIX ".js"
diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake
index c5cbe1f99..8731a85b8 100644
--- a/ports/ktx/portfile.cmake
+++ b/ports/ktx/portfile.cmake
@@ -1,12 +1,12 @@
-vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86")

+vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm64")

 

-set(PORT_VERSION 4.0.0-beta5)

+set(PORT_VERSION 4.0.0)

 

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO KhronosGroup/KTX-Software

     REF v${PORT_VERSION}

-    SHA512 0ee0672413eaa8cbfacab13bfab9935be23fadcd63253012d9710f3f9ce9b0d62c43d50c652e47cb44d2878b20377026e65f3d37cdb1dd36b1c0241da250606a

+    SHA512 49787cf0230939ae0c737f6080ef483dd27ebd653c16525b469b078511ab72e85aecba9bffe71ed45ce1692e8448b845e60545c39f9333e6d216b20f56595faa

     HEAD_REF master

     FILE_DISAMBIGUATOR 1

     PATCHES

@@ -33,8 +33,9 @@ endif()
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)

 

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    tools KTX_FEATURE_TOOLS

-    vulkan KTX_FEATURE_VULKAN

+    FEATURES

+        tools KTX_FEATURE_TOOLS

+        vulkan KTX_FEATURE_VULKAN

 )

 

 vcpkg_configure_cmake(

@@ -65,7 +66,7 @@ if(tools IN_LIST FEATURES)
     vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})

 endif()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx TARGET_PATH share/${PORT})

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx)

 

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")

diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json
index 42d06e8ee..ae905f55d 100644
--- a/ports/ktx/vcpkg.json
+++ b/ports/ktx/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "ktx",
-  "version-string": "4.0.0-beta5",
-  "port-version": 2,
+  "version": "4.0.0",
   "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them",
   "homepage": "https://github.com/KhronosGroup/KTX-Software",
-  "supports": "!(uwp | x86)",
+  "supports": "!(uwp | x86 | arm64)",
   "dependencies": [
     "zstd"
   ],
diff --git a/versions/baseline.json b/versions/baseline.json
index f19adb3c6..60c44c92b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3005,8 +3005,8 @@
       "port-version": 0
     },
     "ktx": {
-      "baseline": "4.0.0-beta5",
-      "port-version": 2
+      "baseline": "4.0.0",
+      "port-version": 0
     },
     "kubazip": {
       "baseline": "0.1.19",
diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json
index 935f983b3..21db2789d 100644
--- a/versions/k-/ktx.json
+++ b/versions/k-/ktx.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "bb7f4de2ff7141cda0da61c7a0419559fc30c53a",
+      "version": "4.0.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "7a9d8e946937d795afa8a57d63357aa76be2d4ce",
       "version-string": "4.0.0-beta5",
       "port-version": 2