[KTX] Fixing port to properly patch zstd for platforms other than windows (#24869)

* Updating ktx zstd patch to work for non-windows platforms

* Formatting

* Updating version

* Extra version nonsense

* Private zstd

* Versioning

* Updating hash of ktx revision and tweaking mingw toolchain to find gcc/g++ differently

* Updating version

* Removing change to mingw

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

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ca40f8..84fcb18 100644
+index f1d37cf7..9cf43c75 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -174,7 +174,6 @@ set(KTX_MAIN_SRC
@@ -18,18 +18,17 @@ index 8ca40f8..84fcb18 100644
  
          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
          $<INSTALL_INTERFACE:other_include>
-@@ -361,6 +359,11 @@ macro(commom_lib_settings lib write)
+@@ -370,6 +368,10 @@ macro(commom_lib_settings lib write)
+         target_compile_definitions(${lib} PUBLIC KTX_FEATURE_KTX2)
      endif()
  
++    # Use vcpkg zstd
++    find_package(zstd CONFIG REQUIRED)
++    target_link_libraries(${lib} PRIVATE $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
++
      if(WIN32)
-+        find_package(zstd CONFIG REQUIRED)
-+        target_link_libraries(
-+            ${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.
 diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt
 index 492233a..8786d16 100644
 --- a/lib/basisu/CMakeLists.txt

ports/ktx/portfile.cmake

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

ports/ktx/vcpkg.json

@@ -1,10 +1,10 @@
 {
   "name": "ktx",
-  "version-semver": "4.1.0-rc1",
+  "version-semver": "4.1.0-rc2",
   "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)",
+  "supports": "!(uwp | x86 | (arm & !arm64))",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

versions/baseline.json

@@ -3329,7 +3329,7 @@
       "port-version": 1
     },
     "ktx": {
-      "baseline": "4.1.0-rc1",
+      "baseline": "4.1.0-rc2",
       "port-version": 0
     },
     "kubazip": {

versions/k-/ktx.json

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