From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 25 Feb 2022 10:41:45 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nNX6f-009lup-Pq for lore@lore.pengutronix.de; Fri, 25 Feb 2022 10:41:45 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nNX6e-0000Vc-Ts; Fri, 25 Feb 2022 10:41:44 +0100 Received: from dude03.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::39]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nNX6b-0000VU-4Q for ptxdist@pengutronix.de; Fri, 25 Feb 2022 10:41:41 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Fri, 25 Feb 2022 10:41:39 +0100 Message-Id: <20220225094139.2602362-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2] glslang: version bump 11.7.1 -> 1.3.204.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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