From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
Date: Tue, 4 Aug 2020 16:56:28 +0200 [thread overview]
Message-ID: <20200804145632.29278-1-p.zabel@pengutronix.de> (raw)
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/glslang.in | 1 +
rules/glslang.make | 8 ++++----
rules/host-glslang.in | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/rules/glslang.in b/rules/glslang.in
index c2a660243d31..fba48e79e857 100644
--- a/rules/glslang.in
+++ b/rules/glslang.in
@@ -4,6 +4,7 @@ menuconfig GLSLANG
tristate
prompt "glslang"
select HOST_CMAKE
+ select HOST_SYSTEM_PYTHON3
help
Khronos-reference SPIR-V generator
diff --git a/rules/glslang.make b/rules/glslang.make
index ada329737ce1..904517d1a8ce 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
#
# Paths and names
#
-GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b
-GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48
+GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331
+GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7
GLSLANG := glslang-$(GLSLANG_VERSION)
GLSLANG_SUFFIX := tar.gz
GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
-GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
-GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
+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
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-glslang.in b/rules/host-glslang.in
index 69f255572c2b..8ef31f52937a 100644
--- a/rules/host-glslang.in
+++ b/rules/host-glslang.in
@@ -4,3 +4,4 @@ config HOST_GLSLANG
tristate
default y if ALLYES
select HOST_CMAKE
+ select HOST_SYSTEM_PYTHON3
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next reply other threads:[~2020-08-04 14:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 14:56 Philipp Zabel [this message]
2020-08-04 14:56 ` [ptxdist] [PATCH 2/5] spirv-tools: version bump 2020.3 -> 2020.4 Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-04 14:56 ` [ptxdist] [PATCH 3/5] vulkan-loader: version bump 1.2.141.0 -> 1.2.148.0 Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-04 14:56 ` [ptxdist] [PATCH 4/5] vulkan-tools: " Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-04 14:56 ` [ptxdist] [PATCH 5/5] vulkan-validationlayers: " Philipp Zabel
2020-08-17 6:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-05 9:45 ` [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331 Roland Hieber
2020-08-07 12:22 ` Michael Olbrich
2020-08-08 14:06 ` Roland Hieber
2020-08-07 17:26 ` Michael Olbrich
2020-08-17 6:18 ` [ptxdist] [APPLIED] " 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=20200804145632.29278-1-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