gentoo resync : 03.11.2019

4 files changed, 56 insertions, 1 deletions

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 85a26a83a39d..7e14291820d8 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,9 @@
+AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
 DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
+DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
 DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
 EBUILD glslang-7.11.3114_pre20190415-r1.ebuild 556 BLAKE2B 77fea586cb6202d0c9ae2edbd398bfec0f5b8aff7db0bf405e8954be09cdc82cf393a1d0da6ecd67dd7c7e4448c89b6bf9e6504d85561f604336d750e2d0919a SHA512 c0994b38b8984c98ded133636e2c2d3d0502e7581f799b39e11487aeb52f26b7cdf57cb0a2923135493b81eafd21f2c7bdf8bbc32a164486318c3a72fd8e06f1
+EBUILD glslang-7.12.3353_pre20191027-r1.ebuild 688 BLAKE2B 9fd85aec4efeba74a64284f1e8b9f5643bc84b1a0fe483a55d5df0c674cdffbc16f1d9e3f684310299c202ae5c8206045ea0ff7e28ac2e9cba50e0e4e0c9b5a2 SHA512 08cfbc174d6e29fe4642a7356e044986cc27a9c7a0221a7a34a185baa35053f5884f75b2377c3e970884954e2eb7fced1dda31e455e56713f4a95d825257c0ff
 EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
-EBUILD glslang-9999.ebuild 415 BLAKE2B 7c9fbc60b1bcdab2c19f01abc3dd83000cab76cf25509bb3efc24a1fd51b26b9f78fba4b03d8d5012b2f63217b10da174e14cdc452579dcd9fbc2775fb2685ce SHA512 e3ddff0a117d4f75b493bf4a0fc0c5c8dfdf43a9b89f53dc292199629ac871a6b234f6f6b52d0812bf2fa05f596fc01f6d89ea828c626333159ea90a0fb924db
+EBUILD glslang-9999.ebuild 475 BLAKE2B 0b777f21e7e0102c9aa5ddc96b0eb0db879bf71c863581ae3bfc6c29a28bde53fe160e6fd3b8fd14e7b9a105e705ae8cea09317df06522fe9643a909b0e9648f SHA512 de572163317dbd22012cc89023dc006a279a4391ae6f317538097130633991e83ba9730d84dde2fc41bd8d96a711cd6c6c8a89716dacd8d7414aec54638bd126
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
new file mode 100644
index 000000000000..4c44cfbbbedd
--- /dev/null
+++ b/dev-util/glslang/files/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 {
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
new file mode 100644
index 000000000000..c1e6eeb104d2
--- /dev/null
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib cmake-utils
+
+SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )
+
+RDEPEND="!<media-libs/shaderc-2019-r1"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 63a6238d03f8..4283dcd2371b 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -13,3 +13,5 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
 
 LICENSE="BSD"
 SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )