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 7af639b9db41..e132f6806ec6 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION := 1.3.231.1 -GLSLANG_MD5 := b6308880c655a50d50e0dd0e049ba5d5 +GLSLANG_VERSION := 1.3.236.0 +GLSLANG_MD5 := 624390dc06d35f359ed14288bb8ccbe1 GLSLANG := glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) -- 2.30.2
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- rules/host-shaderc.make | 1 - rules/shaderc.make | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make index daacb30375f6..c81708b0e5d8 100644 --- a/rules/host-shaderc.make +++ b/rules/host-shaderc.make @@ -77,7 +77,6 @@ HOST_SHADERC_CONF_OPT := \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DSHADERC_SKIP_INSTALL=OFF \ -DSHADERC_SKIP_TESTS=ON \ - -DSKIP_GLSLANG_INSTALL=OFF \ -DSKIP_SPIRV_TOOLS_INSTALL=OFF \ -DSPIRV_ALLOW_TIMERS=ON \ -DSPIRV_BUILD_COMPRESSION=OFF \ diff --git a/rules/shaderc.make b/rules/shaderc.make index c924ebc256fe..2b9b021da7cc 100644 --- a/rules/shaderc.make +++ b/rules/shaderc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc # # Paths and names # -SHADERC_VERSION := v2022.3 -SHADERC_MD5 := 5cb762af57637caf997d5f46baa4e8a4 +SHADERC_VERSION := v2022.4 +SHADERC_MD5 := 7a3039ee4e489775957aa3015859f902 SHADERC := shaderc-$(SHADERC_VERSION) SHADERC_SUFFIX := tar.gz SHADERC_URL := \ @@ -92,10 +92,8 @@ SHADERC_CONF_OPT := \ -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 \ - -DSKIP_GLSLANG_INSTALL=OFF \ -DSKIP_SPIRV_TOOLS_INSTALL=OFF \ -DSPIRV_ALLOW_TIMERS=ON \ -DSPIRV_BUILD_COMPRESSION=OFF \ -- 2.30.2
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- rules/spirv-headers.make | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index ddf8b26049ea..54e02957263e 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.231.1 -SPIRV_HEADERS_MD5 := 2eac8853ab6ad09a31c6464ca3051407 +SPIRV_HEADERS_VERSION := 1.3.236.0 +SPIRV_HEADERS_MD5 := da1982a5df290f7a76ff786af4587ffc 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) @@ -30,8 +30,6 @@ SPIRV_HEADERS_LICENSE_FILES := file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae SPIRV_HEADERS_CONF_TOOL := cmake SPIRV_HEADERS_CONF_OPT := \ - $(CROSS_CMAKE_USR) \ - -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ - -DSPIRV_HEADERS_SKIP_INSTALL=OFF + $(CROSS_CMAKE_USR) # vim: syntax=make -- 2.30.2
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- rules/spirv-tools.make | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index 6a9b3cb12fa4..b6e8549b5b90 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.231.1 -SPIRV_TOOLS_MD5 := 400b8ea1c96b1662cbe5668d81548a52 +SPIRV_TOOLS_VERSION := 1.3.236.0 +SPIRV_TOOLS_MD5 := 10172b6f37dda90946cbe0a9ba884c13 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) @@ -64,7 +64,6 @@ SPIRV_TOOLS_CONF_OPT := \ -DSPIRV_COLOR_TERMINAL=ON \ -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ -DSPIRV_HEADERS_SKIP_INSTALL=ON \ - -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \ -DSPIRV_LOG_DEBUG=OFF \ -DSPIRV_SKIP_EXECUTABLES=ON \ -DSPIRV_SKIP_TESTS=ON \ -- 2.30.2
Split vulkan-headers out of vulkan-loader, it has proper CMake support now. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- rules/vulkan-headers.in | 8 ++++++++ rules/vulkan-headers.make | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 rules/vulkan-headers.in create mode 100644 rules/vulkan-headers.make diff --git a/rules/vulkan-headers.in b/rules/vulkan-headers.in new file mode 100644 index 000000000000..06329f8fd0dd --- /dev/null +++ b/rules/vulkan-headers.in @@ -0,0 +1,8 @@ +## SECTION=multimedia_libs + +menuconfig VULKAN_HEADERS + tristate + prompt "vulkan-headers" + select HOST_CMAKE + help + Vulkan Headers diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make new file mode 100644 index 000000000000..da62d80f6b6e --- /dev/null +++ b/rules/vulkan-headers.make @@ -0,0 +1,39 @@ +# -*-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_VULKAN_HEADERS) += vulkan-headers + +# +# Paths and names +# + +VULKAN_HEADERS_VERSION := 1.3.236.0 +VULKAN_HEADERS_MD5 := 9fba7f1ef2c43b6ce3c9660a618e788c +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_FILES := \ + file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 + + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +VULKAN_HEADERS_CONF_TOOL := cmake +VULKAN_HEADERS_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DVULKAN_HEADERS_INSTALL=ON + +# vim: syntax=make -- 2.30.2
Split out vulkan-headers, which has proper CMake support now. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- rules/vulkan-loader.in | 1 + rules/vulkan-loader.make | 45 +++++----------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/rules/vulkan-loader.in b/rules/vulkan-loader.in index 646045f5f1d7..c3ad8f5a468a 100644 --- a/rules/vulkan-loader.in +++ b/rules/vulkan-loader.in @@ -5,6 +5,7 @@ menuconfig VULKAN_LOADER prompt "vulkan-loader " select HOST_CMAKE select HOST_QEMU + select VULKAN_HEADERS select LIBXCB if VULKAN_LOADER_XCB select WAYLAND if VULKAN_LOADER_WAYLAND help diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 9d537da6b7b9..74346807f079 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.231.1 -VULKAN_LOADER_MD5 := 1b7da12f3339204c48eafef259aad635 +VULKAN_LOADER_VERSION := 1.3.236.0 +VULKAN_LOADER_MD5 := ed9d0fd06898e508adb4e2bdff2c88a5 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,28 +24,6 @@ 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.3.231.1 -VULKAN_HEADERS_MD5 := 2b622628ff998288b3dd6778f63c9e2b -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_SOURCE) := VULKAN_HEADERS -VULKAN_HEADERS_DIR := $(VULKAN_LOADER_DIR)/vulkan-headers - -VULKAN_LOADER_SOURCES := $(VULKAN_LOADER_SOURCE) $(VULKAN_HEADERS_SOURCE) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/vulkan-loader.extract: - @$(call targetinfo) - @$(call clean, $(VULKAN_LOADER_DIR)) - @$(call extract, VULKAN_LOADER) - @$(call extract, VULKAN_HEADERS) - @$(call patchin, VULKAN_LOADER) - @$(call touch) - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -54,31 +32,18 @@ VULKAN_LOADER_CONF_TOOL := cmake VULKAN_LOADER_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ -DBUILD_TESTS=OFF \ -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_WAYLAND) \ -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ - -DENABLE_WERROR=ON \ + -DENABLE_WERROR=OFF \ -DFALLBACK_CONFIG_DIRS=/etc/xdg \ -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \ -DSYSCONFDIR= \ - -DUSE_CCACHE=OFF \ - -DUSE_GAS=OFF \ - -DVulkanHeaders_INCLUDE_DIR=$(VULKAN_HEADERS_DIR)/include \ - -DVulkanRegistry_DIR=$(VULKAN_HEADERS_DIR)/registry - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/vulkan-loader.install: - @$(call targetinfo) - @$(call world/install, VULKAN_LOADER) - @cp -rp $(VULKAN_HEADERS_DIR)/include $(VULKAN_LOADER_PKGDIR)/usr - @cp -rp $(VULKAN_HEADERS_DIR)/registry $(VULKAN_LOADER_PKGDIR)/usr/share/vulkan - @$(call touch) + -DUSE_GAS=OFF # ---------------------------------------------------------------------------- # Target-Install -- 2.30.2
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- rules/vulkan-tools.make | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make index a7ed9b947177..f3114654fca7 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.231.1 -VULKAN_TOOLS_MD5 := 927ccb38f18bc0af35742e81ba68b9d3 +VULKAN_TOOLS_VERSION := 1.3.236.0 +VULKAN_TOOLS_MD5 := 36dacbbee6aa4eb14ec0e4c398074044 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,9 +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 \ - -DINSTALL_ICD=OFF \ - -DUSE_CCACHE=OFF \ - -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan + -DINSTALL_ICD=OFF ifdef PTXCONF_VULKAN_TOOLS_CUBE VULKAN_TOOLS_CONF_OPT += \ -- 2.30.2
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- rules/vulkan-validationlayers.in | 2 +- rules/vulkan-validationlayers.make | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rules/vulkan-validationlayers.in b/rules/vulkan-validationlayers.in index 9e85100ccd32..910de22c5a99 100644 --- a/rules/vulkan-validationlayers.in +++ b/rules/vulkan-validationlayers.in @@ -5,7 +5,7 @@ config VULKAN_VALIDATIONLAYERS prompt "vulkan-validationlayers" select HOST_CMAKE select HOST_GLSLANG - select VULKAN_LOADER + select VULKAN_HEADERS select GLSLANG if BUILDTIME select SPIRV_HEADERS if BUILDTIME select SPIRV_TOOLS if BUILDTIME diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make index 08648e01007f..7e7b97bca1eb 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.3.231.1 -VULKAN_VALIDATIONLAYERS_MD5 := cd1c2e8df889c392a0e41cec12b8eb00 +VULKAN_VALIDATIONLAYERS_VERSION := 1.3.236.0 +VULKAN_VALIDATIONLAYERS_MD5 := a95eab3163458901535b49681abf710f 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) @@ -39,14 +39,10 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT := \ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \ -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ - -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=$(SYSROOT)/usr \ -DUSE_ROBIN_HOOD_HASHING=OFF \ - -DVVL_CPP_STANDARD=14 \ - -DVVL_ENABLE_ASAN=OFF \ - -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan + -DVVL_CPP_STANDARD=20 \ + -DVVL_ENABLE_ASAN=OFF # ---------------------------------------------------------------------------- # Target-Install -- 2.30.2
Thanks, applied as 9b14b9299be4035c25d831a6a45940011e3948ee.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:00:56 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/glslang.make b/rules/glslang.make
> index 7af639b9db41..e132f6806ec6 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> #
> # Paths and names
> #
> -GLSLANG_VERSION := 1.3.231.1
> -GLSLANG_MD5 := b6308880c655a50d50e0dd0e049ba5d5
> +GLSLANG_VERSION := 1.3.236.0
> +GLSLANG_MD5 := 624390dc06d35f359ed14288bb8ccbe1
> GLSLANG := glslang-$(GLSLANG_VERSION)
> GLSLANG_SUFFIX := tar.gz
> GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
Thanks, applied as 1aadaf158d14600e14fdc2f6e23cc92dfc7deed1.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:00:57 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-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 daacb30375f6..c81708b0e5d8 100644
> --- a/rules/host-shaderc.make
> +++ b/rules/host-shaderc.make
> @@ -77,7 +77,6 @@ HOST_SHADERC_CONF_OPT := \
> -DCMAKE_INSTALL_LIBDIR=/usr/lib \
> -DSHADERC_SKIP_INSTALL=OFF \
> -DSHADERC_SKIP_TESTS=ON \
> - -DSKIP_GLSLANG_INSTALL=OFF \
> -DSKIP_SPIRV_TOOLS_INSTALL=OFF \
> -DSPIRV_ALLOW_TIMERS=ON \
> -DSPIRV_BUILD_COMPRESSION=OFF \
> diff --git a/rules/shaderc.make b/rules/shaderc.make
> index c924ebc256fe..2b9b021da7cc 100644
> --- a/rules/shaderc.make
> +++ b/rules/shaderc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
> #
> # Paths and names
> #
> -SHADERC_VERSION := v2022.3
> -SHADERC_MD5 := 5cb762af57637caf997d5f46baa4e8a4
> +SHADERC_VERSION := v2022.4
> +SHADERC_MD5 := 7a3039ee4e489775957aa3015859f902
> SHADERC := shaderc-$(SHADERC_VERSION)
> SHADERC_SUFFIX := tar.gz
> SHADERC_URL := \
> @@ -92,10 +92,8 @@ SHADERC_CONF_OPT := \
> -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 \
> - -DSKIP_GLSLANG_INSTALL=OFF \
> -DSKIP_SPIRV_TOOLS_INSTALL=OFF \
> -DSPIRV_ALLOW_TIMERS=ON \
> -DSPIRV_BUILD_COMPRESSION=OFF \
Thanks, applied as 868ebfa46ef2d19f6958434709285bf5cc5368d1.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:00:58 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-3-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 ddf8b26049ea..54e02957263e 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.231.1
> -SPIRV_HEADERS_MD5 := 2eac8853ab6ad09a31c6464ca3051407
> +SPIRV_HEADERS_VERSION := 1.3.236.0
> +SPIRV_HEADERS_MD5 := da1982a5df290f7a76ff786af4587ffc
> 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)
> @@ -30,8 +30,6 @@ SPIRV_HEADERS_LICENSE_FILES := file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae
>
> SPIRV_HEADERS_CONF_TOOL := cmake
> SPIRV_HEADERS_CONF_OPT := \
> - $(CROSS_CMAKE_USR) \
> - -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> - -DSPIRV_HEADERS_SKIP_INSTALL=OFF
> + $(CROSS_CMAKE_USR)
>
> # vim: syntax=make
Thanks, applied as 6a862f3454eb948d7cfc6c935e142986eaf8ccbe.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:01:00 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-4-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 6a9b3cb12fa4..b6e8549b5b90 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.231.1
> -SPIRV_TOOLS_MD5 := 400b8ea1c96b1662cbe5668d81548a52
> +SPIRV_TOOLS_VERSION := 1.3.236.0
> +SPIRV_TOOLS_MD5 := 10172b6f37dda90946cbe0a9ba884c13
> 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)
> @@ -64,7 +64,6 @@ SPIRV_TOOLS_CONF_OPT := \
> -DSPIRV_COLOR_TERMINAL=ON \
> -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> -DSPIRV_HEADERS_SKIP_INSTALL=ON \
> - -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
> -DSPIRV_LOG_DEBUG=OFF \
> -DSPIRV_SKIP_EXECUTABLES=ON \
> -DSPIRV_SKIP_TESTS=ON \
Thanks, applied as 862eaf11e56fe95e2087660ee9663ece11efe124.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:01:01 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Split vulkan-headers out of vulkan-loader,
> it has proper CMake support now.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-5-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/vulkan-headers.in b/rules/vulkan-headers.in
> new file mode 100644
> index 000000000000..06329f8fd0dd
> --- /dev/null
> +++ b/rules/vulkan-headers.in
> @@ -0,0 +1,8 @@
> +## SECTION=multimedia_libs
> +
> +menuconfig VULKAN_HEADERS
> + tristate
> + prompt "vulkan-headers"
> + select HOST_CMAKE
> + help
> + Vulkan Headers
> diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make
> new file mode 100644
> index 000000000000..da62d80f6b6e
> --- /dev/null
> +++ b/rules/vulkan-headers.make
> @@ -0,0 +1,39 @@
> +# -*-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_VULKAN_HEADERS) += vulkan-headers
> +
> +#
> +# Paths and names
> +#
> +
> +VULKAN_HEADERS_VERSION := 1.3.236.0
> +VULKAN_HEADERS_MD5 := 9fba7f1ef2c43b6ce3c9660a618e788c
> +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_FILES := \
> + file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +VULKAN_HEADERS_CONF_TOOL := cmake
> +VULKAN_HEADERS_CONF_OPT := \
> + $(CROSS_CMAKE_USR) \
> + -DVULKAN_HEADERS_INSTALL=ON
> +
> +# vim: syntax=make
Thanks, applied as 8362750287403c3bb1c31602931792edcb2256f4.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:01:02 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Split out vulkan-headers, which has proper CMake support now.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-6-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/vulkan-loader.in b/rules/vulkan-loader.in
> index 646045f5f1d7..c3ad8f5a468a 100644
> --- a/rules/vulkan-loader.in
> +++ b/rules/vulkan-loader.in
> @@ -5,6 +5,7 @@ menuconfig VULKAN_LOADER
> prompt "vulkan-loader "
> select HOST_CMAKE
> select HOST_QEMU
> + select VULKAN_HEADERS
> select LIBXCB if VULKAN_LOADER_XCB
> select WAYLAND if VULKAN_LOADER_WAYLAND
> help
> diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
> index 9d537da6b7b9..74346807f079 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.231.1
> -VULKAN_LOADER_MD5 := 1b7da12f3339204c48eafef259aad635
> +VULKAN_LOADER_VERSION := 1.3.236.0
> +VULKAN_LOADER_MD5 := ed9d0fd06898e508adb4e2bdff2c88a5
> 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,28 +24,6 @@ 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.3.231.1
> -VULKAN_HEADERS_MD5 := 2b622628ff998288b3dd6778f63c9e2b
> -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_SOURCE) := VULKAN_HEADERS
> -VULKAN_HEADERS_DIR := $(VULKAN_LOADER_DIR)/vulkan-headers
> -
> -VULKAN_LOADER_SOURCES := $(VULKAN_LOADER_SOURCE) $(VULKAN_HEADERS_SOURCE)
> -
> -# ----------------------------------------------------------------------------
> -# Extract
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/vulkan-loader.extract:
> - @$(call targetinfo)
> - @$(call clean, $(VULKAN_LOADER_DIR))
> - @$(call extract, VULKAN_LOADER)
> - @$(call extract, VULKAN_HEADERS)
> - @$(call patchin, VULKAN_LOADER)
> - @$(call touch)
> -
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
> @@ -54,31 +32,18 @@ VULKAN_LOADER_CONF_TOOL := cmake
> VULKAN_LOADER_CONF_OPT := \
> $(CROSS_CMAKE_USR) \
> -DCMAKE_BUILD_TYPE=Release \
> + -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \
> -DBUILD_TESTS=OFF \
> -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
> -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \
> -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_WAYLAND) \
> -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \
> -DBUILD_WSI_XLIB_SUPPORT=OFF \
> - -DENABLE_WERROR=ON \
> + -DENABLE_WERROR=OFF \
> -DFALLBACK_CONFIG_DIRS=/etc/xdg \
> -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \
> -DSYSCONFDIR= \
> - -DUSE_CCACHE=OFF \
> - -DUSE_GAS=OFF \
> - -DVulkanHeaders_INCLUDE_DIR=$(VULKAN_HEADERS_DIR)/include \
> - -DVulkanRegistry_DIR=$(VULKAN_HEADERS_DIR)/registry
> -
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/vulkan-loader.install:
> - @$(call targetinfo)
> - @$(call world/install, VULKAN_LOADER)
> - @cp -rp $(VULKAN_HEADERS_DIR)/include $(VULKAN_LOADER_PKGDIR)/usr
> - @cp -rp $(VULKAN_HEADERS_DIR)/registry $(VULKAN_LOADER_PKGDIR)/usr/share/vulkan
> - @$(call touch)
> + -DUSE_GAS=OFF
>
> # ----------------------------------------------------------------------------
> # Target-Install
Thanks, applied as 8e822a2f208c02698860340c3dfc36348af69998.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:01:03 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-7-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 a7ed9b947177..f3114654fca7 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.231.1
> -VULKAN_TOOLS_MD5 := 927ccb38f18bc0af35742e81ba68b9d3
> +VULKAN_TOOLS_VERSION := 1.3.236.0
> +VULKAN_TOOLS_MD5 := 36dacbbee6aa4eb14ec0e4c398074044
> 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,9 +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 \
> - -DINSTALL_ICD=OFF \
> - -DUSE_CCACHE=OFF \
> - -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan
> + -DINSTALL_ICD=OFF
>
> ifdef PTXCONF_VULKAN_TOOLS_CUBE
> VULKAN_TOOLS_CONF_OPT += \
Thanks, applied as baf4a445ef66fefeacc6b25397a4e36a4499fa47.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:01:04 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221219115232.2949240-8-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 9e85100ccd32..910de22c5a99 100644
> --- a/rules/vulkan-validationlayers.in
> +++ b/rules/vulkan-validationlayers.in
> @@ -5,7 +5,7 @@ config VULKAN_VALIDATIONLAYERS
> prompt "vulkan-validationlayers"
> select HOST_CMAKE
> select HOST_GLSLANG
> - select VULKAN_LOADER
> + select VULKAN_HEADERS
> select GLSLANG if BUILDTIME
> select SPIRV_HEADERS if BUILDTIME
> select SPIRV_TOOLS if BUILDTIME
> diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
> index 08648e01007f..7e7b97bca1eb 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.3.231.1
> -VULKAN_VALIDATIONLAYERS_MD5 := cd1c2e8df889c392a0e41cec12b8eb00
> +VULKAN_VALIDATIONLAYERS_VERSION := 1.3.236.0
> +VULKAN_VALIDATIONLAYERS_MD5 := a95eab3163458901535b49681abf710f
> 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)
> @@ -39,14 +39,10 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT := \
> -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \
> -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \
> -DBUILD_WSI_XLIB_SUPPORT=OFF \
> - -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=$(SYSROOT)/usr \
> -DUSE_ROBIN_HOOD_HASHING=OFF \
> - -DVVL_CPP_STANDARD=14 \
> - -DVVL_ENABLE_ASAN=OFF \
> - -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan
> + -DVVL_CPP_STANDARD=20 \
> + -DVVL_ENABLE_ASAN=OFF
>
> # ----------------------------------------------------------------------------
> # Target-Install