diff options
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/shaderc/build.patch | 86 | ||||
-rw-r--r-- | graphics/shaderc/shaderc.SlackBuild | 8 | ||||
-rw-r--r-- | graphics/shaderc/shaderc.info | 6 |
3 files changed, 4 insertions, 96 deletions
diff --git a/graphics/shaderc/build.patch b/graphics/shaderc/build.patch deleted file mode 100644 index b66de34e70922..0000000000000 --- a/graphics/shaderc/build.patch +++ /dev/null @@ -1,86 +0,0 @@ -From e27b4381be1af80b4cadd74b7357a1895721121a Mon Sep 17 00:00:00 2001 -From: Ryan Harrison <rharrison@google.com> -Date: Mon, 4 May 2020 14:17:34 -0400 -Subject: [PATCH] Rolling 5 dependencies and fixing build - -Roll third_party/glslang/ f03cb290a..b5f003d7a (7 commits) - -https://github.com/KhronosGroup/glslang/compare/f03cb290ac10...b5f003d7a3ec - -$ git log f03cb290a..b5f003d7a --date=short --no-merges --format='%ad %ae %s' -2020-05-01 cepheus Fix #2191: Error check for indexing reference containing unsize array. -2020-05-01 cepheus GLSL: Separate out swizzle handling (potentially fixing bugs). -2020-04-21 pmistry Add support for es extension GL_EXT_blend_func_extended * Introduces builtin variables gl_SecondaryFragColorEXT and gl_SecondaryFragDataEXT * Introduces builtin constant gl_MaxDualSourceDrawBuffersEXT * enables support for layout qualifier "index" in es profile -2020-04-30 63069047+pmistryNV Add support for extension GL_EXT_shader_integer_mix (#2203) -2020-04-26 pmistry Add support for extension GL_EXT_shader_implicit_conversions Updated extension management in TIntermediate class. -2020-04-30 cepheus Fix #2201: Improve const and copy constructor for TVarLivePair. -2020-04-29 63069047+pmistryNV Add support for extension GL_ARB_vertex_attrib_64bit (#2193) - -Roll third_party/googletest/ dcc92d0ab..0eea2e9fc (16 commits) - -https://github.com/google/googletest/compare/dcc92d0ab6c4...0eea2e9fc634 - -$ git log dcc92d0ab..0eea2e9fc --date=short --no-merges --format='%ad %ae %s' -2020-04-30 absl-team Googletest export -2020-04-28 absl-team Googletest export -2020-04-27 absl-team Googletest export -2020-04-24 absl-team Googletest export -2020-04-23 absl-team Googletest export -2020-04-20 absl-team Googletest export -2020-04-20 absl-team Googletest export -2020-04-17 absl-team Googletest export -2020-03-28 arthur.j.odwyer Add -Wdeprecated to the build configuration. -2020-04-16 arthur.j.odwyer Fix a -Wdeprecated warning. -2020-04-16 arthur.j.odwyer Fix a -Wdeprecated warning. -2020-04-16 arthur.j.odwyer Fix a -Wdeprecated warning. -2020-04-16 arthur.j.odwyer Remove all uses of GTEST_DISALLOW_{MOVE_,}ASSIGN_. -2020-04-19 igor.n.nazarenko Enable protobuf printing for open-source proto messages. -2020-04-16 arthur.j.odwyer VariadicMatcher needs a non-defaulted move constructor for compile-time performance. -2020-04-05 jijyunneng Remove duplicate codes existed in get-nprocessors.sh - -Roll third_party/re2/ 209319c1b..8aef3d19d (1 commit) - -https://github.com/google/re2/compare/209319c1bf57...8aef3d19dba9 - -$ git log 209319c1b..8aef3d19d --date=short --no-merges --format='%ad %ae %s' -2020-05-02 junyer `^' is a caret, not a carat. - -Roll third_party/spirv-cross/ 7e0295abf..92f7d36c7 (2 commits) - -https://github.com/KhronosGroup/SPIRV-Cross/compare/7e0295abf81c...92f7d36c72bc - -$ git log 7e0295abf..92f7d36c7 --date=short --no-merges --format='%ad %ae %s' -2020-04-30 post MSL: Redirect member indices when buffer has been sorted by Offset. -2020-04-30 cwallez Fix -Wmicrosoft-enum-value - -Roll third_party/spirv-tools/ d0a87194f..2e1d208ed (4 commits) - -https://github.com/KhronosGroup/SPIRV-Tools/compare/d0a87194f7b9...2e1d208ed9de - -$ git log d0a87194f..2e1d208ed --date=short --no-merges --format='%ad %ae %s' -2020-05-01 afdx spirv-fuzz: Do not allow adding stores to read-only pointers (#3316) -2020-04-30 paulthomson reduce: increase default step limit (#3327) -2020-04-30 afdx Generalize IsReadOnlyVariable() to apply to pointers (#3325) -2020-04-28 stevenperron Delete nullptr in function bb list immedietly (#3326) - -Created with: - roll-dep third_party/effcee third_party/glslang third_party/googletest third_party/re2 third_party/spirv-cross third_party/spirv-headers third_party/spirv-tools - -Fixes #1056 ---- - libshaderc_util/src/resources.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc -index 458a63f5..d64e47fa 100644 ---- a/libshaderc_util/src/resources.cc -+++ b/libshaderc_util/src/resources.cc -@@ -125,7 +125,7 @@ const TBuiltInResource kDefaultTBuiltInResource = { - /* .maxTaskWorkGroupSizeY_NV = */ 1, - /* .maxTaskWorkGroupSizeZ_NV = */ 1, - /* .maxMeshViewCountNV = */ 4, -- -+ /* .maxDualSourceDrawBuffersEXT = */ 1, - // This is the glslang TLimits structure. - // It defines whether or not the following features are enabled. - // We want them to all be enabled. diff --git a/graphics/shaderc/shaderc.SlackBuild b/graphics/shaderc/shaderc.SlackBuild index 0bed4b6f4d6e9..62c057314512a 100644 --- a/graphics/shaderc/shaderc.SlackBuild +++ b/graphics/shaderc/shaderc.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=shaderc -VERSION=${VERSION:-2020.0} +VERSION=${VERSION:-2020.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -86,12 +86,6 @@ cat > glslc/src/build-version.inc <<EOF "glslang-${glslang_version##* }\\n" EOF -# Fix build -# https://github.com/google/shaderc/issues/1056 -# https://github.com/google/shaderc/pull/1057 -# https://github.com/google/shaderc/commit/15a66d72f33a099ec65e0fd37cf14548ed1d2bdb -patch -p1 < $CWD/build.patch - # Fix the link order of libglslang and libHLS # https://github.com/google/shaderc/pull/463 patch -p1 < $CWD/fix-glslang-link-order.patch diff --git a/graphics/shaderc/shaderc.info b/graphics/shaderc/shaderc.info index 2b46a3b9137e0..e78ebef97a585 100644 --- a/graphics/shaderc/shaderc.info +++ b/graphics/shaderc/shaderc.info @@ -1,8 +1,8 @@ PRGNAM="shaderc" -VERSION="2020.0" +VERSION="2020.1" HOMEPAGE="https://github.com/google/shaderc" -DOWNLOAD="https://github.com/google/shaderc/archive/v2020.0/shaderc-2020.0.tar.gz" -MD5SUM="9ddf5841214875aac171816c8aad554d" +DOWNLOAD="https://github.com/google/shaderc/archive/v2020.1/shaderc-2020.1.tar.gz" +MD5SUM="d12155e2e15a3717a9e71468b844a9ce" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vulkan-sdk" |