From 603068614bbb8c2c98182b34f33593ebeee5cde5 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Sat, 14 Dec 2024 09:05:33 +0000
Subject: [PATCH] vulkan-tools: do not search KHR_display automatically
 (#22549)

---
 ...no-android.patch => 0001-no-android.patch} |  0
 ...-KHR_display-automatically-on-Termux.patch | 32 +++++++++++++++++++
 packages/vulkan-tools/build.sh                |  1 +
 3 files changed, 33 insertions(+)
 rename packages/vulkan-tools/{no-android.patch => 0001-no-android.patch} (100%)
 create mode 100644 packages/vulkan-tools/0002-do-not-search-KHR_display-automatically-on-Termux.patch

diff --git a/packages/vulkan-tools/no-android.patch b/packages/vulkan-tools/0001-no-android.patch
similarity index 100%
rename from packages/vulkan-tools/no-android.patch
rename to packages/vulkan-tools/0001-no-android.patch
diff --git a/packages/vulkan-tools/0002-do-not-search-KHR_display-automatically-on-Termux.patch b/packages/vulkan-tools/0002-do-not-search-KHR_display-automatically-on-Termux.patch
new file mode 100644
index 0000000000..bb275b154d
--- /dev/null
+++ b/packages/vulkan-tools/0002-do-not-search-KHR_display-automatically-on-Termux.patch
@@ -0,0 +1,32 @@
+https://github.com/termux/termux-packages/issues/22542
+
+--- a/cube/cube.c
++++ b/cube/cube.c
+@@ -3931,7 +3931,11 @@ static void demo_init_vk(struct demo *demo) {
+ #endif
+ #if defined(VK_USE_PLATFORM_DISPLAY_KHR)
+             if (!strcmp(VK_KHR_DISPLAY_EXTENSION_NAME, instance_extensions[i].extensionName) &&
++#ifdef __TERMUX__
++                (demo->wsi_platform == WSI_PLATFORM_DISPLAY)) {
++#else
+                 (demo->wsi_platform == WSI_PLATFORM_AUTO || demo->wsi_platform == WSI_PLATFORM_DISPLAY)) {
++#endif
+                 platformSurfaceExtFound = true;
+                 demo->extension_names[demo->enabled_extension_count++] = VK_KHR_DISPLAY_EXTENSION_NAME;
+             }
+diff --git a/cube/cube.cpp b/cube/cube.cpp
+index 6c4f9b05..e488f2ef 100644
+--- a/cube/cube.cpp
++++ b/cube/cube.cpp
+@@ -1534,7 +1534,11 @@ void Demo::init_vk() {
+ #endif
+ #if defined(VK_USE_PLATFORM_DISPLAY_KHR)
+         else if (!strcmp(VK_KHR_DISPLAY_EXTENSION_NAME, extension.extensionName) &&
++#ifdef __TERMUX__
++                 (wsi_platform == WsiPlatform::display)) {
++#else
+                  (wsi_platform == WsiPlatform::auto_ || wsi_platform == WsiPlatform::display)) {
++#endif
+             platformSurfaceExtFound = 1;
+             enabled_instance_extensions.push_back(VK_KHR_DISPLAY_EXTENSION_NAME);
+         }
diff --git a/packages/vulkan-tools/build.sh b/packages/vulkan-tools/build.sh
index 3847fd129a..e332af1331 100644
--- a/packages/vulkan-tools/build.sh
+++ b/packages/vulkan-tools/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Vulkan Tools and Utilities"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.4.303"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=958b646bbc5ac0a54908342df30da8c183690f579dce7f7130ac93d433d9d3a8
 TERMUX_PKG_DEPENDS="libc++, libwayland, libx11, libxcb, vulkan-loader"