[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/

[Nick Sarnie]

commit:     868bb8383a826306eec7f8abcc1d4a63856e9b54
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 02:18:28 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:18:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868bb838

dev-util/glslang: Fix relative includes in headers

Needed to fix media-libs/shaderc build. Patch developed and tested by chutzpah

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 ...12.3353_pre20191027-fix-relative-includes.patch | 26 ++++++++++++++++++++++
 .../glslang-7.12.3353_pre20191027-r1.ebuild        | 19 ++++++++++++++++
 dev-util/glslang/glslang-9999.ebuild               |  2 ++
 3 files changed, 47 insertions(+)

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 00000000000..4c44cfbbbed
--- /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 00000000000..7c674c7f866
--- /dev/null
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
@@ -0,0 +1,19 @@
+# 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" )

diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 63a6238d03f..4283dcd2371 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" )