[ktx] Updating to version 4.3.2 (#40714)

This commit is contained in:
Ada Tufankjian 2024-08-31 23:03:18 -07:00 committed by GitHub
parent 93c815ff34
commit 31a8777fc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 23 additions and 10 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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."

View File

@ -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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "103dd394fe394d610ffa362a59933168d6cc0a2b",
"version-semver": "4.3.2",
"port-version": 0
},
{
"git-tree": "665cd07792ee19ad6c1c2582a75c996ac93639c2",
"version-semver": "4.3.1",