bump(main/vulkan-tools): 1.4.323

Signed-off-by: Kevin Williams <admin@utermux.dev>

packages/vulkan-tools/0001-no-android.patch

@@ -12,7 +12,7 @@
  
  option(BUILD_WSI_DISPLAY_SUPPORT "Build DISPLAY WSI support" ${WSI_DISPLAY_DEFAULT_SETTING})
  
-@@ -167,8 +163,6 @@
+@@ -169,8 +165,6 @@
  if(WIN32)
      add_definitions(-DWIN32_LEAN_AND_MEAN -DNOMINMAX)
      list(APPEND ENABLED_CUBE_PLATFORMS VK_USE_PLATFORM_WIN32_KHR)
@@ -21,7 +21,7 @@
  elseif(APPLE)
      list(APPEND ENABLED_CUBE_PLATFORMS VK_USE_PLATFORM_METAL_EXT)
  elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|GNU")
-@@ -231,13 +225,6 @@
+@@ -233,13 +227,6 @@
  
  if(APPLE)
      add_subdirectory(macOS/cube)
@@ -35,9 +35,9 @@
  elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|GNU")
      add_executable(vkcube)
      target_sources(vkcube PRIVATE
-@@ -285,9 +272,7 @@
+@@ -287,9 +274,7 @@
  target_include_directories(vkcube PRIVATE .)
- target_link_libraries(vkcube  Vulkan::Headers volk::volk_headers)
+ target_link_libraries(vkcube ${CMAKE_DL_LIBS} Vulkan::Headers)
  
 -if (ANDROID)
 -    install(TARGETS vkcube DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -46,17 +46,16 @@
      install(
          TARGETS vkcube
          # Install runtime dependencies like the Vulkan::Loader so the app is self-contained
-@@ -301,10 +286,6 @@
+@@ -303,9 +288,6 @@
      install(TARGETS vkcube)
  endif()
  
 -if (ANDROID)
 -    return()
 -endif()
--
- if (XCB_LINK_LIBRARIES)
-     target_compile_definitions(vkcube PRIVATE "XCB_LIBRARY=\"${XCB_LINK_LIBRARIES}\"")
- endif()
+ 
+ # ----------------------------------------------------------------------------
+ # vkcubepp
 --- a/cube/cube.c
 +++ b/cube/cube.c
 @@ -105,7 +105,7 @@
@@ -68,7 +67,7 @@
  #include <android/log.h>
  #define ERR_EXIT(err_msg, err_class)                                           \
      do {                                                                       \
-@@ -643,7 +643,7 @@
+@@ -647,7 +647,7 @@
      if (!demo->suppress_popups) MessageBox(NULL, message, "Alert", MB_OK);
      in_callback = false;
  
@@ -77,7 +76,7 @@
  
      if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) {
          __android_log_print(ANDROID_LOG_INFO, APP_SHORT_NAME, "%s", message);
-@@ -4703,7 +4703,7 @@
+@@ -4774,7 +4774,7 @@
              i++;
              continue;
          }
@@ -86,12 +85,12 @@
          ERR_EXIT("Usage: vkcube [--validate]\n", "Usage");
  #else
  
-@@ -4913,7 +4913,7 @@
- }
- 
+@@ -4816,7 +4816,7 @@
+         }
+         strncat(available_wsi_platforms, "win32", max_str_len);
  #endif
 -#if defined(VK_USE_PLATFORM_ANDROID_KHR)
 +#if defined(VK_USE_PLATFORM_ANDROID_KHR) && !defined(__TERMUX__)
- #include <android/log.h>
- #include <android_native_app_glue.h>
- #include "android_util.h"
+         if (strlen(available_wsi_platforms) > 0) {
+             strncat(available_wsi_platforms, "|", max_str_len);
+         }

packages/vulkan-tools/0002-do-not-search-KHR_display-automatically-on-Termux.patch

@@ -2,12 +2,12 @@ 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) {
+@@ -4009,7 +4009,11 @@
  #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)) {
++               (demo->wsi_platform == WSI_PLATFORM_DISPLAY)) {
 +#else
                  (demo->wsi_platform == WSI_PLATFORM_AUTO || demo->wsi_platform == WSI_PLATFORM_DISPLAY)) {
 +#endif
@@ -18,12 +18,12 @@ 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() {
+@@ -1666,7 +1666,11 @@
  #endif
  #if defined(VK_USE_PLATFORM_DISPLAY_KHR)
          else if (!strcmp(VK_KHR_DISPLAY_EXTENSION_NAME, extension.extensionName) &&
 +#ifdef __TERMUX__
-+                 (wsi_platform == WsiPlatform::display)) {
++               (wsi_platform == WsiPlatform::display)) {
 +#else
                   (wsi_platform == WsiPlatform::auto_ || wsi_platform == WsiPlatform::display)) {
 +#endif

packages/vulkan-tools/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
 TERMUX_PKG_DESCRIPTION="Vulkan Tools and Utilities"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.4.322"
+TERMUX_PKG_VERSION="1.4.323"
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=41a67124d9090c248c814ba826733420766920b976207ab25ae8fa3a3221b1c9
+TERMUX_PKG_SHA256=3fcb24083690e2ba577b89faa95fd37462954520b4af165ae7cd9d978613d931
 TERMUX_PKG_DEPENDS="libc++, libwayland, libx11, libxcb, vulkan-loader"
 TERMUX_PKG_BUILD_DEPENDS="libwayland-protocols, vulkan-headers (=${TERMUX_PKG_VERSION}), vulkan-volk"
 TERMUX_PKG_ANTI_BUILD_DEPENDS="vulkan-loader"