From 969a35ae2ba3d69f56923194bb55f053db3e3dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sat, 19 Aug 2023 16:49:08 +0200
Subject: [PATCH] SCons: Make ktx module require basis_universal

Fixes #80786.
---
 modules/ktx/SCsub     | 6 ++----
 modules/ktx/config.py | 1 +
 thirdparty/README.md  | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/ktx/SCsub b/modules/ktx/SCsub
index 9e453137017..b160f7a2872 100644
--- a/modules/ktx/SCsub
+++ b/modules/ktx/SCsub
@@ -11,6 +11,7 @@ thirdparty_obj = []
 
 thirdparty_dir = "#thirdparty/libktx/"
 thirdparty_sources = [
+    "lib/basis_transcode.cpp",
     "lib/checkheader.c",
     "lib/filestream.c",
     "lib/hashlist.c",
@@ -32,10 +33,7 @@ env_ktx.Prepend(CPPPATH=[thirdparty_dir + "include"])
 env_ktx.Prepend(CPPPATH=[thirdparty_dir + "utils"])
 env_ktx.Prepend(CPPPATH=[thirdparty_dir + "lib"])
 env_ktx.Prepend(CPPPATH=[thirdparty_dir + "other_include"])
-
-if env["module_basis_universal_enabled"]:
-    thirdparty_sources += [thirdparty_dir + "lib/basis_transcode.cpp"]
-    env_ktx.Prepend(CPPPATH=["#thirdparty/basis_universal"])
+env_ktx.Prepend(CPPPATH=["#thirdparty/basis_universal"])
 
 if env["vulkan"]:
     env_ktx.Prepend(CPPPATH=["#thirdparty/vulkan/include"])
diff --git a/modules/ktx/config.py b/modules/ktx/config.py
index d22f9454ed2..4c8391ea2a8 100644
--- a/modules/ktx/config.py
+++ b/modules/ktx/config.py
@@ -1,4 +1,5 @@
 def can_build(env, platform):
+    env.module_add_dependencies("ktx", ["basis_universal"])
     return True
 
 
diff --git a/thirdparty/README.md b/thirdparty/README.md
index ac211138986..f298a3a16cd 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -310,12 +310,11 @@ Files extracted from upstream source:
 - `LICENSE.md`
 - `include/*`
 - `lib/dfdutils/{LICENSES/Apache-2.0.txt,KHR,*.c,*.h,*.inl}`
-- `lib/{basis_sgd.h,basis_transcode.cpp,checkheader.c,filestream.*,formatsize.h,gl_format.h,hashlist.c,ktxint.h,memstream.*,swap.c,texture*,uthash.h,vk_format.h,vkformat_enum.h`
+- `lib/{basis_sgd.h,basis_transcode.cpp,checkheader.c,filestream.*,formatsize.h,gl_format.h,hashlist.c,ktxint.h,memstream.*,swap.c,texture*,uthash.h,vk_format.h,vkformat_enum.h}`
 - `utils/unused.h`
 - `other_include/KHR/*`
-- ifndef-protect NOMINMAX define in `lib/gl_format.h` (see godot.patch)
-- remove `basisu/` prefix from `thirdparty/libktx/lib/basis_transcode.cpp` basisu includes (see godot.patch)
-- comment `VK_FORMAT_ASTC_*x*x*_UNORM_BLOCK_EXT` cases in `lib/dfdutils/vk2dfd.inl` (see godot.patch)
+
+Some Godot-specific changes are applied via `godot.patch`.
 
 
 ## libogg