[ptxdist] [PATCH v2] glslang: version bump 11.7.1 -> 1.3.204.0

[ptxdist] [PATCH v2] glslang: version bump 11.7.1 -> 1.3.204.0

[Philipp Zabel]

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>
---
Changes since v1:
 - Add "custom" to GLSLANG_LICENSE for Khronos (modified MIT) license
 - Mention LICENSE.txt changes in commit message
---
 rules/glslang.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] glslang: version bump 11.7.1 -> 1.3.204.0

[Michael Olbrich]

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