From 31a8777fc047d4303469aabdf9159363b4fb3ee0 Mon Sep 17 00:00:00 2001
From: Ada Tufankjian <amt3824@g.rit.edu>
Date: Sat, 31 Aug 2024 23:03:18 -0700
Subject: [PATCH] [ktx] Updating to version 4.3.2 (#40714)

---
 ports/ktx/0005-no-vendored-libs.patch |  6 +++---
 ports/ktx/0006-fix-ios-install.patch  | 13 +++++++++++--
 ports/ktx/portfile.cmake              |  2 +-
 ports/ktx/vcpkg.json                  |  3 +--
 versions/baseline.json                |  4 ++--
 versions/k-/ktx.json                  |  5 +++++
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ports/ktx/0005-no-vendored-libs.patch b/ports/ktx/0005-no-vendored-libs.patch
index 77cdd8518d..4c900225f6 100644
--- a/ports/ktx/0005-no-vendored-libs.patch
+++ b/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/ports/ktx/0006-fix-ios-install.patch b/ports/ktx/0006-fix-ios-install.patch
index f81cfb4664..0af3fea68f 100644
--- a/ports/ktx/0006-fix-ios-install.patch
+++ b/ports/ktx/0006-fix-ios-install.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ccf4af61..2f6e404f 100644
+index e99fb143..072ea889 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -484,7 +484,7 @@ macro(common_libktx_settings target enable_write library_type)
+@@ -489,7 +489,7 @@ macro(common_libktx_settings target enable_write library_type)
          CXX_STANDARD_REQUIRED YES
  
      )
@@ -11,3 +11,12 @@ index ccf4af61..2f6e404f 100644
          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/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake
index f3fd26900b..b379ef0fb3 100644
--- a/ports/ktx/portfile.cmake
+++ b/ports/ktx/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/KTX-Software
     REF "v${VERSION}"
-    SHA512 8ecb10d188b42c2104ae1ad1df8ba01a86af8b9ff673d74a767f742d2b5aa7effdc4765c2c280df43d717af3a14765189421d6b162f39515972dc439bd624619
+    SHA512 0077315fe2b4e676e97e3a158c2c6e1f6ba426e14ad23342592cd69be28cfce64c40614e0a84d58a9634877ab334e713b94d4c962132c98bfea308e91bc8a98a
     HEAD_REF master
     PATCHES
         0001-Use-vcpkg-zstd.patch
diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json
index b4d4a0151f..94eea841c8 100644
--- a/ports/ktx/vcpkg.json
+++ b/ports/ktx/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ktx",
-  "version-semver": "4.3.1",
-  "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."
diff --git a/versions/baseline.json b/versions/baseline.json
index abf7670f02..6434f3f181 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4113,8 +4113,8 @@
       "port-version": 1
     },
     "ktx": {
-      "baseline": "4.3.1",
-      "port-version": 1
+      "baseline": "4.3.2",
+      "port-version": 0
     },
     "kubazip": {
       "baseline": "0.2.6",
diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json
index 50f5f2de11..5c2bb0fc3f 100644
--- a/versions/k-/ktx.json
+++ b/versions/k-/ktx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "103dd394fe394d610ffa362a59933168d6cc0a2b",
+      "version-semver": "4.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "665cd07792ee19ad6c1c2582a75c996ac93639c2",
       "version-semver": "4.3.1",