[ktx] update to 4.1.0-rc1 (#24620)

* update ktx to 4.1.0-rc1

* remove useless file

* change to version-semver

ports/ktx/0001-Use-vcpkg-zstd.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0bdb708..356c160 100644
+index 8ca40f8..84fcb18 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -121,7 +121,6 @@ set(KTX_MAIN_SRC
+@@ -174,7 +174,6 @@ set(KTX_MAIN_SRC
      lib/basisu/transcoder/basisu_transcoder.cpp
      lib/basisu/transcoder/basisu_transcoder.h
      lib/basisu/transcoder/basisu.h
@@ -10,31 +10,31 @@ index 0bdb708..356c160 100644
      lib/checkheader.c
      lib/dfdutils/createdfd.c
      lib/dfdutils/colourspaces.c
-@@ -227,7 +226,6 @@ macro(commom_lib_settings lib write)
+@@ -284,7 +283,6 @@ macro(commom_lib_settings lib write)
          $<INSTALL_INTERFACE:lib/basisu/transcoder>
  
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu/transcoder>
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu/zstd>
 -        $<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)
+@@ -361,6 +359,11 @@ macro(commom_lib_settings lib write)
      endif()
  
      if(WIN32)
 +        find_package(zstd CONFIG REQUIRED)
 +        target_link_libraries(
-+            ${lib}
++            ${lib} PRIVATE
 +            $<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>>)
++        )
+         # By wrapping in generator expression we force multi configuration
+         # generators (like Visual Studio) to take the exact path and not
+         # change it.
 diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt
-index 78dd110..e155896 100644
+index 492233a..8786d16 100644
 --- a/lib/basisu/CMakeLists.txt
 +++ b/lib/basisu/CMakeLists.txt
-@@ -118,7 +118,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST}
+@@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST}
  	)
  
  if (ZSTD)
@@ -43,7 +43,7 @@ index 78dd110..e155896 100644
  endif()
  
  if (APPLE)
-@@ -137,6 +137,10 @@ else()
+@@ -165,6 +165,10 @@ else()
  	target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
  endif()
  
@@ -52,13 +52,13 @@ index 78dd110..e155896 100644
 +endif()
 +
  if (NOT MSVC)
-    target_link_libraries(basisu m pthread)
- endif()
+ 	# For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us.
+ 	if (OPENCL_FOUND)
 diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt
-index e365e1b..6e6a7a5 100644
+index 588d91b..0b38012 100644
 --- a/lib/basisu/webgl/encoder/CMakeLists.txt
 +++ b/lib/basisu/webgl/encoder/CMakeLists.txt
-@@ -36,9 +36,7 @@ if (EMSCRIPTEN)
+@@ -34,9 +34,7 @@ if (EMSCRIPTEN)
    )
  
    if (KTX2_ZSTANDARD)
@@ -69,19 +69,19 @@ index e365e1b..6e6a7a5 100644
  	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1)
    else()
    	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0)
-@@ -58,6 +56,10 @@ if (EMSCRIPTEN)
+@@ -56,6 +54,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
+index 372653d..f75e3a3 100644
 --- a/lib/basisu/webgl/transcoder/CMakeLists.txt
 +++ b/lib/basisu/webgl/transcoder/CMakeLists.txt
 @@ -28,9 +28,7 @@ if (EMSCRIPTEN)
@@ -95,14 +95,14 @@ index 372653d..2e19ece 100644
  	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} )
+@@ -45,6 +43,10 @@ if (EMSCRIPTEN)
    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"

ports/ktx/portfile.cmake

@@ -1,10 +1,10 @@
-set(PORT_VERSION 4.0.0)
+set(PORT_VERSION 4.1.0-rc1)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/KTX-Software
-    REF v${PORT_VERSION}
-    SHA512 49787cf0230939ae0c737f6080ef483dd27ebd653c16525b469b078511ab72e85aecba9bffe71ed45ce1692e8448b845e60545c39f9333e6d216b20f56595faa
+    REF af6df0267b07bf5d4278837e5350f97bcbdcc870 #v${PORT_VERSION}
+    SHA512 00e5c37ec1922bae7903e3b51ac61e44d815bd606e12104c87b3c8d89e04b5d81f8d502712d8d6c9420aa21289c93c6ef01d0a4091062d03aae07b7fbfce5f74
     HEAD_REF master
     FILE_DISAMBIGUATOR 1
     PATCHES

ports/ktx/vcpkg.json

@@ -1,9 +1,9 @@
 {
   "name": "ktx",
-  "version": "4.0.0",
-  "port-version": 2,
+  "version-semver": "4.1.0-rc1",
   "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",
+  "license": "Apache-2.0",
   "supports": "!(uwp | x86 | arm64)",
   "dependencies": [
     {

versions/baseline.json

@@ -3297,8 +3297,8 @@
       "port-version": 1
     },
     "ktx": {
-      "baseline": "4.0.0",
-      "port-version": 2
+      "baseline": "4.1.0-rc1",
+      "port-version": 0
     },
     "kubazip": {
       "baseline": "0.1.19",

versions/k-/ktx.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "70ff7e521be27f851d96a9d69016fe3c58abe74d",
+      "version-semver": "4.1.0-rc1",
+      "port-version": 0
+    },
     {
       "git-tree": "048534e1a90a5e15ebf065ccfc752c9c5fea77c5",
       "version": "4.0.0",