Upstream does not overwrite CMAKE_FIND_ROOT_PATH anymore. Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> --- ...-CMAKE_FIND_ROOT_PATH-when-cross-com.patch | 34 ------------------- patches/vulkan-tools-1.3.250.1/series | 4 --- rules/vulkan-tools.make | 9 ++--- 3 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 patches/vulkan-tools-1.3.250.1/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch delete mode 100644 patches/vulkan-tools-1.3.250.1/series
diff --git a/patches/vulkan-tools-1.3.250.1/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch b/patches/vulkan-tools-1.3.250.1/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch deleted file mode 100644 index c13f0b026a84..000000000000 --- a/patches/vulkan-tools-1.3.250.1/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Philipp Zabel <p.za...@pengutronix.de> -Date: Tue, 16 May 2023 10:04:03 +0200 -Subject: [PATCH] Stop overwriting CMAKE_FIND_ROOT_PATH when cross compiling - -PTXdist uses CMAKE_FIND_ROOT_PATH [1] to instruct CMake where to find -package information when cross-compiling. Stop overwriting this with -the contents of CMAKE_PREFIX_PATH [2] in the build system. - -[1] https://cmake.org/cmake/help/v3.25/variable/CMAKE_FIND_ROOT_PATH.html -[2] https://cmake.org/cmake/help/v3.25/variable/CMAKE_PREFIX_PATH.html - -This issue was introduced with commit e99e3c640ab7 ("cmake: Add -UPDATE_DEPS functionality"). It is similar to the same issue in -vulkan-validationlayers. - -Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> ---- - scripts/CMakeLists.txt | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 5b979d43de59..3b1ddbdff685 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -113,8 +113,4 @@ if (MOLTENVK_REPO_ROOT) - list(APPEND CMAKE_PREFIX_PATH ${MOLTENVK_REPO_ROOT}) - endif() - --if (CMAKE_CROSSCOMPILING) -- set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) --else() -- set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) --endif() -+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) diff --git a/patches/vulkan-tools-1.3.250.1/series b/patches/vulkan-tools-1.3.250.1/series deleted file mode 100644 index 3ed158f8be1d..000000000000 --- a/patches/vulkan-tools-1.3.250.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch -# ea2ba1941cc64bfae752632f0830f963 - git-ptx-patches magic diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make index f91efb413e50..b6ba257f8430 100644 --- a/rules/vulkan-tools.make +++ b/rules/vulkan-tools.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools # # Paths and names # -VULKAN_TOOLS_VERSION := 1.3.250.1 -VULKAN_TOOLS_MD5 := 6fda3b5b1ce4731762bde59de092b20a +VULKAN_TOOLS_VERSION := 1.3.261.0 +VULKAN_TOOLS_MD5 := 59cf8fecd8f3037f1b7cb2ec1cd47b5e VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION) VULKAN_TOOLS_SUFFIX := tar.gz VULKAN_TOOLS_URL := https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX) @@ -39,10 +39,7 @@ VULKAN_TOOLS_CONF_OPT := \ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_WAYLAND) \ -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_XCB) \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ - -DENABLE_ADDRESS_SANITIZER=OFF \ - -DINSTALL_ICD=OFF \ - -DTOOLS_CODEGEN=OFF \ - -DUPDATE_DEPS=OFF + -DINSTALL_ICD=OFF ifdef PTXCONF_VULKAN_TOOLS_CUBE VULKAN_TOOLS_CONF_OPT += \ -- 2.39.2
