diff options
Diffstat (limited to 'media-libs/shaderc')
| -rw-r--r-- | media-libs/shaderc/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch | 26 | ||||
| -rw-r--r-- | media-libs/shaderc/shaderc-2017.2-r1.ebuild (renamed from media-libs/shaderc/shaderc-2017.2.ebuild) | 4 | ||||
| -rw-r--r-- | media-libs/shaderc/shaderc-2018.0.ebuild | 85 |
4 files changed, 117 insertions, 3 deletions
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index bd2480ff632d..b3bfa4102471 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,5 +1,8 @@ AUX shaderc-2017.2-fix-glslang-link-order.patch 1803 BLAKE2B b5c880d6869a3a6d70405e12290bbb7f22d83c9903fdec62d0672f4e475bbb92ff377ed71121f7d8f935c1043d9c15949158aef616d45452dc3024ca24d8e4d5 SHA512 f8204ed66381864ee2f682f4e948d3e426fa4031b702e31ee5be7e1d963d7d64aea72b5e9234d621e0708c35f4009d788235b6d8c4bd45b91fa1957c1f641c0d +AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87 +DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0 DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b SHA512 558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18 -EBUILD shaderc-2017.2.ebuild 2104 BLAKE2B fbf8550151920a89a8522e131d9a499425de667c0168af5968965e5a715d12bd7cc81cf1e4e92484d77c2bc5ebc277e4d1502040049a0c63f198a613d0d0d3a1 SHA512 b01c956fb8e727222ee4badbbcf4de68d9993c3d09a6211156405a2f15ddfe991a6acc5ab80262b6573ffdff4b00d774950ecb46e32b41eb29fab5f985715fa0 +EBUILD shaderc-2017.2-r1.ebuild 2107 BLAKE2B efc8b90f83e81191da600e9904d96f2107486b82e9b79dcd889bdd24f4408b3eed407bc7a7396cede96e169610ec91e710700113296a339eedf7992e64bc2cc2 SHA512 4667b524cc19b3a06d0549e0ca122dd2dacb921ce00a1a9bbcfd5c68bba9dfd21c987ce64cfef0c664d6482b3f093378facb6c87c5161aecbc5699a6dda973e6 +EBUILD shaderc-2018.0.ebuild 1988 BLAKE2B 610b98c1d6687e865909c5cc810b41cf12868872e9e379ec9b1a2bbb5551a2fbfe46823e4a91b417250aef8813d96ccb97d6d3535b3f829bd9e099753c70c6d4 SHA512 b268a3685a3bebf20091cc5fbd48b3fe2a3da24a100d5ff8d05b11a349c211dabe432dad8d54915e4724751a2335897973909e712a220c6381cb54afc5db84dc EBUILD shaderc-9999.ebuild 1981 BLAKE2B ce4353c33b52a4f95f6ea65882afd5a3114e7ba6d5bb2b9dea6e2103778a809fd418fad27d4bf927e7cba7c3ee8e2b253327f3398c8ea40e414bcb0b92e3add4 SHA512 9ac2e97a909e8a00fcf540bf1695bd4937a095b758ebc116a5dfe35fc7076f223f6f1fd24a211ea31ac4cd5da3ed65ecea2c4c497cf54fda5b6870d1e05967e7 MISC metadata.xml 445 BLAKE2B 6e35c47106d6253c5895ee5e641d1481d20df16f2f2d54f0404a84b9a4a8c5d0b55b51dbe465630bfc7983e9c82b7610000cb44fe30a9d8a4b42539f19e2cea6 SHA512 adabb9a986ad200680297819c3933d22a921bf77d6c2991f360c19d8fe4131d7e78422570c4928055b6aaab69242698b8edf757c5b4d7c2876a2ef6f3a110bd5 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 new file mode 100644 index 000000000000..837303d84e17 --- /dev/null +++ b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch @@ -0,0 +1,26 @@ +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/shaderc-2017.2.ebuild b/media-libs/shaderc/shaderc-2017.2-r1.ebuild index 3657eab08ee2..e664c51b776d 100644 --- a/media-libs/shaderc/shaderc-2017.2.ebuild +++ b/media-libs/shaderc/shaderc-2017.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86" IUSE="doc test" RDEPEND=" - dev-util/glslang[${MULTILIB_USEDEP}] + <dev-util/glslang-7.10[${MULTILIB_USEDEP}] dev-util/spirv-tools[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild new file mode 100644 index 000000000000..e0b0e435fad8 --- /dev/null +++ b/media-libs/shaderc/shaderc-2018.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_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 +} |