mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] shaderc: version bump v2023.6 -> v2023.7
@ 2023-11-01 11:51 Philipp Zabel
  2023-11-10  7:25 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2023-11-01 11:51 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/host-shaderc.make | 5 +++--
 rules/shaderc.make      | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
index 0a30f7c22a07..c7a57c07f49d 100644
--- a/rules/host-shaderc.make
+++ b/rules/host-shaderc.make
@@ -54,6 +54,7 @@ HOST_SHADERC_CONF_TOOL	:= cmake
 HOST_SHADERC_CONF_OPT	:= \
 	$(HOST_CMAKE_OPT) \
 	-DCMAKE_BUILD_TYPE=Release \
+	-DALLOW_EXTERNAL_SPIRV_TOOLS=OFF \
 	-DBUILD_EXTERNAL=ON \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DBUILD_TESTING=ON \
@@ -72,6 +73,8 @@ HOST_SHADERC_CONF_OPT	:= \
 	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
 	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
 	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
+	-DSHADERC_SKIP_EXAMPLES=ON \
+	-DSHADERC_SKIP_INSTALL=OFF \
 	-DSHADERC_SKIP_TESTS=ON \
 	-DSPIRV_ALLOW_TIMERS=ON \
 	-DSPIRV_BUILD_COMPRESSION=OFF \
@@ -80,8 +83,6 @@ HOST_SHADERC_CONF_OPT	:= \
 	-DSPIRV_CHECK_CONTEXT=ON \
 	-DSPIRV_COLOR_TERMINAL=ON \
 	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
-	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
-	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
 	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
 	-DSPIRV_LOG_DEBUG=OFF \
 	-DSPIRV_SKIP_EXECUTABLES=OFF \
diff --git a/rules/shaderc.make b/rules/shaderc.make
index 5369696dd2bb..1e52d4182dcd 100644
--- a/rules/shaderc.make
+++ b/rules/shaderc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
 #
 # Paths and names
 #
-SHADERC_VERSION			:= v2023.6
-SHADERC_MD5			:= fd7536f8ad546a0b4d846e9d45de0715
+SHADERC_VERSION			:= v2023.7
+SHADERC_MD5			:= c48f99976a603d3c968cd6811f67a24f
 SHADERC				:= shaderc-$(SHADERC_VERSION)
 SHADERC_SUFFIX			:= tar.gz
 SHADERC_URL			:= \
@@ -72,6 +72,7 @@ SHADERC_CONF_TOOL	:= cmake
 SHADERC_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
 	-DCMAKE_BUILD_TYPE=Release \
+	-DALLOW_EXTERNAL_SPIRV_TOOLS=OFF \
 	-DBUILD_EXTERNAL=ON \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DBUILD_TESTING=ON \
@@ -90,6 +91,8 @@ SHADERC_CONF_OPT	:= \
 	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
 	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
 	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
+	-DSHADERC_SKIP_EXAMPLES=ON \
+	-DSHADERC_SKIP_INSTALL=OFF \
 	-DSHADERC_SKIP_TESTS=ON \
 	-DSPIRV_ALLOW_TIMERS=ON \
 	-DSPIRV_BUILD_COMPRESSION=OFF \
@@ -98,8 +101,6 @@ SHADERC_CONF_OPT	:= \
 	-DSPIRV_CHECK_CONTEXT=ON \
 	-DSPIRV_COLOR_TERMINAL=ON \
 	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
-	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
-	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
 	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
 	-DSPIRV_LOG_DEBUG=OFF \
 	-DSPIRV_SKIP_EXECUTABLES=OFF \
-- 
2.39.2




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] shaderc: version bump v2023.6 -> v2023.7
  2023-11-01 11:51 [ptxdist] [PATCH] shaderc: version bump v2023.6 -> v2023.7 Philipp Zabel
@ 2023-11-10  7:25 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-11-10  7:25 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as 599269ff83f77560eb7a7cc5e556a0004caaa883.

Michael

[sent from post-receive hook]

On Fri, 10 Nov 2023 08:25:18 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20231101115110.2870626-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
> index 0a30f7c22a07..c7a57c07f49d 100644
> --- a/rules/host-shaderc.make
> +++ b/rules/host-shaderc.make
> @@ -54,6 +54,7 @@ HOST_SHADERC_CONF_TOOL	:= cmake
>  HOST_SHADERC_CONF_OPT	:= \
>  	$(HOST_CMAKE_OPT) \
>  	-DCMAKE_BUILD_TYPE=Release \
> +	-DALLOW_EXTERNAL_SPIRV_TOOLS=OFF \
>  	-DBUILD_EXTERNAL=ON \
>  	-DBUILD_SHARED_LIBS=OFF \
>  	-DBUILD_TESTING=ON \
> @@ -72,6 +73,8 @@ HOST_SHADERC_CONF_OPT	:= \
>  	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
>  	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
>  	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
> +	-DSHADERC_SKIP_EXAMPLES=ON \
> +	-DSHADERC_SKIP_INSTALL=OFF \
>  	-DSHADERC_SKIP_TESTS=ON \
>  	-DSPIRV_ALLOW_TIMERS=ON \
>  	-DSPIRV_BUILD_COMPRESSION=OFF \
> @@ -80,8 +83,6 @@ HOST_SHADERC_CONF_OPT	:= \
>  	-DSPIRV_CHECK_CONTEXT=ON \
>  	-DSPIRV_COLOR_TERMINAL=ON \
>  	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
> -	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> -	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
>  	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
>  	-DSPIRV_LOG_DEBUG=OFF \
>  	-DSPIRV_SKIP_EXECUTABLES=OFF \
> diff --git a/rules/shaderc.make b/rules/shaderc.make
> index 5369696dd2bb..1e52d4182dcd 100644
> --- a/rules/shaderc.make
> +++ b/rules/shaderc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
>  #
>  # Paths and names
>  #
> -SHADERC_VERSION			:= v2023.6
> -SHADERC_MD5			:= fd7536f8ad546a0b4d846e9d45de0715
> +SHADERC_VERSION			:= v2023.7
> +SHADERC_MD5			:= c48f99976a603d3c968cd6811f67a24f
>  SHADERC				:= shaderc-$(SHADERC_VERSION)
>  SHADERC_SUFFIX			:= tar.gz
>  SHADERC_URL			:= \
> @@ -72,6 +72,7 @@ SHADERC_CONF_TOOL	:= cmake
>  SHADERC_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
>  	-DCMAKE_BUILD_TYPE=Release \
> +	-DALLOW_EXTERNAL_SPIRV_TOOLS=OFF \
>  	-DBUILD_EXTERNAL=ON \
>  	-DBUILD_SHARED_LIBS=OFF \
>  	-DBUILD_TESTING=ON \
> @@ -90,6 +91,8 @@ SHADERC_CONF_OPT	:= \
>  	-DSHADERC_ENABLE_WERROR_COMPILE=ON \
>  	-DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
>  	-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
> +	-DSHADERC_SKIP_EXAMPLES=ON \
> +	-DSHADERC_SKIP_INSTALL=OFF \
>  	-DSHADERC_SKIP_TESTS=ON \
>  	-DSPIRV_ALLOW_TIMERS=ON \
>  	-DSPIRV_BUILD_COMPRESSION=OFF \
> @@ -98,8 +101,6 @@ SHADERC_CONF_OPT	:= \
>  	-DSPIRV_CHECK_CONTEXT=ON \
>  	-DSPIRV_COLOR_TERMINAL=ON \
>  	-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
> -	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> -	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
>  	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
>  	-DSPIRV_LOG_DEBUG=OFF \
>  	-DSPIRV_SKIP_EXECUTABLES=OFF \



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-11-10  7:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-01 11:51 [ptxdist] [PATCH] shaderc: version bump v2023.6 -> v2023.7 Philipp Zabel
2023-11-10  7:25 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox