From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] glslang: version bump 11.7.1 -> 1.3.204.0
Date: Mon, 28 Feb 2022 13:09:40 +0100 [thread overview]
Message-ID: <20220228120940.2682480-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220225094139.2602362-1-p.zabel@pengutronix.de>
Thanks, applied as 76392b1b83051b6f8716f7650b9db08c3e792b68.
Michael
[sent from post-receive hook]
On Mon, 28 Feb 2022 13:09:39 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Instead of bumping to 11.8.0 and applying the bugfix patches locally,
> switch to the Vulkan SDK release version.
>
> The Khronos (modified MIT) license for some headers was added to
> LICENSE.txt [1], as well as the GPL-3.0 license text [2].
>
> [1] https://github.com/KhronosGroup/glslang/commit/5944f672a83cb81d4307ba41316c14a35c81c1b1
> [2] https://github.com/KhronosGroup/glslang/commit/d465ac12ddb207fbc805b0f9952297afbb69f8e4
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220225094139.2602362-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 e031d6f89a15..5a65ef5ae093 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 := 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 custom
> +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3
>
> # ----------------------------------------------------------------------------
> # Prepare
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2022-02-28 12:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 9:41 [ptxdist] [PATCH v2] " Philipp Zabel
2022-02-28 12:09 ` Michael Olbrich [this message]
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=20220228120940.2682480-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=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