mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 2/9] spirv-headers: version bump 1.3.275.0 -> 1.3.280.0
Date: Tue, 26 Mar 2024 09:22:14 +0100	[thread overview]
Message-ID: <20240326082221.2458163-2-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20240326082221.2458163-1-p.zabel@pengutronix.de>

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.zabel@pengutronix.de>
---
 rules/spirv-headers.make | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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
-- 
2.39.2




  reply	other threads:[~2024-03-26  8:22 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-26  8:22 [ptxdist] [PATCH 1/9] glslang: " Philipp Zabel
2024-03-26  8:22 ` Philipp Zabel [this message]
2024-04-08 11:05   ` [ptxdist] [APPLIED] spirv-headers: " Michael Olbrich
2024-03-26  8:22 ` [ptxdist] [PATCH 3/9] spirv-tools: " Philipp Zabel
2024-04-08 11:05   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-26  8:22 ` [ptxdist] [PATCH 4/9] volk: " Philipp Zabel
2024-04-08 11:05   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-26  8:22 ` [ptxdist] [PATCH 5/9] vulkan-headers: " Philipp Zabel
2024-04-08 11:05   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-26  8:22 ` [ptxdist] [PATCH 6/9] vulkan-loader: " Philipp Zabel
2024-04-08 11:05   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-26  8:22 ` [ptxdist] [PATCH 7/9] vulkan-tools: " Philipp Zabel
2024-04-08 11:05   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-26  8:22 ` [ptxdist] [PATCH 8/9] vulkan-utility-libraries: " Philipp Zabel
2024-04-08 11:05   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-26  8:22 ` [ptxdist] [PATCH 9/9] vulkan-validationlayers: " Philipp Zabel
2024-04-08 11:05   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-04-08 11:05 ` [ptxdist] [APPLIED] glslang: " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240326082221.2458163-2-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox