From 35c4ea23e9f5db108f2002bc8286163cf785423f Mon Sep 17 00:00:00 2001
From: Nick Sarnie <sarnex@gentoo.org>
Date: Fri, 6 Nov 2020 22:44:19 -0500
Subject: media-libs/shaderc: Bump to 2020.4

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
---
 media-libs/shaderc/Manifest                        |  1 +
 .../shaderc/files/shaderc-2020.4-fix-build.patch   | 13 +++
 .../shaderc/shaderc-2020.4_pre20201106.ebuild      | 92 ++++++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 media-libs/shaderc/files/shaderc-2020.4-fix-build.patch
 create mode 100644 media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild

(limited to 'media-libs/shaderc')

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 7c4fc2204f98..ab03783825f6 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,3 +2,4 @@ DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea
 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-2020.4-fix-build.patch b/media-libs/shaderc/files/shaderc-2020.4-fix-build.patch
new file mode 100644
index 000000000000..93f8252831fc
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2020.4-fix-build.patch
@@ -0,0 +1,13 @@
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index c5ce37e..4703634 100644
+--- a/libshaderc_util/src/compiler.cc
++++ b/libshaderc_util/src/compiler.cc
+@@ -20,7 +20,7 @@
+ #include <thread>
+ #include <tuple>
+ 
+-#include "SPIRV/GlslangToSpv.h"
++#include "glslang/SPIRV/GlslangToSpv.h"
+ #include "libshaderc_util/format.h"
+ #include "libshaderc_util/io.h"
+ #include "libshaderc_util/message.h"
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
new file mode 100644
index 000000000000..b96cf483ee11
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
@@ -0,0 +1,92 @@
+# 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"
+EGIT_COMMIT="fcafd5b49266d65ab7e4268c825224e8b6c1b8bb"
+SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-10.11.0.0_pre20200924[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.5_pre20200922[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.5.4
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2020.4-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
+}
-- 
cgit v1.2.3-65-gdbad