diff options
7 files changed, 0 insertions, 367 deletions
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index ab03783825f6..2aa1ccceae89 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,5 +1,2 @@ -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 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 -} |