From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 457FC138334 for ; Tue, 29 Oct 2019 02:20:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BD0DE0970; Tue, 29 Oct 2019 02:20:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43F75E0970 for ; Tue, 29 Oct 2019 02:20:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BEBF34C522 for ; Tue, 29 Oct 2019 02:20:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 339FC890 for ; Tue, 29 Oct 2019 02:19:58 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1572315508.868bb8383a826306eec7f8abcc1d4a63856e9b54.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild dev-util/glslang/glslang-9999.ebuild X-VCS-Directories: dev-util/glslang/ dev-util/glslang/files/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 868bb8383a826306eec7f8abcc1d4a63856e9b54 X-VCS-Branch: master Date: Tue, 29 Oct 2019 02:19:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37f52fab-b2c1-4af6-b7d9-7753e47ba542 X-Archives-Hash: c66b7101d29c637312ec6102ac4770a8 commit: 868bb8383a826306eec7f8abcc1d4a63856e9b54 Author: Nick Sarnie gentoo org> AuthorDate: Tue Oct 29 02:18:28 2019 +0000 Commit: Nick Sarnie gentoo 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 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 + #include +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 + #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" )