From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 Oct 2025 10:20:44 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1v9fhc-008kh6-2P for lore@lore.pengutronix.de; Fri, 17 Oct 2025 10:20:44 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1v9fhb-0004kp-G3; Fri, 17 Oct 2025 10:20:43 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1v9fhC-0003tE-Ew; Fri, 17 Oct 2025 10:20:18 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1v9fhC-0041k1-0u; Fri, 17 Oct 2025 10:20:18 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1v9fhC-0000000D38s-0xry; Fri, 17 Oct 2025 10:20:18 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 17 Oct 2025 10:20:18 +0200 Message-ID: <20251017082018.3110321-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007145323.1798338-1-p.zabel@pengutronix.de> References: <20251007145323.1798338-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] glslang: version bump 1.4.321.0 -> 1.4.328.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 Cc: Philipp Zabel 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as ee7481b12f66d97b01cf976198d3eb6d4de93796. Michael [sent from post-receive hook] On Fri, 17 Oct 2025 10:20:18 +0200, Philipp Zabel wrote: > The SPIR-V remapper and a reference to it in the LICENSE file were > removed in commit e70645c4571f ("Remove rest of spirv-remapper"). > > Signed-off-by: Philipp Zabel > Message-Id: <20251007145323.1798338-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/glslang.in b/rules/glslang.in > index 5280397b8ffb..1bc119e88143 100644 > --- a/rules/glslang.in > +++ b/rules/glslang.in > @@ -16,13 +16,12 @@ config GLSLANG_TOOLS > prompt "install tools" > select GLSLANG_LIBS > help > - Install glslangValidator and spirv-remap tools. > + Install glslangValidator. > > config GLSLANG_LIBS > bool > prompt "install shared libraries" > help > - Install libglslang, libHLSL, libSPIRV, and libSPVRemapper shared > - libraries. > + Install libglslang, libHLSL, and libSPIRV shared libraries. > > endif > diff --git a/rules/glslang.make b/rules/glslang.make > index 5aac2b633f8a..7485dd78cee6 100644 > --- a/rules/glslang.make > +++ b/rules/glslang.make > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > # > # Paths and names > # > -GLSLANG_VERSION := 1.4.321.0 > -GLSLANG_MD5 := b2218150554ad7236f2fbaacccbd1c91 > +GLSLANG_VERSION := 1.4.328.0 > +GLSLANG_MD5 := 844c0aaaacbfae2a5bd3c71f498ed7c2 > GLSLANG := glslang-$(GLSLANG_VERSION) > GLSLANG_SUFFIX := tar.gz > GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/vulkan-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) AND custom > -GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3 > +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=50ff9d0fcde2d5b953ebe431c48e34e3 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -44,7 +44,6 @@ GLSLANG_CONF_OPT := \ > -DENABLE_PCH=ON \ > -DENABLE_RTTI=OFF \ > -DENABLE_SPIRV=ON \ > - -DENABLE_SPVREMAPPER=ON \ > -DGLSLANG_ENABLE_INSTALL=ON \ > -DGLSLANG_TESTS=OFF > > @@ -63,14 +62,12 @@ $(STATEDIR)/glslang.targetinstall: > > ifdef PTXCONF_GLSLANG_TOOLS > @$(call install_copy, glslang, 0, 0, 0755, -, /usr/bin/glslangValidator) > - @$(call install_copy, glslang, 0, 0, 0755, -, /usr/bin/spirv-remap) > endif > > ifdef PTXCONF_GLSLANG_LIBS > @$(call install_lib, glslang, 0, 0, 0644, libglslang-default-resource-limits) > @$(call install_lib, glslang, 0, 0, 0644, libglslang) > @$(call install_lib, glslang, 0, 0, 0644, libSPIRV) > - @$(call install_lib, glslang, 0, 0, 0644, libSPVRemapper) > endif > > @$(call install_finish, glslang) > diff --git a/rules/host-glslang.in b/rules/host-glslang.in > index c40c53537be3..59571f273d80 100644 > --- a/rules/host-glslang.in > +++ b/rules/host-glslang.in > @@ -5,4 +5,4 @@ config HOST_GLSLANG > default y if ALLYES > select HOST_CMAKE > select HOST_SYSTEM_PYTHON3 > - select HOST_SHADERC > + select HOST_SPIRV_TOOLS > diff --git a/rules/host-glslang.make b/rules/host-glslang.make > index e821950b4edc..22de28bc03f1 100644 > --- a/rules/host-glslang.make > +++ b/rules/host-glslang.make > @@ -31,7 +31,6 @@ HOST_GLSLANG_CONF_OPT := \ > -DENABLE_PCH=ON \ > -DENABLE_RTTI=OFF \ > -DENABLE_SPIRV=ON \ > - -DENABLE_SPVREMAPPER=ON \ > -DGLSLANG_ENABLE_INSTALL=ON \ > -DGLSLANG_TESTS=OFF >