summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2019-10-06 19:56:02 +0200
committerPacho Ramos <pacho@gentoo.org>2019-10-06 19:56:31 +0200
commit3662bab0ea70353a8363b7587f8aec944c69af67 (patch)
tree15a33901511ced71102faf2783fb79e4e0441408
parentmedia-libs/shaderc: Drop old (diff)
downloadgentoo-3662bab0ea70353a8363b7587f8aec944c69af67.tar.gz
gentoo-3662bab0ea70353a8363b7587f8aec944c69af67.tar.bz2
gentoo-3662bab0ea70353a8363b7587f8aec944c69af67.zip
media-libs/shaderc: Drop live ebuild as it's not being maintained
Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Pacho Ramos <pacho@gentoo.org>
-rw-r--r--media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch46
-rw-r--r--media-libs/shaderc/shaderc-9999.ebuild85
2 files changed, 0 insertions, 131 deletions
diff --git a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
deleted file mode 100644
index 2cd24a165e5c..000000000000
--- a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Original upstream PR: https://github.com/google/shaderc/pull/463
-
-From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Tue, 29 May 2018 07:34:00 +0200
-Subject: [PATCH] Fix the link order of libglslang and libHLSL
-
-libglslang depends on libHLSL, so the latter needs to be specified last.
-This fixes an issue when trying to build shaderc against system-wide
-versions of libglslang/libHLSL, rather than the in-tree versions from
-third_party.
-
-Additionally, libshaderc_util also depends on SPIRV-Tools
----
- glslc/CMakeLists.txt | 2 +-
- libshaderc_util/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-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..6d0c465 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -34,8 +34,8 @@ 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})
-+ glslang OSDependent OGLCompiler glslang HLSL SPIRV
-+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
-
- shaderc_add_tests(
- TEST_PREFIX shaderc_util
diff --git a/media-libs/shaderc/shaderc-9999.ebuild b/media-libs/shaderc/shaderc-9999.ebuild
deleted file mode 100644
index aad02e3ab3f7..000000000000
--- a/media-libs/shaderc/shaderc-9999.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-multilib python-any-r1 git-r3
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_REPO_URI="https://github.com/google/shaderc.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc test"
-
-RDEPEND="
- ~dev-util/glslang-9999[${MULTILIB_USEDEP}]
- ~dev-util/spirv-tools-9999[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- ~dev-util/spirv-headers-9999
- 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}/${PN}-2017.2-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
-}