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.5.0 -> 11.6.0
Date: Thu, 7 Oct 2021 12:18:48 +0200 [thread overview]
Message-ID: <20211007101848.3926423-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210908113236.15651-5-p.zabel@pengutronix.de>
Thanks, applied as 0af33a4d2ec7467d12fc2355549d0b79d95263c8.
Michael
[sent from post-receive hook]
On Thu, 07 Oct 2021 12:18:48 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210908113236.15651-5-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/glslang.make b/rules/glslang.make
> index 76ee41ba4357..3c1908bff8c3 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
> #
> # Paths and names
> #
> -GLSLANG_VERSION := 11.5.0
> -GLSLANG_MD5 := 6c86e1a5d65815a707af3bead744804c
> +GLSLANG_VERSION := 11.6.0
> +GLSLANG_MD5 := 37918eefd58acd7309faf96fb83ab4ce
> GLSLANG := glslang-$(GLSLANG_VERSION)
> GLSLANG_SUFFIX := tar.gz
> GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> @@ -32,18 +32,19 @@ GLSLANG_CONF_TOOL := cmake
> GLSLANG_CONF_OPT := \
> $(CROSS_CMAKE_USR) \
> -DCMAKE_BUILD_TYPE=Release \
> - -DCMAKE_INSTALL_LIBDIR=/usr/lib \
> - -DBUILD_SHARED_LIBS=ON \
> -DBUILD_EXTERNAL=OFF \
> - -DSKIP_GLSLANG_INSTALL=OFF \
> - -DENABLE_SPVREMAPPER=ON \
> + -DBUILD_SHARED_LIBS=ON \
> + -DENABLE_CTEST=OFF \
> + -DENABLE_EXCEPTIONS=OFF \
> -DENABLE_GLSLANG_BINARIES=ON \
> -DENABLE_GLSLANG_JS=OFF \
> -DENABLE_HLSL=OFF \
> - -DENABLE_RTTI=OFF \
> -DENABLE_OPT=ON \
> -DENABLE_PCH=ON \
> - -DENABLE_CTEST=OFF
> + -DENABLE_RTTI=OFF \
> + -DENABLE_SPVREMAPPER=ON \
> + -DSKIP_GLSLANG_INSTALL=OFF \
> + -DUSE_CCACHE=OFF
>
> # ----------------------------------------------------------------------------
> # Target-Install
> diff --git a/rules/host-glslang.make b/rules/host-glslang.make
> index 2aaf3909a4e8..1718562d110b 100644
> --- a/rules/host-glslang.make
> +++ b/rules/host-glslang.make
> @@ -19,17 +19,19 @@ HOST_GLSLANG_CONF_TOOL := cmake
> HOST_GLSLANG_CONF_OPT := \
> $(HOST_CMAKE_OPT) \
> -DCMAKE_BUILD_TYPE=Release \
> - -DCMAKE_INSTALL_LIBDIR=/usr/lib \
> - -DBUILD_SHARED_LIBS=OFF \
> -DBUILD_EXTERNAL=OFF \
> - -DSKIP_GLSLANG_INSTALL=OFF \
> - -DENABLE_SPVREMAPPER=ON \
> + -DBUILD_SHARED_LIBS=OFF \
> + -DENABLE_CTEST=OFF \
> + -DENABLE_EXCEPTIONS=OFF \
> + -DCMAKE_INSTALL_LIBDIR=/usr/lib \
> -DENABLE_GLSLANG_BINARIES=ON \
> -DENABLE_GLSLANG_JS=OFF \
> -DENABLE_HLSL=OFF \
> - -DENABLE_RTTI=OFF \
> -DENABLE_OPT=ON \
> -DENABLE_PCH=ON \
> - -DENABLE_CTEST=OFF
> + -DENABLE_RTTI=OFF \
> + -DENABLE_SPVREMAPPER=ON \
> + -DSKIP_GLSLANG_INSTALL=OFF \
> + -DUSE_CCACHE=OFF
>
> # vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-10-07 10:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 11:32 [ptxdist] [PATCH 1/6] spirv-tools: version bump 2021.2 -> 2021.3 Philipp Zabel
2021-09-08 11:32 ` [ptxdist] [PATCH 2/6] vulkan-loader: version bump 1.2.182.0 -> 1.2.189.0 Philipp Zabel
2021-10-07 10:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-08 11:32 ` [ptxdist] [PATCH 3/6] vulkan-tools: " Philipp Zabel
2021-10-07 10:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-08 11:32 ` [ptxdist] [PATCH 4/6] vulkan-validationlayers: " Philipp Zabel
2021-10-07 10:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-08 11:32 ` [ptxdist] [PATCH 5/6] glslang: version bump 11.5.0 -> 11.6.0 Philipp Zabel
2021-10-07 10:18 ` Michael Olbrich [this message]
2021-09-08 11:32 ` [ptxdist] [PATCH 6/6] shaderc: version bump 2021.1 -> 2021.2 Philipp Zabel
2021-10-07 10:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-10-07 10:18 ` [ptxdist] [APPLIED] spirv-tools: version bump 2021.2 -> 2021.3 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=20211007101848.3926423-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