From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] shaderc: bump for new glslang
Date: Mon, 11 Nov 2019 16:19:43 +0100 [thread overview]
Message-ID: <20191111151943.5f9PekkgBixyP60FZrQQXDbYMJcbj9ImZT5iG2X-DhU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16380@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
There is an updated pull request by pbui against master on the void-packages repository
https://github.com/pbui/void-packages shaderc
https://github.com/void-linux/void-packages/pull/16380
shaderc: bump for new glslang
Fixes #16379 caused by #16341.
A patch file from https://github.com/void-linux/void-packages/pull/16380.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-shaderc-16380.patch --]
[-- Type: text/x-diff, Size: 3873 bytes --]
From 209b768928fce194998ca2bc89ce9b4919c67e47 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 11 Nov 2019 10:07:07 -0500
Subject: [PATCH] shaderc: bump for new glslang
Fixes #16379.
---
.../fix-build-against-new-glslang.patch | 54 +++++++++++++++++++
srcpkgs/shaderc/template | 6 ++-
2 files changed, 58 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/shaderc/patches/fix-build-against-new-glslang.patch
diff --git a/srcpkgs/shaderc/patches/fix-build-against-new-glslang.patch b/srcpkgs/shaderc/patches/fix-build-against-new-glslang.patch
new file mode 100644
index 00000000000..3e99a39ce49
--- /dev/null
+++ b/srcpkgs/shaderc/patches/fix-build-against-new-glslang.patch
@@ -0,0 +1,54 @@
+diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
+index 3c3c3de..b5fc6cb 100644
+--- libshaderc/src/shaderc.cc
++++ libshaderc/src/shaderc.cc
+@@ -20,7 +20,7 @@
+ #include <sstream>
+ #include <vector>
+
+-#include "SPIRV/spirv.hpp"
++#include "glslang/SPIRV/spirv.hpp"
+
+ #include "libshaderc_util/compiler.h"
+ #include "libshaderc_util/counting_includer.h"
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index ef7867f..acc172b 100644
+--- libshaderc_util/src/compiler.cc
++++ libshaderc_util/src/compiler.cc
+@@ -26,7 +26,7 @@
+ #include "libshaderc_util/string_piece.h"
+ #include "libshaderc_util/version_profile.h"
+
+-#include "SPIRV/GlslangToSpv.h"
++#include "glslang/SPIRV/GlslangToSpv.h"
+
+ namespace {
+ using shaderc_util::string_piece;
+@@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
+ bases[static_cast<int>(UniformKind::StorageBuffer)]);
+ shader.setShiftUavBinding(
+ bases[static_cast<int>(UniformKind::UnorderedAccessView)]);
+- shader.setHlslIoMapping(hlsl_iomap_);
+ shader.setResourceSetBinding(
+ hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]);
+ shader.setEnvClient(target_client_info.client,
+ target_client_info.client_version);
+ shader.setEnvTarget(target_client_info.target_language,
+ target_client_info.target_language_version);
+- if (hlsl_functionality1_enabled_) {
+- shader.setEnvTargetHlslFunctionality1();
+- }
+-
+ const EShMessages rules = GetMessageRules(target_env_, source_language_,
+ hlsl_offsets_,
+ generate_debug_info_);
+@@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader(
+ }
+ shader.setEnvClient(target_client_info.client,
+ target_client_info.client_version);
+- if (hlsl_functionality1_enabled_) {
+- shader.setEnvTargetHlslFunctionality1();
+- }
+
+ // The preprocessor might be sensitive to the target environment.
+ // So combine the existing rules with the just-give-me-preprocessor-output
diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template
index 06768ed8a2b..fc8f7cf20dd 100644
--- a/srcpkgs/shaderc/template
+++ b/srcpkgs/shaderc/template
@@ -1,7 +1,7 @@
# Template file for 'shaderc'
pkgname=shaderc
version=2019.0
-revision=1
+revision=2
wrksrc="shaderc-${version}"
build_style=cmake
configure_args="-DSHADERC_SKIP_TESTS=ON"
@@ -14,6 +14,8 @@ homepage="https://github.com/google/shaderc"
distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz"
checksum=1018cd02be52295272fdbffa056ee24b881be277c83d039ad554d91230f4e11b
+CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang"
+
pre_configure() {
# Unbundle glslang, SPIRV-Headers, SPIRV-Tools
# also remove examples
@@ -29,6 +31,6 @@ pre_configure() {
cat <<- EOF > glslc/src/build-version.inc
"shaderc 2019.0\n"
"SPIRV-Tools-2019.2\n"
- "glslang-7.11.3214\n"
+ "glslang-7.13.3496\n"
EOF
}
next prev parent reply other threads:[~2019-11-11 15:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 15:08 [PR PATCH] " voidlinux-github
2019-11-11 15:19 ` voidlinux-github [this message]
2019-11-11 15:23 ` [PR PATCH] [Merged]: " voidlinux-github
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=20191111151943.5f9PekkgBixyP60FZrQQXDbYMJcbj9ImZT5iG2X-DhU@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/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;
as well as URLs for NNTP newsgroup(s).