From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 6/6] shaderc: version bump 2020.3 -> 2020.4
Date: Thu, 7 Jan 2021 12:14:04 +0100 [thread overview]
Message-ID: <20210107111404.357-6-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20210107111404.357-1-p.zabel@pengutronix.de>
spvc was removed upstream.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/host-shaderc.make | 3 ---
rules/shaderc.in | 16 ----------------
rules/shaderc.make | 15 ++-------------
3 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
index 0ee834d1bab3..50b6a6503634 100644
--- a/rules/host-shaderc.make
+++ b/rules/host-shaderc.make
@@ -55,11 +55,8 @@ HOST_SHADERC_CONF_OPT := \
$(HOST_CMAKE_OPT) \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DSHADERC_ENABLE_SPVC=OFF \
-DSHADERC_SKIP_INSTALL=OFF \
-DSHADERC_SKIP_TESTS=ON \
- -DSHADERC_SPVC_ENABLE_DIRECT_LOGGING=OFF \
- -DSHADERC_SPVC_DISABLE_CONTEXT_LOGGING=OFF \
-DSHADERC_ENABLE_WERROR_COMPILE=ON
# vim: syntax=make
diff --git a/rules/shaderc.in b/rules/shaderc.in
index ccb3bc538032..bd6c65c09678 100644
--- a/rules/shaderc.in
+++ b/rules/shaderc.in
@@ -16,26 +16,10 @@ config SHADERC_GLSLC
help
Install glslc tool.
-config SHADERC_SPVC
- bool
- # requires SPIRV-Cross
- depends on BROKEN
- prompt "install spvc"
- help
- Install spvc tool.
-
config SHADERC_LIBSHADERC
bool
prompt "install libshaderc"
help
Install libshaderc shared library.
-config SHADERC_LIBSHADERC_SPVC
- bool
- # requires SPIRV-Cross
- depends on BROKEN
- prompt "install libshaderc_spvc"
- help
- Install libshaderc_spvc shared library.
-
endif
diff --git a/rules/shaderc.make b/rules/shaderc.make
index 3328574570de..902a60a2a71d 100644
--- a/rules/shaderc.make
+++ b/rules/shaderc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
#
# Paths and names
#
-SHADERC_VERSION := v2020.3
-SHADERC_MD5 := 7415b7c5376dd36c610b9cc53c7dbe1b
+SHADERC_VERSION := v2020.4
+SHADERC_MD5 := 5c587cb6bd3b7e8745ca2e0dd46bb284
SHADERC := shaderc-$(SHADERC_VERSION)
SHADERC_SUFFIX := tar.gz
SHADERC_URL := \
@@ -73,15 +73,10 @@ SHADERC_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DSHADERC_ENABLE_SPVC=$(call ptx/onoff, PTXCONF_SHADERC_SPVC) \
-DSHADERC_SKIP_INSTALL=OFF \
-DSHADERC_SKIP_TESTS=ON \
- -DSHADERC_SPVC_ENABLE_DIRECT_LOGGING=OFF \
- -DSHADERC_SPVC_DISABLE_CONTEXT_LOGGING=OFF \
-DSHADERC_ENABLE_WERROR_COMPILE=ON
-# -DSHADERC_ENABLE_SHARED_CRT=OFF
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -98,16 +93,10 @@ $(STATEDIR)/shaderc.targetinstall:
ifdef PTXCONF_SHADERC_GLSLC
@$(call install_copy, shaderc, 0, 0, 0755, -, /usr/bin/glslc)
endif
-ifdef PTXCONF_SHADERC_SPVC
- @$(call install_copy, shaderc, 0, 0, 0755, -, /usr/bin/spvc)
-endif
ifdef PTXCONF_SHADERC_LIBSHADERC
@$(call install_lib, shaderc, 0, 0, 0644, libshaderc_shared)
endif
-ifdef PTXCONF_SHADERC_LIBSHADERC_SPVC
- @$(call install_lib, shaderc, 0, 0, 0644, libshaderc_spvc)
-endif
@$(call install_finish, shaderc)
--
2.20.1
_______________________________________________
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-01-07 11:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 11:13 [ptxdist] [PATCH 1/6] glslang: version bump 2020-09-24-gbacaef3237c5 -> 2020-12-03-gdd69df7f3dac Philipp Zabel
2021-01-07 11:14 ` [ptxdist] [PATCH 2/6] spirv-tools: version bump 2020.5 -> 2020.6 Philipp Zabel
2021-01-15 7:22 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-01-07 11:14 ` [ptxdist] [PATCH 3/6] vulkan-loader: version bump 1.2.154.0 -> 1.2.162.0 Philipp Zabel
2021-01-15 7:22 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-01-07 11:14 ` [ptxdist] [PATCH 4/6] vulkan-tools: " Philipp Zabel
2021-01-15 7:22 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-01-07 11:14 ` [ptxdist] [PATCH 5/6] vulkan-validationlayers: version bump 1.2.154.0 -> 12.2.162.0 Philipp Zabel
2021-01-15 7:22 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-01-07 11:14 ` Philipp Zabel [this message]
2021-01-15 7:22 ` [ptxdist] [APPLIED] shaderc: version bump 2020.3 -> 2020.4 Michael Olbrich
2021-01-15 7:22 ` [ptxdist] [APPLIED] glslang: version bump 2020-09-24-gbacaef3237c5 -> 2020-12-03-gdd69df7f3dac 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=20210107111404.357-6-p.zabel@pengutronix.de \
--to=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