diff --git a/srcpkgs/shaderc/patches/fix-build-against-new-glslang.patch b/srcpkgs/shaderc/patches/fix-build-against-new-glslang.patch deleted file mode 100644 index 3e99a39ce49..00000000000 --- a/srcpkgs/shaderc/patches/fix-build-against-new-glslang.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 - #include - --#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, size_t> Compiler::Compile( - bases[static_cast(UniformKind::StorageBuffer)]); - shader.setShiftUavBinding( - bases[static_cast(UniformKind::UnorderedAccessView)]); -- shader.setHlslIoMapping(hlsl_iomap_); - shader.setResourceSetBinding( - hlsl_explicit_bindings_[static_cast(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 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 fc8f7cf20dd..7382d081551 100644 --- a/srcpkgs/shaderc/template +++ b/srcpkgs/shaderc/template @@ -1,18 +1,17 @@ # Template file for 'shaderc' pkgname=shaderc -version=2019.0 -revision=2 -wrksrc="shaderc-${version}" +version=2020.0 +revision=1 build_style=cmake configure_args="-DSHADERC_SKIP_TESTS=ON" hostmakedepends="python3" -makedepends="SPIRV-Tools-devel glslang-devel" +makedepends="SPIRV-Tools-devel glslang-devel SPIRV-Headers" short_desc="Collection of tools, libraries and tests for shader compilation" maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/google/shaderc" distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz" -checksum=1018cd02be52295272fdbffa056ee24b881be277c83d039ad554d91230f4e11b +checksum=e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang" @@ -29,8 +28,8 @@ pre_configure() { # need to keep this in sync with glslang and SPIRV-Tools versions # this is displayed with 'glslc --version' cat <<- EOF > glslc/src/build-version.inc - "shaderc 2019.0\n" - "SPIRV-Tools-2019.2\n" - "glslang-7.13.3496\n" + "shaderc 2020.0\n" + "SPIRV-Tools-2020.3\n" + "glslang-8.13.3743\n" EOF }