Thanks, applied as e405d8d284b2a71addc0bc2311c3fda97a51fa71.
Michael
[sent from post-receive hook]
On Mon, 08 Apr 2024 13:05:25 +0200, Philipp Zabel <p.za...@pengutronix.de>
wrote:
> For license change, see upstream commit 1c9115b562ba ("List all licenses
> in the root LICENSE file. (#410)"). The MIT license was added for
> spir-v.xml and for the embedded jsoncpp.
>
> The custom Khronos license governing most of the files is similar to the
> MIT license, but with an added section about modifications making the
> resulting files no longer reflect Khronos standards.
>
> Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
> Message-Id: <20240326082221.2458163-2-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
>
> diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make
> index 42864622d0b4..aab2edd4029a 100644
> --- a/rules/spirv-headers.make
> +++ b/rules/spirv-headers.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers
> #
> # Paths and names
> #
> -SPIRV_HEADERS_VERSION := 1.3.275.0
> -SPIRV_HEADERS_MD5 := f293886617aa816fdbb2b50d5e909681
> +SPIRV_HEADERS_VERSION := 1.3.280.0
> +SPIRV_HEADERS_MD5 := 438892138fe25c123cdacd05eb4a4b17
> SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION)
> SPIRV_HEADERS_SUFFIX := tar.gz
> SPIRV_HEADERS_URL :=
> https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-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 := custom
> -SPIRV_HEADERS_LICENSE_FILES :=
> file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d
> +SPIRV_HEADERS_LICENSE := custom AND MIT
> +SPIRV_HEADERS_LICENSE_FILES :=
> file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741
>
> #
> ----------------------------------------------------------------------------
> # Prepare
> @@ -31,6 +31,7 @@ SPIRV_HEADERS_LICENSE_FILES :=
> file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae
> SPIRV_HEADERS_CONF_TOOL := cmake
> SPIRV_HEADERS_CONF_OPT := \
> $(CROSS_CMAKE_USR) \
> - -DBUILD_TESTS=OFF
> + -DSPIRV_HEADERS_ENABLE_INSTALL=ON \
> + -DSPIRV_HEADERS_ENABLE_TESTS=OFF
>
> # vim: syntax=make
