[ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 -> 1.3.204.0

[ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 -> 1.3.204.0

[Philipp Zabel]

Instead of bumping to 11.8.0 and applying the bugfix patches locally,
switch to the Vulkan SDK release version.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/glslang.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/glslang.make b/rules/glslang.make
index e031d6f89a15..87e1ae314937 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
 #
 # Paths and names
 #
-GLSLANG_VERSION		:= 11.7.1
-GLSLANG_MD5		:= 0855c7b65da1e9be5ff89eeddeda691a
+GLSLANG_VERSION		:= 1.3.204.0
+GLSLANG_MD5		:= 68aec74ed09b3cefa0b1abd2681287cf
 GLSLANG			:= glslang-$(GLSLANG_VERSION)
 GLSLANG_SUFFIX		:= tar.gz
-GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
+GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
 GLSLANG_SOURCE		:= $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
 GLSLANG_DIR		:= $(BUILDDIR)/$(GLSLANG)
 GLSLANG_LICENSE		:= BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
-GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
+GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/6] shaderc: version bump v2021.3 -> v2022.1

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/host-shaderc.make | 41 ++++++++++++++++++++++++++++++++++++-
 rules/shaderc.make      | 45 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
index 50b6a6503634..daacb30375f6 100644
--- a/rules/host-shaderc.make
+++ b/rules/host-shaderc.make
@@ -54,9 +54,48 @@ HOST_SHADERC_CONF_TOOL	:= cmake
 HOST_SHADERC_CONF_OPT	:= \
 	$(HOST_CMAKE_OPT) \
 	-DCMAKE_BUILD_TYPE=Release \
+	-DBUILD_EXTERNAL=ON \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_TESTING=ON \
+	-DDISABLE_EXCEPTIONS=OFF \
+	-DDISABLE_RTTI=OFF \
+	-DENABLE_CODE_COVERAGE=OFF \
+	-DENABLE_CTEST=ON \
+	-DENABLE_EXCEPTIONS=OFF \
+	-DENABLE_EXCEPTIONS_ON_MSVC=ON \
+	-DENABLE_GLSLANG_BINARIES=ON \
+	-DENABLE_GLSLANG_JS=OFF \
+	-DENABLE_HLSL=ON \
+	-DENABLE_OPT=ON \
+	-DENABLE_PCH=ON \
+	-DENABLE_RTTI=OFF \
+	-DENABLE_SPVREMAPPER=ON \
+	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
+	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
+	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
+	-DSHADERC_SKIP_EXAMPLES=OFF \
 	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
 	-DSHADERC_SKIP_INSTALL=OFF \
 	-DSHADERC_SKIP_TESTS=ON \
-	-DSHADERC_ENABLE_WERROR_COMPILE=ON
+	-DSKIP_GLSLANG_INSTALL=OFF \
+	-DSKIP_SPIRV_TOOLS_INSTALL=OFF \
+	-DSPIRV_ALLOW_TIMERS=ON \
+	-DSPIRV_BUILD_COMPRESSION=OFF \
+	-DSPIRV_BUILD_FUZZER=OFF \
+	-DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
+	-DSPIRV_CHECK_CONTEXT=ON \
+	-DSPIRV_COLOR_TERMINAL=ON \
+	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
+	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
+	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
+	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
+	-DSPIRV_LOG_DEBUG=OFF \
+	-DSPIRV_SKIP_EXECUTABLES=OFF \
+	-DSPIRV_SKIP_TESTS=ON \
+	-DSPIRV_TOOLS_BUILD_STATIC=ON \
+	-DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
+	-DSPIRV_WARN_EVERYTHING=OFF \
+	-DSPIRV_WERROR=ON \
+	-DUSE_CCACHE=OFF
 
 # vim: syntax=make
diff --git a/rules/shaderc.make b/rules/shaderc.make
index 3970ebcf869d..71a2454a9c21 100644
--- a/rules/shaderc.make
+++ b/rules/shaderc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
 #
 # Paths and names
 #
-SHADERC_VERSION			:= v2021.3
-SHADERC_MD5			:= d35d7dda364d73c65fc82f3f4f917cdd
+SHADERC_VERSION			:= v2022.1
+SHADERC_MD5			:= dc104cea7c6dee347e326031bdb77593
 SHADERC				:= shaderc-$(SHADERC_VERSION)
 SHADERC_SUFFIX			:= tar.gz
 SHADERC_URL			:= \
@@ -72,10 +72,49 @@ SHADERC_CONF_TOOL	:= cmake
 SHADERC_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
 	-DCMAKE_BUILD_TYPE=Release \
+	-DBUILD_EXTERNAL=ON \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_TESTING=ON \
+	-DDISABLE_EXCEPTIONS=OFF \
+	-DDISABLE_RTTI=OFF \
+	-DENABLE_CODE_COVERAGE=OFF \
+	-DENABLE_CTEST=ON \
+	-DENABLE_EXCEPTIONS=OFF \
+	-DENABLE_EXCEPTIONS_ON_MSVC=ON \
+	-DENABLE_GLSLANG_BINARIES=ON \
+	-DENABLE_GLSLANG_JS=OFF \
+	-DENABLE_HLSL=ON \
+	-DENABLE_OPT=ON \
+	-DENABLE_PCH=ON \
+	-DENABLE_RTTI=OFF \
+	-DENABLE_SPVREMAPPER=ON \
+	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
+	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
+	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
+	-DSHADERC_SKIP_EXAMPLES=OFF \
 	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
 	-DSHADERC_SKIP_INSTALL=OFF \
 	-DSHADERC_SKIP_TESTS=ON \
-	-DSHADERC_ENABLE_WERROR_COMPILE=ON
+	-DSKIP_GLSLANG_INSTALL=OFF \
+	-DSKIP_SPIRV_TOOLS_INSTALL=OFF \
+	-DSPIRV_ALLOW_TIMERS=ON \
+	-DSPIRV_BUILD_COMPRESSION=OFF \
+	-DSPIRV_BUILD_FUZZER=OFF \
+	-DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
+	-DSPIRV_CHECK_CONTEXT=ON \
+	-DSPIRV_COLOR_TERMINAL=ON \
+	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
+	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
+	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
+	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
+	-DSPIRV_LOG_DEBUG=OFF \
+	-DSPIRV_SKIP_EXECUTABLES=OFF \
+	-DSPIRV_SKIP_TESTS=ON \
+	-DSPIRV_TOOLS_BUILD_STATIC=ON \
+	-DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
+	-DSPIRV_WARN_EVERYTHING=OFF \
+	-DSPIRV_WERROR=ON \
+	-DUSE_CCACHE=OFF
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/6] spirv-tools: version bump 2021.4 -> 1.3.204.0, separate spirv-headers

[Philipp Zabel]

Instead of bumping to v2022.1 and applying the bugfix patches locally,
switch to the Vulkan SDK release version.

While spirv-tools (and shaderc) use spirv-headers by integrating the
sources into their build tree, vulkan-validationlayers looks for it
using cmake find_package. Split spirv-headers into a proper package
that can be installed into target-sysroot.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/spirv-headers.in   |  8 ++++++++
 rules/spirv-headers.make | 35 +++++++++++++++++++++++++++++++++++
 rules/spirv-tools.make   | 39 ++++++++++++---------------------------
 3 files changed, 55 insertions(+), 27 deletions(-)
 create mode 100644 rules/spirv-headers.in
 create mode 100644 rules/spirv-headers.make

diff --git a/rules/spirv-headers.in b/rules/spirv-headers.in
new file mode 100644
index 000000000000..742a7f682026
--- /dev/null
+++ b/rules/spirv-headers.in
@@ -0,0 +1,8 @@
+## SECTION=multimedia_libs
+
+menuconfig SPIRV_HEADERS
+	tristate
+	prompt "spirv-headers"
+	select HOST_CMAKE
+	help
+	  SPIR-V Headers
diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make
new file mode 100644
index 000000000000..70416f79ac08
--- /dev/null
+++ b/rules/spirv-headers.make
@@ -0,0 +1,35 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2022 by Philipp Zabel <p.zabel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers
+
+#
+# Paths and names
+#
+SPIRV_HEADERS_VERSION	:= 1.3.204.0
+SPIRV_HEADERS_MD5	:= 09ea3d4f15f4d79bd58ff01239ab213e
+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)
+SPIRV_HEADERS_SOURCE	:= $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
+SPIRV_HEADERS_DIR	:= $(BUILDDIR)/$(SPIRV_HEADERS)
+SPIRV_HEADERS_LICENSE	:= Khronos
+SPIRV_HEADERS_LICENSE_FILES := file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+SPIRV_HEADERS_CONF_TOOL	:= cmake
+SPIRV_HEADERS_CONF_OPT	:= \
+	$(CROSS_CMAKE_USR)
+
+# vim: syntax=make
diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
index 341c9aecd17f..770df808107c 100644
--- a/rules/spirv-tools.make
+++ b/rules/spirv-tools.make
@@ -14,26 +14,25 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
 #
 # Paths and names
 #
-SPIRV_TOOLS_VERSION	:= 2021.4
-SPIRV_TOOLS_MD5		:= bb36f699fcaca7362b983d75fa5a547b
+SPIRV_TOOLS_VERSION	:= 1.3.204.0
+SPIRV_TOOLS_MD5		:= 0078b5a2635e6cefe8e47eda98ec86b4
 SPIRV_TOOLS		:= spirv-tools-$(SPIRV_TOOLS_VERSION)
 SPIRV_TOOLS_SUFFIX	:= tar.gz
-SPIRV_TOOLS_URL		:= https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
+SPIRV_TOOLS_URL		:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
 SPIRV_TOOLS_SOURCE	:= $(SRCDIR)/$(SPIRV_TOOLS).$(SPIRV_TOOLS_SUFFIX)
 SPIRV_TOOLS_DIR		:= $(BUILDDIR)/$(SPIRV_TOOLS)
+SPIRV_TOOLS_BUILD_DIR	:= $(SPIRV_TOOLS_DIR)-build
 SPIRV_TOOLS_LICENSE	:= Apache-2.0
 SPIRV_TOOLS_LICENSE_FILES := file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57
 
+SPIRV_TOOLS_SPIRV_HEADERS_MD5		= $(SPIRV_HEADERS_MD5)
+SPIRV_TOOLS_SPIRV_HEADERS_URL		= $(SPIRV_HEADERS_URL)
+SPIRV_TOOLS_SPIRV_HEADERS_SOURCE	= $(SPIRV_HEADERS_SOURCE)
+SPIRV_TOOLS_SPIRV_HEADERS_DIR		= $(SPIRV_TOOLS_DIR)/external/spirv-headers
 
-SPIRV_HEADERS_VERSION	:= 2021-11-11-g814e728b30dd
-SPIRV_HEADERS_MD5	:= 42b6d6fef675c42eddbc7742f033c964
-SPIRV_HEADERS_SUFFIX	:= tar.gz
-SPIRV_HEADERS_URL	:= https://github.com/KhronosGroup/SPIRV-Headers/archive/$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
-SPIRV_HEADERS_SOURCE	:= $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
-$(SPIRV_HEADERS_SOURCE) := SPIRV_HEADERS
-SPIRV_HEADERS_DIR	:= $(SPIRV_TOOLS_DIR)/external/spirv-headers
-
-SPIRV_TOOLS_SOURCES	:= $(SPIRV_TOOLS_SOURCE) $(SPIRV_HEADERS_SOURCE)
+SPIRV_TOOLS_SOURCES	:= \
+	$(SPIRV_TOOLS_SOURCE) \
+	$(SPIRV_TOOLS_SPIRV_HEADERS_SOURCE)
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -43,7 +42,7 @@ $(STATEDIR)/spirv-tools.extract:
 	@$(call targetinfo)
 	@$(call clean, $(SPIRV_TOOLS_DIR))
 	@$(call extract, SPIRV_TOOLS)
-	@$(call extract, SPIRV_HEADERS)
+	@$(call extract, SPIRV_TOOLS_SPIRV_HEADERS)
 	@$(call patchin, SPIRV_TOOLS)
 	@$(call touch)
 
@@ -73,20 +72,6 @@ SPIRV_TOOLS_CONF_OPT	:= \
 	-DSPIRV_WARN_EVERYTHING=OFF \
 	-DSPIRV_WERROR=OFF
 
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/spirv-tools.install:
-	@$(call targetinfo)
-	@install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools.a $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools.a
-	@install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/opt/libSPIRV-Tools-opt.a $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-opt.a
-	@install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools-shared.so $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-shared.so
-	@mkdir -p $(SPIRV_TOOLS_PKGDIR)/usr/include
-	@cp -r $(SPIRV_HEADERS_DIR)/include/spirv $(SPIRV_TOOLS_PKGDIR)/usr/include
-	@cp -r $(SPIRV_TOOLS_DIR)/include/spirv-tools $(SPIRV_TOOLS_PKGDIR)/usr/include
-	$(call touch)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 4/6] vulkan-loader: version bump 1.2.198.1 -> 1.3.204.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/vulkan-loader.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
index 765eb56a43c4..b621a4c31cac 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.2.198.1
-VULKAN_LOADER_MD5	:= e2a381bb2457227519a0a75aeee62975
+VULKAN_LOADER_VERSION	:= 1.3.204.0
+VULKAN_LOADER_MD5	:= d827ae5dca714e0d4a12afd2a1d98d31
 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)
@@ -24,8 +24,8 @@ VULKAN_LOADER_DIR	:= $(BUILDDIR)/$(VULKAN_LOADER)
 VULKAN_LOADER_LICENSE	:= Apache-2.0
 VULKAN_LOADER_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac
 
-VULKAN_HEADERS_VERSION	:= 1.2.198.0
-VULKAN_HEADERS_MD5	:= a9f32ec0bebd5c6ee4d27930c0fe12d8
+VULKAN_HEADERS_VERSION	:= 1.3.204.0
+VULKAN_HEADERS_MD5	:= 9b4ec61c3545d7c9404f59c0ce27e99f
 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)
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 5/6] vulkan-tools: version bump 1.2.198.0 -> 1.3.204.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/vulkan-tools.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
index 4d1867797e24..c794e20a6ebe 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.2.198.0
-VULKAN_TOOLS_MD5	:= 80b230159fb52aeb7fac1e83909ad57e
+VULKAN_TOOLS_VERSION	:= 1.3.204.0
+VULKAN_TOOLS_MD5	:= 0be3f5d08219a2dd3253b095093d94a2
 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)
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 6/6] vulkan-validationlayers: version bump 1.2.198.0 -> 1.3.204.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/vulkan-validationlayers.in   | 1 +
 rules/vulkan-validationlayers.make | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/rules/vulkan-validationlayers.in b/rules/vulkan-validationlayers.in
index f7eb3e9f68b7..9e85100ccd32 100644
--- a/rules/vulkan-validationlayers.in
+++ b/rules/vulkan-validationlayers.in
@@ -7,6 +7,7 @@ config VULKAN_VALIDATIONLAYERS
 	select HOST_GLSLANG
 	select VULKAN_LOADER
 	select GLSLANG		if BUILDTIME
+	select SPIRV_HEADERS	if BUILDTIME
 	select SPIRV_TOOLS	if BUILDTIME
 	select LIBXCB		if VULKAN_VALIDATIONLAYERS_XCB
 	select WAYLAND		if VULKAN_VALIDATIONLAYERS_WAYLAND
diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
index 71f0a079ef5d..d727c7304cc2 100644
--- a/rules/vulkan-validationlayers.make
+++ b/rules/vulkan-validationlayers.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
 #
 # Paths and names
 #
-VULKAN_VALIDATIONLAYERS_VERSION	:= 1.2.198.0
-VULKAN_VALIDATIONLAYERS_MD5	:= b19041a161edcbba9ea4e2fb9eb4cfa0
+VULKAN_VALIDATIONLAYERS_VERSION	:= 1.3.204.0
+VULKAN_VALIDATIONLAYERS_MD5	:= da16de9110e2fd16cd231c2c6a75e0f0
 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)
@@ -43,11 +43,8 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT	:= \
 	-DDEMOS_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND, WAYLAND, \
 			$(call ptx/ifdef, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB, XCB, DISPLAY)) \
 	-DINSTALL_TESTS=OFF \
-	-DSPIRV_HEADERS_INSTALL_DIR=$(PTXDIST_SYSROOT_TARGET)/usr \
-	-DSPIRV_TOOLS_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin \
 	-DUSE_CCACHE=OFF \
 	-DUSE_ROBIN_HOOD_HASHING=OFF \
-	-DVulkanRegistry_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/share/vulkan \
 	-DVVL_CPP_STANDARD=14 \
 	-DVVL_ENABLE_ASAN=OFF
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 -> 1.3.204.0

[Roland Hieber]

On Wed, Feb 23, 2022 at 11:17:05AM +0100, Philipp Zabel wrote:
> Instead of bumping to 11.8.0 and applying the bugfix patches locally,
> switch to the Vulkan SDK release version.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/glslang.make | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/glslang.make b/rules/glslang.make
> index e031d6f89a15..87e1ae314937 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
>  #
>  # Paths and names
>  #
> -GLSLANG_VERSION		:= 11.7.1
> -GLSLANG_MD5		:= 0855c7b65da1e9be5ff89eeddeda691a
> +GLSLANG_VERSION		:= 1.3.204.0
> +GLSLANG_MD5		:= 68aec74ed09b3cefa0b1abd2681287cf
>  GLSLANG			:= glslang-$(GLSLANG_VERSION)
>  GLSLANG_SUFFIX		:= tar.gz
> -GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> +GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
>  GLSLANG_SOURCE		:= $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
>  GLSLANG_DIR		:= $(BUILDDIR)/$(GLSLANG)
>  GLSLANG_LICENSE		:= BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
> -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
> +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3

I guess this was just the usual beginning-of-year copyright date bump?

 - Roland

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 3/6] spirv-tools: version bump 2021.4 -> 1.3.204.0, separate spirv-headers

[Roland Hieber]

On Wed, Feb 23, 2022 at 11:17:07AM +0100, Philipp Zabel wrote:
> Instead of bumping to v2022.1 and applying the bugfix patches locally,
> switch to the Vulkan SDK release version.
> 
> While spirv-tools (and shaderc) use spirv-headers by integrating the
> sources into their build tree, vulkan-validationlayers looks for it
> using cmake find_package. Split spirv-headers into a proper package
> that can be installed into target-sysroot.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/spirv-headers.in   |  8 ++++++++
>  rules/spirv-headers.make | 35 +++++++++++++++++++++++++++++++++++
>  rules/spirv-tools.make   | 39 ++++++++++++---------------------------
>  3 files changed, 55 insertions(+), 27 deletions(-)
>  create mode 100644 rules/spirv-headers.in
>  create mode 100644 rules/spirv-headers.make
> 
[…]
> --- a/rules/spirv-tools.make
> +++ b/rules/spirv-tools.make
> @@ -14,26 +14,25 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
>  #
>  # Paths and names
>  #
> -SPIRV_TOOLS_VERSION	:= 2021.4
> -SPIRV_TOOLS_MD5		:= bb36f699fcaca7362b983d75fa5a547b
> +SPIRV_TOOLS_VERSION	:= 1.3.204.0

Hmm, I wonder if this make problems with ipkg complaining about versions
going backwards, or whether we need to care about this at all.

 - Roland

> +SPIRV_TOOLS_MD5		:= 0078b5a2635e6cefe8e47eda98ec86b4
>  SPIRV_TOOLS		:= spirv-tools-$(SPIRV_TOOLS_VERSION)
>  SPIRV_TOOLS_SUFFIX	:= tar.gz
> -SPIRV_TOOLS_URL		:= https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
> +SPIRV_TOOLS_URL		:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
>  SPIRV_TOOLS_SOURCE	:= $(SRCDIR)/$(SPIRV_TOOLS).$(SPIRV_TOOLS_SUFFIX)
>  SPIRV_TOOLS_DIR		:= $(BUILDDIR)/$(SPIRV_TOOLS)
> +SPIRV_TOOLS_BUILD_DIR	:= $(SPIRV_TOOLS_DIR)-build
>  SPIRV_TOOLS_LICENSE	:= Apache-2.0
>  SPIRV_TOOLS_LICENSE_FILES := file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57
>  
> +SPIRV_TOOLS_SPIRV_HEADERS_MD5		= $(SPIRV_HEADERS_MD5)
> +SPIRV_TOOLS_SPIRV_HEADERS_URL		= $(SPIRV_HEADERS_URL)
> +SPIRV_TOOLS_SPIRV_HEADERS_SOURCE	= $(SPIRV_HEADERS_SOURCE)
> +SPIRV_TOOLS_SPIRV_HEADERS_DIR		= $(SPIRV_TOOLS_DIR)/external/spirv-headers
>  
> -SPIRV_HEADERS_VERSION	:= 2021-11-11-g814e728b30dd
> -SPIRV_HEADERS_MD5	:= 42b6d6fef675c42eddbc7742f033c964
> -SPIRV_HEADERS_SUFFIX	:= tar.gz
> -SPIRV_HEADERS_URL	:= https://github.com/KhronosGroup/SPIRV-Headers/archive/$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
> -SPIRV_HEADERS_SOURCE	:= $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
> -$(SPIRV_HEADERS_SOURCE) := SPIRV_HEADERS
> -SPIRV_HEADERS_DIR	:= $(SPIRV_TOOLS_DIR)/external/spirv-headers
> -
> -SPIRV_TOOLS_SOURCES	:= $(SPIRV_TOOLS_SOURCE) $(SPIRV_HEADERS_SOURCE)
> +SPIRV_TOOLS_SOURCES	:= \
> +	$(SPIRV_TOOLS_SOURCE) \
> +	$(SPIRV_TOOLS_SPIRV_HEADERS_SOURCE)
>  
>  # ----------------------------------------------------------------------------
>  # Extract
> @@ -43,7 +42,7 @@ $(STATEDIR)/spirv-tools.extract:
>  	@$(call targetinfo)
>  	@$(call clean, $(SPIRV_TOOLS_DIR))
>  	@$(call extract, SPIRV_TOOLS)
> -	@$(call extract, SPIRV_HEADERS)
> +	@$(call extract, SPIRV_TOOLS_SPIRV_HEADERS)
>  	@$(call patchin, SPIRV_TOOLS)
>  	@$(call touch)
>  
> @@ -73,20 +72,6 @@ SPIRV_TOOLS_CONF_OPT	:= \
>  	-DSPIRV_WARN_EVERYTHING=OFF \
>  	-DSPIRV_WERROR=OFF
>  
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/spirv-tools.install:
> -	@$(call targetinfo)
> -	@install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools.a $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools.a
> -	@install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/opt/libSPIRV-Tools-opt.a $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-opt.a
> -	@install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools-shared.so $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-shared.so
> -	@mkdir -p $(SPIRV_TOOLS_PKGDIR)/usr/include
> -	@cp -r $(SPIRV_HEADERS_DIR)/include/spirv $(SPIRV_TOOLS_PKGDIR)/usr/include
> -	@cp -r $(SPIRV_TOOLS_DIR)/include/spirv-tools $(SPIRV_TOOLS_PKGDIR)/usr/include
> -	$(call touch)
> -
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> -- 
> 2.30.2

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 -> 1.3.204.0

[Philipp Zabel]

On Do, 2022-02-24 at 16:54 +0100, Roland Hieber wrote:
> I guess this was just the usual beginning-of-year copyright date
> bump?

Hm, no, they added the Khronos license used by the SPIRV/GLSL.ext.*.h
headers [1] and the full GPL-3.0 license text [2].

[1] https://github.com/KhronosGroup/glslang/commit/5944f672a83cb81d4307ba41316c14a35c81c1b1
[2] https://github.com/KhronosGroup/glslang/commit/d465ac12ddb207fbc805b0f9952297afbb69f8e4

I missed [1], I suppose GLSLANG_LICENSE should now be:

BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND Khronos

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 3/6] spirv-tools: version bump 2021.4 -> 1.3.204.0, separate spirv-headers

[Philipp Zabel]

On Do, 2022-02-24 at 16:56 +0100, Roland Hieber wrote:
[...]
> > --- a/rules/spirv-tools.make
> > +++ b/rules/spirv-tools.make
> > @@ -14,26 +14,25 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
> >  #
> >  # Paths and names
> >  #
> > -SPIRV_TOOLS_VERSION    := 2021.4
> > -SPIRV_TOOLS_MD5                := bb36f699fcaca7362b983d75fa5a547b
> > +SPIRV_TOOLS_VERSION    := 1.3.204.0
> 
> Hmm, I wonder if this make problems with ipkg complaining about
> versions going backwards, or whether we need to care about this at
> all.

Good question, glslang has the same issue (and already had this happen
in the past [1] when tags were introduced).

[1] 37194316d01e ("glslang: version bump 2021-02-18-ge56beaee7368 -> 11.4.0")

regards
Philipp


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 -> 1.3.204.0

[Michael Olbrich]

On Wed, Feb 23, 2022 at 11:17:05AM +0100, Philipp Zabel wrote:
> Instead of bumping to 11.8.0 and applying the bugfix patches locally,
> switch to the Vulkan SDK release version.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/glslang.make | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/glslang.make b/rules/glslang.make
> index e031d6f89a15..87e1ae314937 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
>  #
>  # Paths and names
>  #
> -GLSLANG_VERSION		:= 11.7.1
> -GLSLANG_MD5		:= 0855c7b65da1e9be5ff89eeddeda691a
> +GLSLANG_VERSION		:= 1.3.204.0
> +GLSLANG_MD5		:= 68aec74ed09b3cefa0b1abd2681287cf
>  GLSLANG			:= glslang-$(GLSLANG_VERSION)
>  GLSLANG_SUFFIX		:= tar.gz
> -GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> +GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
>  GLSLANG_SOURCE		:= $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
>  GLSLANG_DIR		:= $(BUILDDIR)/$(GLSLANG)
>  GLSLANG_LICENSE		:= BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
> -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
> +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3

Please comment on the changes in the commit message.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 3/6] spirv-tools: version bump 2021.4 -> 1.3.204.0, separate spirv-headers

[Michael Olbrich]

On Thu, Feb 24, 2022 at 05:14:47PM +0100, Philipp Zabel wrote:
> On Do, 2022-02-24 at 16:56 +0100, Roland Hieber wrote:
> [...]
> > > --- a/rules/spirv-tools.make
> > > +++ b/rules/spirv-tools.make
> > > @@ -14,26 +14,25 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
> > >  #
> > >  # Paths and names
> > >  #
> > > -SPIRV_TOOLS_VERSION    := 2021.4
> > > -SPIRV_TOOLS_MD5                := bb36f699fcaca7362b983d75fa5a547b
> > > +SPIRV_TOOLS_VERSION    := 1.3.204.0
> > 
> > Hmm, I wonder if this make problems with ipkg complaining about
> > versions going backwards, or whether we need to care about this at
> > all.
> 
> Good question, glslang has the same issue (and already had this happen
> in the past [1] when tags were introduced).
> 
> [1] 37194316d01e ("glslang: version bump 2021-02-18-ge56beaee7368 -> 11.4.0")

I'm pretty sure that happend to other packages as well and nobody ever
complained about it.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 -> 1.3.204.0

[Michael Olbrich]

On Thu, Feb 24, 2022 at 05:07:18PM +0100, Philipp Zabel wrote:
> On Do, 2022-02-24 at 16:54 +0100, Roland Hieber wrote:
> > I guess this was just the usual beginning-of-year copyright date
> > bump?
> 
> Hm, no, they added the Khronos license used by the SPIRV/GLSL.ext.*.h
> headers [1] and the full GPL-3.0 license text [2].

That's why we have the md5 and why there should always be a comment about
what changed in the license files...


> [1] https://github.com/KhronosGroup/glslang/commit/5944f672a83cb81d4307ba41316c14a35c81c1b1
> [2] https://github.com/KhronosGroup/glslang/commit/d465ac12ddb207fbc805b0f9952297afbb69f8e4
> 
> I missed [1], I suppose GLSLANG_LICENSE should now be:
> 
> BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND Khronos

>From the PTXdist documentation[1]:
"If no license identifier matches, or if anything is unclear about the
licensing situation, use the identifier custom"

I hate it when people modify a common license. It's basically a MIT license
but they had to add an extra paragraph that's not really about licensing
anyways :-/.

Michael


[1] https://www.ptxdist.org/doc/dev_licenses.html#distillation-into-license-identifiers

> regards
> Philipp
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] shaderc: version bump v2021.3 -> v2022.1

[Michael Olbrich]

Thanks, applied as 733d4f610ba73704ad505997800cc0106e5815d4.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:41 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220223101710.3873749-2-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 50b6a6503634..daacb30375f6 100644
> --- a/rules/host-shaderc.make
> +++ b/rules/host-shaderc.make
> @@ -54,9 +54,48 @@ HOST_SHADERC_CONF_TOOL	:= cmake
>  HOST_SHADERC_CONF_OPT	:= \
>  	$(HOST_CMAKE_OPT) \
>  	-DCMAKE_BUILD_TYPE=Release \
> +	-DBUILD_EXTERNAL=ON \
> +	-DBUILD_SHARED_LIBS=OFF \
> +	-DBUILD_TESTING=ON \
> +	-DDISABLE_EXCEPTIONS=OFF \
> +	-DDISABLE_RTTI=OFF \
> +	-DENABLE_CODE_COVERAGE=OFF \
> +	-DENABLE_CTEST=ON \
> +	-DENABLE_EXCEPTIONS=OFF \
> +	-DENABLE_EXCEPTIONS_ON_MSVC=ON \
> +	-DENABLE_GLSLANG_BINARIES=ON \
> +	-DENABLE_GLSLANG_JS=OFF \
> +	-DENABLE_HLSL=ON \
> +	-DENABLE_OPT=ON \
> +	-DENABLE_PCH=ON \
> +	-DENABLE_RTTI=OFF \
> +	-DENABLE_SPVREMAPPER=ON \
> +	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
> +	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
> +	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
> +	-DSHADERC_SKIP_EXAMPLES=OFF \
>  	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
>  	-DSHADERC_SKIP_INSTALL=OFF \
>  	-DSHADERC_SKIP_TESTS=ON \
> -	-DSHADERC_ENABLE_WERROR_COMPILE=ON
> +	-DSKIP_GLSLANG_INSTALL=OFF \
> +	-DSKIP_SPIRV_TOOLS_INSTALL=OFF \
> +	-DSPIRV_ALLOW_TIMERS=ON \
> +	-DSPIRV_BUILD_COMPRESSION=OFF \
> +	-DSPIRV_BUILD_FUZZER=OFF \
> +	-DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
> +	-DSPIRV_CHECK_CONTEXT=ON \
> +	-DSPIRV_COLOR_TERMINAL=ON \
> +	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
> +	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> +	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
> +	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
> +	-DSPIRV_LOG_DEBUG=OFF \
> +	-DSPIRV_SKIP_EXECUTABLES=OFF \
> +	-DSPIRV_SKIP_TESTS=ON \
> +	-DSPIRV_TOOLS_BUILD_STATIC=ON \
> +	-DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
> +	-DSPIRV_WARN_EVERYTHING=OFF \
> +	-DSPIRV_WERROR=ON \
> +	-DUSE_CCACHE=OFF
>  
>  # vim: syntax=make
> diff --git a/rules/shaderc.make b/rules/shaderc.make
> index 3970ebcf869d..71a2454a9c21 100644
> --- a/rules/shaderc.make
> +++ b/rules/shaderc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
>  #
>  # Paths and names
>  #
> -SHADERC_VERSION			:= v2021.3
> -SHADERC_MD5			:= d35d7dda364d73c65fc82f3f4f917cdd
> +SHADERC_VERSION			:= v2022.1
> +SHADERC_MD5			:= dc104cea7c6dee347e326031bdb77593
>  SHADERC				:= shaderc-$(SHADERC_VERSION)
>  SHADERC_SUFFIX			:= tar.gz
>  SHADERC_URL			:= \
> @@ -72,10 +72,49 @@ SHADERC_CONF_TOOL	:= cmake
>  SHADERC_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
>  	-DCMAKE_BUILD_TYPE=Release \
> +	-DBUILD_EXTERNAL=ON \
> +	-DBUILD_SHARED_LIBS=OFF \
> +	-DBUILD_TESTING=ON \
> +	-DDISABLE_EXCEPTIONS=OFF \
> +	-DDISABLE_RTTI=OFF \
> +	-DENABLE_CODE_COVERAGE=OFF \
> +	-DENABLE_CTEST=ON \
> +	-DENABLE_EXCEPTIONS=OFF \
> +	-DENABLE_EXCEPTIONS_ON_MSVC=ON \
> +	-DENABLE_GLSLANG_BINARIES=ON \
> +	-DENABLE_GLSLANG_JS=OFF \
> +	-DENABLE_HLSL=ON \
> +	-DENABLE_OPT=ON \
> +	-DENABLE_PCH=ON \
> +	-DENABLE_RTTI=OFF \
> +	-DENABLE_SPVREMAPPER=ON \
> +	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
> +	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
> +	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
> +	-DSHADERC_SKIP_EXAMPLES=OFF \
>  	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
>  	-DSHADERC_SKIP_INSTALL=OFF \
>  	-DSHADERC_SKIP_TESTS=ON \
> -	-DSHADERC_ENABLE_WERROR_COMPILE=ON
> +	-DSKIP_GLSLANG_INSTALL=OFF \
> +	-DSKIP_SPIRV_TOOLS_INSTALL=OFF \
> +	-DSPIRV_ALLOW_TIMERS=ON \
> +	-DSPIRV_BUILD_COMPRESSION=OFF \
> +	-DSPIRV_BUILD_FUZZER=OFF \
> +	-DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
> +	-DSPIRV_CHECK_CONTEXT=ON \
> +	-DSPIRV_COLOR_TERMINAL=ON \
> +	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
> +	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> +	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
> +	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
> +	-DSPIRV_LOG_DEBUG=OFF \
> +	-DSPIRV_SKIP_EXECUTABLES=OFF \
> +	-DSPIRV_SKIP_TESTS=ON \
> +	-DSPIRV_TOOLS_BUILD_STATIC=ON \
> +	-DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
> +	-DSPIRV_WARN_EVERYTHING=OFF \
> +	-DSPIRV_WERROR=ON \
> +	-DUSE_CCACHE=OFF
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] vulkan-loader: version bump 1.2.198.1 -> 1.3.204.0

[Michael Olbrich]

Thanks, applied as 9fe8d5ae12a3f296fb2785fe512c1b1a068a49b7.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:44 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220223101710.3873749-4-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 765eb56a43c4..b621a4c31cac 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.2.198.1
> -VULKAN_LOADER_MD5	:= e2a381bb2457227519a0a75aeee62975
> +VULKAN_LOADER_VERSION	:= 1.3.204.0
> +VULKAN_LOADER_MD5	:= d827ae5dca714e0d4a12afd2a1d98d31
>  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)
> @@ -24,8 +24,8 @@ VULKAN_LOADER_DIR	:= $(BUILDDIR)/$(VULKAN_LOADER)
>  VULKAN_LOADER_LICENSE	:= Apache-2.0
>  VULKAN_LOADER_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac
>  
> -VULKAN_HEADERS_VERSION	:= 1.2.198.0
> -VULKAN_HEADERS_MD5	:= a9f32ec0bebd5c6ee4d27930c0fe12d8
> +VULKAN_HEADERS_VERSION	:= 1.3.204.0
> +VULKAN_HEADERS_MD5	:= 9b4ec61c3545d7c9404f59c0ce27e99f
>  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)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.2.198.0 -> 1.3.204.0

[Michael Olbrich]

Thanks, applied as 27592c22962e75869adba7f66d84ab72f4a1ebc8.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:46 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220223101710.3873749-5-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
> index 4d1867797e24..c794e20a6ebe 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.2.198.0
> -VULKAN_TOOLS_MD5	:= 80b230159fb52aeb7fac1e83909ad57e
> +VULKAN_TOOLS_VERSION	:= 1.3.204.0
> +VULKAN_TOOLS_MD5	:= 0be3f5d08219a2dd3253b095093d94a2
>  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)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.2.198.0 -> 1.3.204.0

[Michael Olbrich]

Thanks, applied as 0308d4f634d455ef7909358ade56033222bbf773.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:47 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220223101710.3873749-6-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/vulkan-validationlayers.in b/rules/vulkan-validationlayers.in
> index f7eb3e9f68b7..9e85100ccd32 100644
> --- a/rules/vulkan-validationlayers.in
> +++ b/rules/vulkan-validationlayers.in
> @@ -7,6 +7,7 @@ config VULKAN_VALIDATIONLAYERS
>  	select HOST_GLSLANG
>  	select VULKAN_LOADER
>  	select GLSLANG		if BUILDTIME
> +	select SPIRV_HEADERS	if BUILDTIME
>  	select SPIRV_TOOLS	if BUILDTIME
>  	select LIBXCB		if VULKAN_VALIDATIONLAYERS_XCB
>  	select WAYLAND		if VULKAN_VALIDATIONLAYERS_WAYLAND
> diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
> index 71f0a079ef5d..d727c7304cc2 100644
> --- a/rules/vulkan-validationlayers.make
> +++ b/rules/vulkan-validationlayers.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
>  #
>  # Paths and names
>  #
> -VULKAN_VALIDATIONLAYERS_VERSION	:= 1.2.198.0
> -VULKAN_VALIDATIONLAYERS_MD5	:= b19041a161edcbba9ea4e2fb9eb4cfa0
> +VULKAN_VALIDATIONLAYERS_VERSION	:= 1.3.204.0
> +VULKAN_VALIDATIONLAYERS_MD5	:= da16de9110e2fd16cd231c2c6a75e0f0
>  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)
> @@ -43,11 +43,8 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT	:= \
>  	-DDEMOS_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND, WAYLAND, \
>  			$(call ptx/ifdef, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB, XCB, DISPLAY)) \
>  	-DINSTALL_TESTS=OFF \
> -	-DSPIRV_HEADERS_INSTALL_DIR=$(PTXDIST_SYSROOT_TARGET)/usr \
> -	-DSPIRV_TOOLS_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin \
>  	-DUSE_CCACHE=OFF \
>  	-DUSE_ROBIN_HOOD_HASHING=OFF \
> -	-DVulkanRegistry_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/share/vulkan \
>  	-DVVL_CPP_STANDARD=14 \
>  	-DVVL_ENABLE_ASAN=OFF
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de