* [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0
@ 2023-08-28 8:48 Philipp Zabel
2023-08-28 8:48 ` [ptxdist] [PATCH 2/8] spirv-tools: version bump 1.3.250.1 -> 1.3.256.0 Philipp Zabel
` (7 more replies)
0 siblings, 8 replies; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--git a/rules/spirv-headers.make b/rules/spirv-headers.make
index 28975c5b9d64..70000d0bb688 100644
--- a/rules/spirv-headers.make
+++ b/rules/spirv-headers.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers
#
# Paths and names
#
-SPIRV_HEADERS_VERSION := 1.3.250.1
-SPIRV_HEADERS_MD5 := c3802825a51f8552320b5b61875bcc4c
+SPIRV_HEADERS_VERSION := 1.3.261.0
+SPIRV_HEADERS_MD5 := 7034fce567654dd69f44b4ac5d71cb1e
SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION)
SPIRV_HEADERS_SUFFIX := tar.gz
SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
--
2.39.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 2/8] spirv-tools: version bump 1.3.250.1 -> 1.3.256.0
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
@ 2023-08-28 8:48 ` Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 3/8] glslang: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
` (6 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/spirv-tools.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
index 0ba8e2e07d54..2c2d6e032d14 100644
--- a/rules/spirv-tools.make
+++ b/rules/spirv-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
#
# Paths and names
#
-SPIRV_TOOLS_VERSION := 1.3.250.1
-SPIRV_TOOLS_MD5 := 0d7431ced494b358b761948d47a8a560
+SPIRV_TOOLS_VERSION := 1.3.261.0
+SPIRV_TOOLS_MD5 := 227713b3bfef23df96f0034b15f264e1
SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION)
SPIRV_TOOLS_SUFFIX := tar.gz
SPIRV_TOOLS_URL := https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
--
2.39.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 3/8] glslang: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
2023-08-28 8:48 ` [ptxdist] [PATCH 2/8] spirv-tools: version bump 1.3.250.1 -> 1.3.256.0 Philipp Zabel
@ 2023-08-28 8:48 ` Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 4/8] shaderc: version bump v2023.4 -> v2023.6 Philipp Zabel
` (5 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/glslang.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/glslang.make b/rules/glslang.make
index 0a5100ca4aad..8d7ed5f263a5 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
#
# Paths and names
#
-GLSLANG_VERSION := 1.3.250.1
-GLSLANG_MD5 := 8964663a374dfae4ed53143e909a6c44
+GLSLANG_VERSION := 1.3.261.0
+GLSLANG_MD5 := 46bd9fbc828c538b4b4a03341266feee
GLSLANG := glslang-$(GLSLANG_VERSION)
GLSLANG_SUFFIX := tar.gz
GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
--
2.39.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 4/8] shaderc: version bump v2023.4 -> v2023.6
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
2023-08-28 8:48 ` [ptxdist] [PATCH 2/8] spirv-tools: version bump 1.3.250.1 -> 1.3.256.0 Philipp Zabel
2023-08-28 8:48 ` [ptxdist] [PATCH 3/8] glslang: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
@ 2023-08-28 8:48 ` Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 5/8] vulkan-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
` (4 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/host-shaderc.make | 5 +----
rules/shaderc.make | 9 +++------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
index 204c39c44d41..0a30f7c22a07 100644
--- a/rules/host-shaderc.make
+++ b/rules/host-shaderc.make
@@ -72,8 +72,6 @@ HOST_SHADERC_CONF_OPT := \
-DSHADERC_ENABLE_WERROR_COMPILE=ON \
-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
- -DSHADERC_SKIP_EXAMPLES=OFF \
- -DSHADERC_SKIP_INSTALL=OFF \
-DSHADERC_SKIP_TESTS=ON \
-DSPIRV_ALLOW_TIMERS=ON \
-DSPIRV_BUILD_COMPRESSION=OFF \
@@ -91,7 +89,6 @@ HOST_SHADERC_CONF_OPT := \
-DSPIRV_TOOLS_BUILD_STATIC=ON \
-DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
-DSPIRV_WARN_EVERYTHING=OFF \
- -DSPIRV_WERROR=ON \
- -DUSE_CCACHE=OFF
+ -DSPIRV_WERROR=ON
# vim: syntax=make
diff --git a/rules/shaderc.make b/rules/shaderc.make
index 68660512dddb..5369696dd2bb 100644
--- a/rules/shaderc.make
+++ b/rules/shaderc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
#
# Paths and names
#
-SHADERC_VERSION := v2023.4
-SHADERC_MD5 := 6079248223fc14c77e5d3532681e7758
+SHADERC_VERSION := v2023.6
+SHADERC_MD5 := fd7536f8ad546a0b4d846e9d45de0715
SHADERC := shaderc-$(SHADERC_VERSION)
SHADERC_SUFFIX := tar.gz
SHADERC_URL := \
@@ -90,8 +90,6 @@ SHADERC_CONF_OPT := \
-DSHADERC_ENABLE_WERROR_COMPILE=ON \
-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
- -DSHADERC_SKIP_EXAMPLES=OFF \
- -DSHADERC_SKIP_INSTALL=OFF \
-DSHADERC_SKIP_TESTS=ON \
-DSPIRV_ALLOW_TIMERS=ON \
-DSPIRV_BUILD_COMPRESSION=OFF \
@@ -109,8 +107,7 @@ SHADERC_CONF_OPT := \
-DSPIRV_TOOLS_BUILD_STATIC=ON \
-DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
-DSPIRV_WARN_EVERYTHING=OFF \
- -DSPIRV_WERROR=ON \
- -DUSE_CCACHE=OFF
+ -DSPIRV_WERROR=ON
# ----------------------------------------------------------------------------
# Target-Install
--
2.39.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 5/8] vulkan-headers: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
` (2 preceding siblings ...)
2023-08-28 8:48 ` [ptxdist] [PATCH 4/8] shaderc: version bump v2023.4 -> v2023.6 Philipp Zabel
@ 2023-08-28 8:48 ` Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 6/8] vulkan-loader: " Philipp Zabel
` (3 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
License changes are clarifications and a switch to REUSE tooling.
Almost all installed files are Apache-2.0 or (Apache-2.0 OR MIT)
licensed, only the parse_dependency.py script is MIT only.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
| 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--git a/rules/vulkan-headers.make b/rules/vulkan-headers.make
index 9fdb9e4d0906..6559f6fcfb05 100644
--- a/rules/vulkan-headers.make
+++ b/rules/vulkan-headers.make
@@ -15,17 +15,16 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers
# Paths and names
#
-VULKAN_HEADERS_VERSION := 1.3.250.1
-VULKAN_HEADERS_MD5 := d325a08e8a82881029bdcde447452a75
+VULKAN_HEADERS_VERSION := 1.3.261.0
+VULKAN_HEADERS_MD5 := 524738c8d66ba2f94a3d43679b6098d2
VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION)
VULKAN_HEADERS_SUFFIX := tar.gz
VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
VULKAN_HEADERS_SOURCE := $(SRCDIR)/vulkan-headers-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
VULKAN_HEADERS_DIR := $(BUILDDIR)/$(VULKAN_HEADERS)
-VULKAN_HEADERS_LICENSE := Apache-2.0
+VULKAN_HEADERS_LICENSE := Apache-2.0 AND MIT
VULKAN_HEADERS_LICENSE_FILES := \
- file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57
-
+ file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625
# ----------------------------------------------------------------------------
# Prepare
--
2.39.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 6/8] vulkan-loader: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
` (3 preceding siblings ...)
2023-08-28 8:48 ` [ptxdist] [PATCH 5/8] vulkan-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
@ 2023-08-28 8:48 ` Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 7/8] vulkan-tools: " Philipp Zabel
` (2 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/vulkan-loader.make | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
index 3def527d813a..1aab6fdaec48 100644
--- a/rules/vulkan-loader.make
+++ b/rules/vulkan-loader.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader
#
# Paths and names
#
-VULKAN_LOADER_VERSION := 1.3.250.1
-VULKAN_LOADER_MD5 := b028b31ad822e4cf918cd9c67806380b
+VULKAN_LOADER_VERSION := 1.3.261.0
+VULKAN_LOADER_MD5 := fe24af2620e8f707f9e0b8000869bfe8
VULKAN_LOADER := vulkan-loader-$(VULKAN_LOADER_VERSION)
VULKAN_LOADER_SUFFIX := tar.gz
VULKAN_LOADER_URL := https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX)
@@ -51,8 +51,10 @@ VULKAN_LOADER_CONF_OPT := \
-DENABLE_WERROR=OFF \
-DFALLBACK_CONFIG_DIRS=/etc/xdg \
-DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \
+ -DLOADER_CODEGEN=OFF \
-DLOADER_ENABLE_ADDRESS_SANITIZER=OFF \
-DLOADER_ENABLE_THREAD_SANITIZER=OFF \
+ -DLOADER_USE_UNSAFE_FILE_SEARCH=OFF \
-DSYSCONFDIR= \
-DUPDATE_DEPS=OFF \
-DUSE_GAS=$(VULKAN_LOADER_USE_GAS)
--
2.39.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 7/8] vulkan-tools: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
` (4 preceding siblings ...)
2023-08-28 8:48 ` [ptxdist] [PATCH 6/8] vulkan-loader: " Philipp Zabel
@ 2023-08-28 8:48 ` Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 8/8] vulkan-validationlayers: " Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] spirv-headers: " Michael Olbrich
7 siblings, 1 reply; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Upstream does not overwrite CMAKE_FIND_ROOT_PATH anymore.
Signed-off-by: Philipp Zabel <p.zabel@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.zabel@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.zabel@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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 8/8] vulkan-validationlayers: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
` (5 preceding siblings ...)
2023-08-28 8:48 ` [ptxdist] [PATCH 7/8] vulkan-tools: " Philipp Zabel
@ 2023-08-28 8:48 ` Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-09-04 6:30 ` [ptxdist] [APPLIED] spirv-headers: " Michael Olbrich
7 siblings, 1 reply; 16+ messages in thread
From: Philipp Zabel @ 2023-08-28 8:48 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Upstream does not overwrite CMAKE_FIND_ROOT_PATH anymore.
LICENSE.txt added the MIT license for vk_mem_alloc.h
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
...x-find_-support-when-cross-compiling.patch | 32 -------------------
.../vulkan-validationlayers-1.3.250.1/series | 4 ---
rules/vulkan-validationlayers.make | 8 ++---
3 files changed, 4 insertions(+), 40 deletions(-)
delete mode 100644 patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
delete mode 100644 patches/vulkan-validationlayers-1.3.250.1/series
diff --git a/patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch b/patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
deleted file mode 100644
index 4716894cdd34..000000000000
--- a/patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Philipp Zabel <p.zabel@pengutronix.de>
-Date: Tue, 16 May 2023 10:04:03 +0200
-Subject: [PATCH] Revert "cmake: Fix find_* support 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 reverts commit b7c5ad2eed4405140fd062e5b915950011f4d7d0.
-
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
----
- scripts/CMakeLists.txt | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 94c8528c83a4..b8aebdd6eca6 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -123,8 +123,4 @@ if (MIMALLOC_INSTALL_DIR)
- list(APPEND CMAKE_PREFIX_PATH ${MIMALLOC_INSTALL_DIR})
- 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-validationlayers-1.3.250.1/series b/patches/vulkan-validationlayers-1.3.250.1/series
deleted file mode 100644
index ac294ce4fb8b..000000000000
--- a/patches/vulkan-validationlayers-1.3.250.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
-# 6d856a1a207d0d3f7e4c957af59f9af8 - git-ptx-patches magic
diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
index ccf762c84f33..3dbd7d3e8457 100644
--- a/rules/vulkan-validationlayers.make
+++ b/rules/vulkan-validationlayers.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
#
# Paths and names
#
-VULKAN_VALIDATIONLAYERS_VERSION := 1.3.250.1
-VULKAN_VALIDATIONLAYERS_MD5 := f39e0385bd9f688487338956fe2f97c3
+VULKAN_VALIDATIONLAYERS_VERSION := 1.3.261.0
+VULKAN_VALIDATIONLAYERS_MD5 := 8bad2c24c9ac716a92d0bf8ae9338112
VULKAN_VALIDATIONLAYERS := vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz
VULKAN_VALIDATIONLAYERS_URL := https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
VULKAN_VALIDATIONLAYERS_SOURCE := $(SRCDIR)/$(VULKAN_VALIDATIONLAYERS).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
VULKAN_VALIDATIONLAYERS_DIR := $(BUILDDIR)/$(VULKAN_VALIDATIONLAYERS)
-VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0
-VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c
+VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0 AND MIT
+VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f
# ----------------------------------------------------------------------------
# Prepare
--
2.39.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
` (6 preceding siblings ...)
2023-08-28 8:48 ` [ptxdist] [PATCH 8/8] vulkan-validationlayers: " Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
7 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 70a328436c79c19bfcea32570ead64798676fcbc.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:11 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make
> index 28975c5b9d64..70000d0bb688 100644
> --- a/rules/spirv-headers.make
> +++ b/rules/spirv-headers.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers
> #
> # Paths and names
> #
> -SPIRV_HEADERS_VERSION := 1.3.250.1
> -SPIRV_HEADERS_MD5 := c3802825a51f8552320b5b61875bcc4c
> +SPIRV_HEADERS_VERSION := 1.3.261.0
> +SPIRV_HEADERS_MD5 := 7034fce567654dd69f44b4ac5d71cb1e
> SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION)
> SPIRV_HEADERS_SUFFIX := tar.gz
> SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] spirv-tools: version bump 1.3.250.1 -> 1.3.256.0
2023-08-28 8:48 ` [ptxdist] [PATCH 2/8] spirv-tools: version bump 1.3.250.1 -> 1.3.256.0 Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 65326da3080117a554313f3c859ed26fb2614e1c.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:12 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
> index 0ba8e2e07d54..2c2d6e032d14 100644
> --- a/rules/spirv-tools.make
> +++ b/rules/spirv-tools.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
> #
> # Paths and names
> #
> -SPIRV_TOOLS_VERSION := 1.3.250.1
> -SPIRV_TOOLS_MD5 := 0d7431ced494b358b761948d47a8a560
> +SPIRV_TOOLS_VERSION := 1.3.261.0
> +SPIRV_TOOLS_MD5 := 227713b3bfef23df96f0034b15f264e1
> SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION)
> SPIRV_TOOLS_SUFFIX := tar.gz
> SPIRV_TOOLS_URL := https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] glslang: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 ` [ptxdist] [PATCH 3/8] glslang: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as e9a6143d8f12a24e3196c7b1d23038f2d881933c.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:13 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-3-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/glslang.make b/rules/glslang.make
> index 0a5100ca4aad..8d7ed5f263a5 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> #
> # Paths and names
> #
> -GLSLANG_VERSION := 1.3.250.1
> -GLSLANG_MD5 := 8964663a374dfae4ed53143e909a6c44
> +GLSLANG_VERSION := 1.3.261.0
> +GLSLANG_MD5 := 46bd9fbc828c538b4b4a03341266feee
> GLSLANG := glslang-$(GLSLANG_VERSION)
> GLSLANG_SUFFIX := tar.gz
> GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] shaderc: version bump v2023.4 -> v2023.6
2023-08-28 8:48 ` [ptxdist] [PATCH 4/8] shaderc: version bump v2023.4 -> v2023.6 Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 568a34f4dd3f0f88877edf56fc9af5f8e3eabda7.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:14 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-4-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
> index 204c39c44d41..0a30f7c22a07 100644
> --- a/rules/host-shaderc.make
> +++ b/rules/host-shaderc.make
> @@ -72,8 +72,6 @@ HOST_SHADERC_CONF_OPT := \
> -DSHADERC_ENABLE_WERROR_COMPILE=ON \
> -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
> -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
> - -DSHADERC_SKIP_EXAMPLES=OFF \
> - -DSHADERC_SKIP_INSTALL=OFF \
> -DSHADERC_SKIP_TESTS=ON \
> -DSPIRV_ALLOW_TIMERS=ON \
> -DSPIRV_BUILD_COMPRESSION=OFF \
> @@ -91,7 +89,6 @@ HOST_SHADERC_CONF_OPT := \
> -DSPIRV_TOOLS_BUILD_STATIC=ON \
> -DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
> -DSPIRV_WARN_EVERYTHING=OFF \
> - -DSPIRV_WERROR=ON \
> - -DUSE_CCACHE=OFF
> + -DSPIRV_WERROR=ON
>
> # vim: syntax=make
> diff --git a/rules/shaderc.make b/rules/shaderc.make
> index 68660512dddb..5369696dd2bb 100644
> --- a/rules/shaderc.make
> +++ b/rules/shaderc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
> #
> # Paths and names
> #
> -SHADERC_VERSION := v2023.4
> -SHADERC_MD5 := 6079248223fc14c77e5d3532681e7758
> +SHADERC_VERSION := v2023.6
> +SHADERC_MD5 := fd7536f8ad546a0b4d846e9d45de0715
> SHADERC := shaderc-$(SHADERC_VERSION)
> SHADERC_SUFFIX := tar.gz
> SHADERC_URL := \
> @@ -90,8 +90,6 @@ SHADERC_CONF_OPT := \
> -DSHADERC_ENABLE_WERROR_COMPILE=ON \
> -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
> -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
> - -DSHADERC_SKIP_EXAMPLES=OFF \
> - -DSHADERC_SKIP_INSTALL=OFF \
> -DSHADERC_SKIP_TESTS=ON \
> -DSPIRV_ALLOW_TIMERS=ON \
> -DSPIRV_BUILD_COMPRESSION=OFF \
> @@ -109,8 +107,7 @@ SHADERC_CONF_OPT := \
> -DSPIRV_TOOLS_BUILD_STATIC=ON \
> -DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
> -DSPIRV_WARN_EVERYTHING=OFF \
> - -DSPIRV_WERROR=ON \
> - -DUSE_CCACHE=OFF
> + -DSPIRV_WERROR=ON
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] vulkan-headers: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 ` [ptxdist] [PATCH 5/8] vulkan-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 36bcb4458be9b19795c5701d569aa9236952b376.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:15 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> License changes are clarifications and a switch to REUSE tooling.
> Almost all installed files are Apache-2.0 or (Apache-2.0 OR MIT)
> licensed, only the parse_dependency.py script is MIT only.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-5-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make
> index 9fdb9e4d0906..6559f6fcfb05 100644
> --- a/rules/vulkan-headers.make
> +++ b/rules/vulkan-headers.make
> @@ -15,17 +15,16 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers
> # Paths and names
> #
>
> -VULKAN_HEADERS_VERSION := 1.3.250.1
> -VULKAN_HEADERS_MD5 := d325a08e8a82881029bdcde447452a75
> +VULKAN_HEADERS_VERSION := 1.3.261.0
> +VULKAN_HEADERS_MD5 := 524738c8d66ba2f94a3d43679b6098d2
> VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION)
> VULKAN_HEADERS_SUFFIX := tar.gz
> VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
> VULKAN_HEADERS_SOURCE := $(SRCDIR)/vulkan-headers-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
> VULKAN_HEADERS_DIR := $(BUILDDIR)/$(VULKAN_HEADERS)
> -VULKAN_HEADERS_LICENSE := Apache-2.0
> +VULKAN_HEADERS_LICENSE := Apache-2.0 AND MIT
> VULKAN_HEADERS_LICENSE_FILES := \
> - file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57
> -
> + file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] vulkan-loader: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 ` [ptxdist] [PATCH 6/8] vulkan-loader: " Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as b6d7ec62964413c4925f766e402e4218d67828f5.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:16 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-6-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
> index 3def527d813a..1aab6fdaec48 100644
> --- a/rules/vulkan-loader.make
> +++ b/rules/vulkan-loader.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader
> #
> # Paths and names
> #
> -VULKAN_LOADER_VERSION := 1.3.250.1
> -VULKAN_LOADER_MD5 := b028b31ad822e4cf918cd9c67806380b
> +VULKAN_LOADER_VERSION := 1.3.261.0
> +VULKAN_LOADER_MD5 := fe24af2620e8f707f9e0b8000869bfe8
> VULKAN_LOADER := vulkan-loader-$(VULKAN_LOADER_VERSION)
> VULKAN_LOADER_SUFFIX := tar.gz
> VULKAN_LOADER_URL := https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX)
> @@ -51,8 +51,10 @@ VULKAN_LOADER_CONF_OPT := \
> -DENABLE_WERROR=OFF \
> -DFALLBACK_CONFIG_DIRS=/etc/xdg \
> -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \
> + -DLOADER_CODEGEN=OFF \
> -DLOADER_ENABLE_ADDRESS_SANITIZER=OFF \
> -DLOADER_ENABLE_THREAD_SANITIZER=OFF \
> + -DLOADER_USE_UNSAFE_FILE_SEARCH=OFF \
> -DSYSCONFDIR= \
> -DUPDATE_DEPS=OFF \
> -DUSE_GAS=$(VULKAN_LOADER_USE_GAS)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 ` [ptxdist] [PATCH 8/8] vulkan-validationlayers: " Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 0102c45950665e3079850e05989389f615979103.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:17 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Upstream does not overwrite CMAKE_FIND_ROOT_PATH anymore.
> LICENSE.txt added the MIT license for vk_mem_alloc.h
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-8-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch b/patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> deleted file mode 100644
> index 4716894cdd34..000000000000
> --- a/patches/vulkan-validationlayers-1.3.250.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From: Philipp Zabel <p.zabel@pengutronix.de>
> -Date: Tue, 16 May 2023 10:04:03 +0200
> -Subject: [PATCH] Revert "cmake: Fix find_* support 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 reverts commit b7c5ad2eed4405140fd062e5b915950011f4d7d0.
> -
> -Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ----
> - scripts/CMakeLists.txt | 6 +-----
> - 1 file changed, 1 insertion(+), 5 deletions(-)
> -
> -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
> -index 94c8528c83a4..b8aebdd6eca6 100644
> ---- a/scripts/CMakeLists.txt
> -+++ b/scripts/CMakeLists.txt
> -@@ -123,8 +123,4 @@ if (MIMALLOC_INSTALL_DIR)
> - list(APPEND CMAKE_PREFIX_PATH ${MIMALLOC_INSTALL_DIR})
> - 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-validationlayers-1.3.250.1/series b/patches/vulkan-validationlayers-1.3.250.1/series
> deleted file mode 100644
> index ac294ce4fb8b..000000000000
> --- a/patches/vulkan-validationlayers-1.3.250.1/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> -# 6d856a1a207d0d3f7e4c957af59f9af8 - git-ptx-patches magic
> diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
> index ccf762c84f33..3dbd7d3e8457 100644
> --- a/rules/vulkan-validationlayers.make
> +++ b/rules/vulkan-validationlayers.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
> #
> # Paths and names
> #
> -VULKAN_VALIDATIONLAYERS_VERSION := 1.3.250.1
> -VULKAN_VALIDATIONLAYERS_MD5 := f39e0385bd9f688487338956fe2f97c3
> +VULKAN_VALIDATIONLAYERS_VERSION := 1.3.261.0
> +VULKAN_VALIDATIONLAYERS_MD5 := 8bad2c24c9ac716a92d0bf8ae9338112
> VULKAN_VALIDATIONLAYERS := vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
> VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz
> VULKAN_VALIDATIONLAYERS_URL := https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
> VULKAN_VALIDATIONLAYERS_SOURCE := $(SRCDIR)/$(VULKAN_VALIDATIONLAYERS).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
> VULKAN_VALIDATIONLAYERS_DIR := $(BUILDDIR)/$(VULKAN_VALIDATIONLAYERS)
> -VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0
> -VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c
> +VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0 AND MIT
> +VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.3.250.1 -> 1.3.261.0
2023-08-28 8:48 ` [ptxdist] [PATCH 7/8] vulkan-tools: " Philipp Zabel
@ 2023-09-04 6:30 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2023-09-04 6:30 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as c1f0e53f47af7eba973e75d4de20ac9d3e1c978f.
Michael
[sent from post-receive hook]
On Mon, 04 Sep 2023 08:30:17 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Upstream does not overwrite CMAKE_FIND_ROOT_PATH anymore.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230828084813.2812581-7-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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.zabel@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.zabel@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 += \
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-09-04 6:33 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-28 8:48 [ptxdist] [PATCH 1/8] spirv-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
2023-08-28 8:48 ` [ptxdist] [PATCH 2/8] spirv-tools: version bump 1.3.250.1 -> 1.3.256.0 Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 3/8] glslang: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 4/8] shaderc: version bump v2023.4 -> v2023.6 Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 5/8] vulkan-headers: version bump 1.3.250.1 -> 1.3.261.0 Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 6/8] vulkan-loader: " Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 7/8] vulkan-tools: " Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-08-28 8:48 ` [ptxdist] [PATCH 8/8] vulkan-validationlayers: " Philipp Zabel
2023-09-04 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-09-04 6:30 ` [ptxdist] [APPLIED] spirv-headers: " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox