summaryrefslogtreecommitdiff
path: root/media-libs/shaderc
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/shaderc')
-rw-r--r--media-libs/shaderc/Manifest11
-rw-r--r--media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch26
-rw-r--r--media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch54
-rw-r--r--media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch26
-rw-r--r--media-libs/shaderc/shaderc-2018.0.ebuild85
-rw-r--r--media-libs/shaderc/shaderc-2019.0-r1.ebuild86
-rw-r--r--media-libs/shaderc/shaderc-2020.1.ebuild87
-rw-r--r--media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild2
8 files changed, 2 insertions, 375 deletions
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index ce0e9d87b8be..9df5adae94c6 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,16 +1,7 @@
-AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
-AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067ca6b8e2a10e890b7b006680856fa3df2565df3da97759c45445606530e81eee46b1d576d8cdb43b4a84c3241fcd14828c769d418c72f880402c25 SHA512 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f
-AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
AUX shaderc-2020.1-fix-build.patch 960 BLAKE2B 1124ca1dce0ea480e2af0fd44da957b99a3d8c7d6d759438471b41f50d36d0daf323f68378cbf5b1d53647a5f0494d5de3f7efe71df1dcdb09c9984f0e108d95 SHA512 f299b731c109026d0d8dfa000e377cf48b43a121eff9e5529e91c0bbdf3f54ebd9c692688b23255e8073258b03a3729e0cc3e0904a478a47a448e56b4b27a0ef
AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
DIST shaderc-2020.2.tar.gz 278161 BLAKE2B 8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320 SHA512 1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97
DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
-EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
-EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098
-EBUILD shaderc-2020.1.ebuild 2011 BLAKE2B 75cc8aebf8d3bdba61d554892a5a9365385e897b4f11c69b142f7d861e3e981f45c2b5feeb86d0d7617d4467eaf60ee291da07b5578a99c0b24611f909d03865 SHA512 3adbcba356cb30e0b42ab804d6ea96ba6e4b901be83c0214f0c7f233405a55df96177c9f3a788832c1e50bb7f4e321d6885ee0c5e4e239502c458e8231673cee
EBUILD shaderc-2020.2.ebuild 2052 BLAKE2B 95da500f52ef178674c307872f0ea8858e9f9afd926e2c5b06cb9f243c309f7b8675abbf5645891c1008f051fd1abe478c6c7235ec5a45bc336970b90b44d43a SHA512 2464bae776ce827b30db90a398f9b096865a792061bbb699722ff9aef2eb017242ce5062f8af7ddae28eac5950d797c5b72bbb3c2a907aafe047b4fa181d72fd
-EBUILD shaderc-2020.4_pre20201106.ebuild 2165 BLAKE2B 5626b8ccc743239e7c070bf5b3deb0b2e7b84b9dd8fc0cf288ea0ae3ad968806a2ff7f62b4caa23b1ca82072431c947455a90240248166071d335fb9c725b0a9 SHA512 b2d47d0592c8df7a1f768cff7e28ce84c26ac358b8b5cb62c76af50c7732b6f59e49e2b7f041a017d79ea34d2ad25f03c24349a0f3ca9f69d35aa9625a9fc237
+EBUILD shaderc-2020.4_pre20201106.ebuild 2164 BLAKE2B c5898f422cae230cd4372b7f649468cc1042033fe16a842720990a1a4e2ed130b518f378112fbb4fbb2f68eea1c547ad868b1d652cc38feebbf8e0329a5bd1af SHA512 23917fc929756f88c026a7841d86e594a6a3b6b5e9845bcb01085f09ed2ccdab1a10bc99a828e8e22a63a339003f53b629dccc992aab11fd11afcf9b8c5f75e0
MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
deleted file mode 100644
index 837303d84e17..000000000000
--- a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
-- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
-
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..b189430 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -35,7 +35,7 @@ endif(SHADERC_ENABLE_INSTALL)
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
- glslang OSDependent OGLCompiler HLSL glslang SPIRV
-- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
-
- shaderc_add_tests(
- TEST_PREFIX shaderc_util
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
deleted file mode 100644
index 807540cf62a2..000000000000
--- a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
-index 3c3c3de..b5fc6cb 100644
---- a/libshaderc/src/shaderc.cc
-+++ b/libshaderc/src/shaderc.cc
-@@ -20,7 +20,7 @@
- #include <sstream>
- #include <vector>
-
--#include "SPIRV/spirv.hpp"
-+#include "glslang/SPIRV/spirv.hpp"
-
- #include "libshaderc_util/compiler.h"
- #include "libshaderc_util/counting_includer.h"
-diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
-index ef7867f..acc172b 100644
---- a/libshaderc_util/src/compiler.cc
-+++ b/libshaderc_util/src/compiler.cc
-@@ -26,7 +26,7 @@
- #include "libshaderc_util/string_piece.h"
- #include "libshaderc_util/version_profile.h"
-
--#include "SPIRV/GlslangToSpv.h"
-+#include "glslang/SPIRV/GlslangToSpv.h"
-
- namespace {
- using shaderc_util::string_piece;
-@@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
- bases[static_cast<int>(UniformKind::StorageBuffer)]);
- shader.setShiftUavBinding(
- bases[static_cast<int>(UniformKind::UnorderedAccessView)]);
-- shader.setHlslIoMapping(hlsl_iomap_);
- shader.setResourceSetBinding(
- hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]);
- shader.setEnvClient(target_client_info.client,
- target_client_info.client_version);
- shader.setEnvTarget(target_client_info.target_language,
- target_client_info.target_language_version);
-- if (hlsl_functionality1_enabled_) {
-- shader.setEnvTargetHlslFunctionality1();
-- }
--
- const EShMessages rules = GetMessageRules(target_env_, source_language_,
- hlsl_offsets_,
- generate_debug_info_);
-@@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader(
- }
- shader.setEnvClient(target_client_info.client,
- target_client_info.client_version);
-- if (hlsl_functionality1_enabled_) {
-- shader.setEnvTargetHlslFunctionality1();
-- }
-
- // The preprocessor might be sensitive to the target environment.
- // So combine the existing rules with the just-give-me-preprocessor-output
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
deleted file mode 100644
index 660d1bf8dfd3..000000000000
--- a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
-- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
-
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index f8ae95d..069c48a 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -32,7 +32,7 @@ add_definitions(-DENABLE_HLSL)
-
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
-- glslang OSDependent OGLCompiler HLSL glslang SPIRV
-+ glslang OSDependent OGLCompiler glslang SPIRV HLSL
- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-
- shaderc_add_tests(
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
deleted file mode 100644
index 991a67e2d50b..000000000000
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
- >=dev-util/glslang-7.10[${MULTILIB_USEDEP}]
- dev-util/spirv-tools[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/spirv-headers
- doc? ( dev-ruby/asciidoctor )
- test? (
- dev-cpp/gtest
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" )
-
-python_check_deps() {
- if use test; then
- has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- cmake_comment_add_subdirectory examples
-
- # Unbundle glslang, spirv-headers, spirv-tools
- cmake_comment_add_subdirectory third_party
- sed -i \
- -e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
- glslc/test/CMakeLists.txt || die
-
- # Disable git versioning
- sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
- # Manually create build-version.inc as we disabled git versioning
- cat <<- EOF > glslc/src/build-version.inc || die
- "${P}\n"
- "$(best_version dev-util/spirv-tools)\n"
- "$(best_version dev-util/glslang)\n"
- EOF
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DSHADERC_SKIP_TESTS="$(usex !test)"
- )
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use doc; then
- cmake-utils_src_make glslc_doc_README
- fi
- cmake-utils_src_compile
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
- fi
- cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2019.0-r1.ebuild b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
deleted file mode 100644
index 99087b2d869d..000000000000
--- a/media-libs/shaderc/shaderc-2019.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
- >=dev-util/glslang-7.12.3353_pre20191027-r1[${MULTILIB_USEDEP}]
- >=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=dev-util/spirv-headers-1.5.1
- doc? ( dev-ruby/asciidoctor )
- test? (
- dev-cpp/gtest
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=("${FILESDIR}/${P}-fix-glslang-link-order.patch"
- "${FILESDIR}/${P}-fix-build-against-new-glslang.patch" )
-
-python_check_deps() {
- if use test; then
- has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- cmake_comment_add_subdirectory examples
-
- # Unbundle glslang, spirv-headers, spirv-tools
- cmake_comment_add_subdirectory third_party
- sed -i \
- -e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
- glslc/test/CMakeLists.txt || die
-
- # Disable git versioning
- sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
- # Manually create build-version.inc as we disabled git versioning
- cat <<- EOF > glslc/src/build-version.inc || die
- "${P}\n"
- "$(best_version dev-util/spirv-tools)\n"
- "$(best_version dev-util/glslang)\n"
- EOF
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DSHADERC_SKIP_TESTS="$(usex !test)"
- )
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use doc; then
- cmake-utils_src_make glslc_doc_README
- fi
- cmake-utils_src_compile
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
- fi
- cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2020.1.ebuild b/media-libs/shaderc/shaderc-2020.1.ebuild
deleted file mode 100644
index 17392a54f21a..000000000000
--- a/media-libs/shaderc/shaderc-2020.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
- >=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}]
- >=dev-util/spirv-tools-2020.3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=dev-util/spirv-headers-1.5.3
- doc? ( dev-ruby/asciidoctor )
- test? (
- dev-cpp/gtest
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-build.patch
-)
-
-python_check_deps() {
- if use test; then
- has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- cmake_comment_add_subdirectory examples
-
- # Unbundle glslang, spirv-headers, spirv-tools
- cmake_comment_add_subdirectory third_party
- sed -i \
- -e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
- glslc/test/CMakeLists.txt || die
-
- # Disable git versioning
- sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
- # Manually create build-version.inc as we disabled git versioning
- cat <<- EOF > glslc/src/build-version.inc || die
- "${P}\n"
- "$(best_version dev-util/spirv-tools)\n"
- "$(best_version dev-util/glslang)\n"
- EOF
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DSHADERC_SKIP_TESTS="$(usex !test)"
- )
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use doc; then
- cmake-utils_src_make glslc_doc_README
- fi
- cmake-utils_src_compile
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
- fi
- cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
index 9a8b97deedfe..32988c5d5b75 100644
--- a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
+++ b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
IUSE="doc test"
RDEPEND="