media-libs/shaderc: Version bump

Fixes: https://bugs.gentoo.org/698126
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index a0ed3bcc63df6fc4101a94eb89d1f0748efa086d..d84218ff3d68c335e90e75615417fe86f66dfa01 100644 (file)
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1 +1,2 @@
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
+DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a

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
new file mode 100644 (file)
index 0000000..660d1bf
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2019.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 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-2019.0.ebuild b/media-libs/shaderc/shaderc-2019.0.ebuild
new file mode 100644 (file)
index 0000000..1f712cb
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2019.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+
+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
+}