commit 39cc5be2112fde70784e5704150c2d6b682ab370 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Dec 1 11:50:44 2019 +1100 [notify] glslang: fix relative includes, this affects shaderc building diff --git a/glslang/.signature b/glslang/.signature index 769456c21..4b5f9b11d 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,8 +1,9 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QLlhAuukp7tLTpJ+I0EvN41ktsooVirif6a6+Xg7I76jyz0TclpB6FsxrjiV5/Lh8itd8Hv0CLylOm8jhK40gI= -SHA256 (Pkgfile) = 98a0bd7ba0420990cdc80178aa9d9b75545d64604ec82c5d534bda0aeb71c1a3 +RWSE3ohX2g5d/Wl4yOBeuZLcrkeqGse0s+C9tXDgSP5B2SGK8yCbXxgnumxicHhthITipqYJQ//WEfXz4MPIisIXoKxnbaKl0QM= +SHA256 (Pkgfile) = d874f9a7bf9103dace28c86de50040eebdab965b888222b1975224ba8ccf419c SHA256 (.footprint) = 1c4f2f5e13c17a3df141b874e8ded6a7ec4c3aed19413ccd65adb87d7e5dc250 SHA256 (glslang-7.13.3496.tar.gz) = 170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922 SHA256 (glslang-default-resource-limits_staticlib.patch) = 1aa1538d9ef5f57153530df8c0f37d471c119e14c6d4ed1efe1bfec80d6b1b83 SHA256 (glslang-lib-install.patch) = 0eacb3ab34de86f324384b5723ebb8854c213604ad5ac7859368562fdb2fe9bc SHA256 (0001-pkg-config-compatibility.patch) = 735e14abb5a6fd6acf9315ed173c901f67785de7862f5d0d491ef2016d2b6f58 +SHA256 (glslang-7.12.3353_pre20191027-fix-relative-includes.patch) = 8af4205a290890d6b30718a947800cf72082c0008193acd77f50123fe9a2c89b diff --git a/glslang/Pkgfile b/glslang/Pkgfile index 85937ec63..393867aa8 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -5,17 +5,19 @@ name=glslang version=7.13.3496 -release=1 +release=2 source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.... glslang-default-resource-limits_staticlib.patch glslang-lib-install.patch - 0001-pkg-config-compatibility.patch) + 0001-pkg-config-compatibility.patch + glslang-7.12.3353_pre20191027-fix-relative-includes.patch) build() { cd $name-$version patch -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch patch -p1 -i $SRC/glslang-lib-install.patch + patch -p1 -i $SRC/glslang-7.12.3353_pre20191027-fix-relative-includes.patch # Patch to build against system spirv-tools patch -p1 -i $SRC/0001-pkg-config-compatibility.patch diff --git a/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch new file mode 100644 index 000000000..4c44cfbbb --- /dev/null +++ b/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch @@ -0,0 +1,26 @@ +diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h +index 86e1c23b..3907be43 100755 +--- a/SPIRV/GlslangToSpv.h ++++ b/SPIRV/GlslangToSpv.h +@@ -40,7 +40,7 @@ + #endif + + #include "SpvTools.h" +-#include "../glslang/Include/intermediate.h" ++#include "glslang/Include/intermediate.h" + + #include <string> + #include <vector> +diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h +index 7422d012..59c914da 100644 +--- a/SPIRV/SpvTools.h ++++ b/SPIRV/SpvTools.h +@@ -46,7 +46,7 @@ + #include <ostream> + #endif + +-#include "../glslang/MachineIndependent/localintermediate.h" ++#include "glslang/MachineIndependent/localintermediate.h" + #include "Logger.h" + + namespace glslang {