From 6121feb853f9a84d38732951b49fb8887cb1cf0a Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 1 Jun 2023 14:45:27 +0000
Subject: [PATCH] vulkan-tools: update to 1.3.251

---
 packages/graphics/vulkan/vulkan-tools/package.mk  |  7 ++++---
 ...-tools-995.04-fix-glslangValidator-logik.patch | 15 ++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/graphics/vulkan/vulkan-tools/package.mk b/packages/graphics/vulkan/vulkan-tools/package.mk
index bc369f0c2c..aabc272709 100644
--- a/packages/graphics/vulkan/vulkan-tools/package.mk
+++ b/packages/graphics/vulkan/vulkan-tools/package.mk
@@ -3,12 +3,12 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vulkan-tools"
-PKG_VERSION="1.3.250"
-PKG_SHA256="a1cd4f7d8d58bec26efb1e5ea73f82dcf36a9662d55401b81a783071b211a35a"
+PKG_VERSION="1.3.251"
+PKG_SHA256="03851334d9751464f96b2d3c49cac884b7be5178c04d162a445bb2ca93f56519"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/Vulkan-Tools"
 PKG_URL="https://github.com/KhronosGroup/Vulkan-tools/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain vulkan-loader glslang:host"
+PKG_DEPENDS_TARGET="toolchain vulkan-loader glslang:host Python3:host"
 PKG_LONGDESC="This project provides Khronos official Vulkan Tools and Utilities."
 
 configure_package() {
@@ -26,6 +26,7 @@ pre_configure_target() {
                          -DBUILD_ICD=OFF \
                          -DINSTALL_ICD=OFF \
                          -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
+                         -DPython3_EXECUTABLE=${TOOLCHAIN}/bin/python3 \
                          -Wno-dev"
 
   if [ "${DISPLAYSERVER}" = "x11" ]; then
diff --git a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
index 254f287535..0f6f43a91f 100644
--- a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
+++ b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
@@ -11,22 +11,23 @@ diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
 index d59eb4366..a684fc4f0 100644
 --- a/cube/CMakeLists.txt
 +++ b/cube/CMakeLists.txt
-@@ -26,26 +26,37 @@ endif()
+@@ -26,27 +26,38 @@ endif()
  if(GLSLANG_INSTALL_DIR)
      message(STATUS "Using GLSLANG_INSTALL_DIR to look for glslangValidator")
      find_program(GLSLANG_VALIDATOR names glslangValidator HINTS "${GLSLANG_INSTALL_DIR}/bin")
 +
  else()
+     find_package(Python3 REQUIRED QUIET)
      set(GLSLANG_VALIDATOR_NAME "glslangValidator")
 -    message(STATUS "Using cmake find_program to look for glslangValidator")
 -    if(WIN32)
 -        execute_process(
--            COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
+-            COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
 -        set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
 -    elseif(APPLE)
--        execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
+-        execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
 -    elseif(UNIX AND NOT APPLE) # i.e. Linux
--        execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
+-        execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
 -    endif()
 -    if (WIN32)
 -        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
@@ -40,12 +41,12 @@ index d59eb4366..a684fc4f0 100644
 -        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
 +        if(WIN32)
 +            execute_process(
-+                COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
++                COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
 +            set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
 +        elseif(APPLE)
-+            execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
++            execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
 +        elseif(UNIX AND NOT APPLE) # i.e. Linux
-+            execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
++            execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
 +        endif()
 +        if (WIN32)
 +            set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")