| 1 |
commit: 3661db8161971abfffb8c858ba6f0b063326a707 |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 29 23:01:06 2019 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 29 23:08:37 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3661db81 |
| 7 |
|
| 8 |
dev-util/glslang: Add blocker for new shaderc, drop old |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/698862 |
| 11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 12 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/glslang/Manifest | 1 - |
| 15 |
dev-util/glslang/glslang-7.12.3352.ebuild | 17 ----------------- |
| 16 |
.../glslang/glslang-7.12.3353_pre20191027-r1.ebuild | 2 ++ |
| 17 |
dev-util/glslang/glslang-7.12.3353_pre20191027.ebuild | 17 ----------------- |
| 18 |
4 files changed, 2 insertions(+), 35 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest |
| 21 |
index 28c6d261b56..4634a6907a3 100644 |
| 22 |
--- a/dev-util/glslang/Manifest |
| 23 |
+++ b/dev-util/glslang/Manifest |
| 24 |
@@ -1,4 +1,3 @@ |
| 25 |
DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192 |
| 26 |
-DIST glslang-7.12.3352.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192 |
| 27 |
DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7 |
| 28 |
DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737 |
| 29 |
|
| 30 |
diff --git a/dev-util/glslang/glslang-7.12.3352.ebuild b/dev-util/glslang/glslang-7.12.3352.ebuild |
| 31 |
deleted file mode 100644 |
| 32 |
index 1fbfeb598cd..00000000000 |
| 33 |
--- a/dev-util/glslang/glslang-7.12.3352.ebuild |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,17 +0,0 @@ |
| 36 |
-# Copyright 1999-2019 Gentoo Authors |
| 37 |
-# Distributed under the terms of the GNU General Public License v2 |
| 38 |
- |
| 39 |
-EAPI=7 |
| 40 |
- |
| 41 |
-inherit cmake-multilib cmake-utils |
| 42 |
- |
| 43 |
-SNAPSHOT_COMMIT="0527c9db8148ce37442fa4a9c99a2a23ad50b0b7" |
| 44 |
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 45 |
-KEYWORDS="~amd64 ~x86" |
| 46 |
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}" |
| 47 |
- |
| 48 |
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" |
| 49 |
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/" |
| 50 |
- |
| 51 |
-LICENSE="BSD" |
| 52 |
-SLOT="0" |
| 53 |
|
| 54 |
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild |
| 55 |
index 8c95609eba7..c1e6eeb104d 100644 |
| 56 |
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild |
| 57 |
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild |
| 58 |
@@ -18,5 +18,7 @@ SLOT="0" |
| 59 |
|
| 60 |
PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" ) |
| 61 |
|
| 62 |
+RDEPEND="!<media-libs/shaderc-2019-r1" |
| 63 |
+ |
| 64 |
# Bug 698850 |
| 65 |
RESTRICT="test" |
| 66 |
|
| 67 |
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027.ebuild |
| 68 |
deleted file mode 100644 |
| 69 |
index 9a66a271e33..00000000000 |
| 70 |
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027.ebuild |
| 71 |
+++ /dev/null |
| 72 |
@@ -1,17 +0,0 @@ |
| 73 |
-# Copyright 1999-2019 Gentoo Authors |
| 74 |
-# Distributed under the terms of the GNU General Public License v2 |
| 75 |
- |
| 76 |
-EAPI=7 |
| 77 |
- |
| 78 |
-inherit cmake-multilib cmake-utils |
| 79 |
- |
| 80 |
-SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f" |
| 81 |
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 82 |
-KEYWORDS="~amd64 ~x86" |
| 83 |
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}" |
| 84 |
- |
| 85 |
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" |
| 86 |
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/" |
| 87 |
- |
| 88 |
-LICENSE="BSD" |
| 89 |
-SLOT="0" |
Archives