summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-12-16 14:56:30 -0500
committerMatt Turner <mattst88@gentoo.org>2020-12-16 15:08:54 -0500
commit6f99c02ebff8db2dcbe180e021f5d6f2b44fa930 (patch)
treef49e357c7dc9a2073a7835bf68eaaa841c71bb58 /media-libs/shaderc
parentmedia-libs/vulkan-loader: Drop old versions (diff)
downloadgentoo-6f99c02ebff8db2dcbe180e021f5d6f2b44fa930.tar.gz
gentoo-6f99c02ebff8db2dcbe180e021f5d6f2b44fa930.tar.bz2
gentoo-6f99c02ebff8db2dcbe180e021f5d6f2b44fa930.zip
media-libs/shaderc: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs/shaderc')
-rw-r--r--media-libs/shaderc/Manifest1
-rw-r--r--media-libs/shaderc/files/shaderc-2020.1-fix-build.patch17
-rw-r--r--media-libs/shaderc/shaderc-2020.2.ebuild90
3 files changed, 0 insertions, 108 deletions
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 2aa1ccceae89..d04536b98638 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,2 +1 @@
-DIST shaderc-2020.2.tar.gz 278161 BLAKE2B 8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320 SHA512 1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97
DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
diff --git a/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
deleted file mode 100644
index f46aa5ddb668..000000000000
--- a/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch is a revert of commit 15a66d72f33a099ec65e0fd37cf14548ed1d2bdb (Rolling 5 dependencies and fixing build (#1057)) because it adds usage of the .maxDualSourceDrawBuffersEXT field which is not available in any tagged release of glslang. The field is added in glslang in https://github.com/KhronosGroup/glslang/commit/e05cc20ec20a154d94256c744a3837c23719c0f9
-
----
-diff --git b/libshaderc_util/src/resources.cc a/libshaderc_util/src/resources.cc
-index d64e47f..458a63f 100644
---- b/libshaderc_util/src/resources.cc
-+++ a/libshaderc_util/src/resources.cc
-@@ -125,7 +125,7 @@ const TBuiltInResource kDefaultTBuiltInResource = {
- /* .maxTaskWorkGroupSizeY_NV = */ 1,
- /* .maxTaskWorkGroupSizeZ_NV = */ 1,
- /* .maxMeshViewCountNV = */ 4,
-- /* .maxDualSourceDrawBuffersEXT = */ 1,
-+
- // This is the glslang TLimits structure.
- // It defines whether or not the following features are enabled.
- // We want them to all be enabled.
---
diff --git a/media-libs/shaderc/shaderc-2020.2.ebuild b/media-libs/shaderc/shaderc-2020.2.ebuild
deleted file mode 100644
index d059007510d3..000000000000
--- a/media-libs/shaderc/shaderc-2020.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-CMAKE_ECLASS=cmake
-
-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}]')
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2020.1-fix-build.patch
-)
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-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_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DSHADERC_SKIP_TESTS="$(usex !test)"
- -DSHADERC_ENABLE_WERROR_COMPILE="false"
- )
- cmake_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use doc; then
- cmake_src_make glslc_doc_README
- fi
- cmake_src_compile
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
- fi
- cmake_src_install
-}