From 3f806e04fdcf30df33c7b445590c9ac13afef946 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Thu, 8 Feb 2024 07:45:01 +0100
Subject: [PATCH] [ktx] no vendored libs (#36508)

---
 ports/ktx/0005-no-vendored-libs.patch | 17 +++++++++++++++++
 ports/ktx/portfile.cmake              |  1 +
 ports/ktx/vcpkg.json                  |  7 ++++++-
 versions/baseline.json                |  2 +-
 versions/k-/ktx.json                  |  5 +++++
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 ports/ktx/0005-no-vendored-libs.patch

diff --git a/ports/ktx/0005-no-vendored-libs.patch b/ports/ktx/0005-no-vendored-libs.patch
new file mode 100644
index 00000000000000..77cdd8518dae6b
--- /dev/null
+++ b/ports/ktx/0005-no-vendored-libs.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7ca937..ffcbe95 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1059,10 +1059,10 @@ endif()
+ # except for building the ktx library.
+ if((KTX_FEATURE_TOOLS OR KTX_FEATURE_TESTS) AND NOT TARGET fmt::fmt)
+     set(FMT_SYSTEM_HEADERS ON)
+-    add_subdirectory(other_projects/fmt)
++    find_package(fmt CONFIG REQUIRED)
+ endif()
+ if(KTX_FEATURE_TOOLS AND NOT TARGET cxxopts::cxxopts)
+-    add_subdirectory(other_projects/cxxopts)
++    find_package(cxxopts CONFIG REQUIRED)
+ endif()
+ 
+ # Tools
diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake
index 7a6d8edb108ed1..935b2ac86d3181 100644
--- a/ports/ktx/portfile.cmake
+++ b/ports/ktx/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
         0002-Fix-versioning.patch
         0003-mkversion.patch
         0004-quirks.patch
+        0005-no-vendored-libs.patch
 )
 file(REMOVE "${SOURCE_PATH}/other_include/zstd_errors.h")
 
diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json
index b71850ef9c2f6e..102e281312f432 100644
--- a/ports/ktx/vcpkg.json
+++ b/ports/ktx/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ktx",
   "version-semver": "4.3.0-beta1",
+  "port-version": 1,
   "description": [
     "The Khronos KTX library and tools.",
     "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them."
@@ -22,7 +23,11 @@
   "features": {
     "tools": {
       "description": "Build tools",
-      "supports": "!android"
+      "supports": "!android",
+      "dependencies": [
+        "cxxopts",
+        "fmt"
+      ]
     },
     "vulkan": {
       "description": "Build Vulkan support",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1a3ee8f788de57..9331bc81a4f470 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3994,7 +3994,7 @@
     },
     "ktx": {
       "baseline": "4.3.0-beta1",
-      "port-version": 0
+      "port-version": 1
     },
     "kubazip": {
       "baseline": "0.2.6",
diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json
index 8ed84c6a48231b..a5cac1a815adaa 100644
--- a/versions/k-/ktx.json
+++ b/versions/k-/ktx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7db3fff00913b362bd7ac3c0a3611209f5d038df",
+      "version-semver": "4.3.0-beta1",
+      "port-version": 1
+    },
     {
       "git-tree": "e5d9ea81aabca83f512d64a46fd545d353552034",
       "version-semver": "4.3.0-beta1",