diff options
| author |   Nick Sarnie <sarnex@gentoo.org> | 2019-10-28 19:14:17 -0400 |
|---|---|---|
| committer | Nick Sarnie <sarnex@gentoo.org> | 2019-10-28 19:15:47 -0400 |
| commit | 71fd8fefba4a17eccf86e805e00af942171b29b6 (patch) | |
| tree | 7466f3f99fcc78b5aec9c9b82224eec82469142c | |
| parent | dev-java/openjdk-bin: add ~arm tarball for 8.222_p10-r1 (diff) | |
| download | gentoo-71fd8fefba4a17eccf86e805e00af942171b29b6.tar.gz gentoo-71fd8fefba4a17eccf86e805e00af942171b29b6.tar.bz2 gentoo-71fd8fefba4a17eccf86e805e00af942171b29b6.zip | |
media-libs/shaderc: Fix build
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=698688
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
| -rw-r--r-- | media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch | 54 | ||||
| -rw-r--r-- | media-libs/shaderc/shaderc-2019.0-r1.ebuild (renamed from media-libs/shaderc/shaderc-2019.0.ebuild) | 9 |
2 files changed, 59 insertions, 4 deletions
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch new file mode 100644 index 000000000000..807540cf62a2 --- /dev/null +++ b/media-libs/shaderc/files/shaderc-2019.0-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 +--- a/libshaderc/src/shaderc.cc ++++ b/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 +--- a/libshaderc_util/src/compiler.cc ++++ b/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/media-libs/shaderc/shaderc-2019.0.ebuild b/media-libs/shaderc/shaderc-2019.0-r1.ebuild index 6c1e8c8b0192..b125681aee45 100644 --- a/media-libs/shaderc/shaderc-2019.0.ebuild +++ b/media-libs/shaderc/shaderc-2019.0-r1.ebuild @@ -17,12 +17,12 @@ KEYWORDS="~amd64 ~x86" IUSE="doc test" RDEPEND=" - >=dev-util/glslang-7.10[${MULTILIB_USEDEP}] - dev-util/spirv-tools[${MULTILIB_USEDEP}] + >=dev-util/glslang-7.12.3353_pre20191027[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} ${PYTHON_DEPS} - dev-util/spirv-headers + >=dev-util/spirv-headers-1.5.1 doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest @@ -33,7 +33,8 @@ DEPEND="${RDEPEND} # https://github.com/google/shaderc/issues/470 RESTRICT=test -PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" ) +PATCHES=("${FILESDIR}/${P}-fix-glslang-link-order.patch" + "${FILESDIR}/${P}-fix-build-against-new-glslang.patch" ) python_check_deps() { if use test; then |