gentoo resync : 21.06.2020

3 files changed, 28 insertions, 9 deletions

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index d14130618c89..ee005e92b2b8 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,10 +1,11 @@
 AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
 AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067ca6b8e2a10e890b7b006680856fa3df2565df3da97759c45445606530e81eee46b1d576d8cdb43b4a84c3241fcd14828c769d418c72f880402c25 SHA512 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f
 AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
+AUX shaderc-2020.1-fix-build.patch 960 BLAKE2B 1124ca1dce0ea480e2af0fd44da957b99a3d8c7d6d759438471b41f50d36d0daf323f68378cbf5b1d53647a5f0494d5de3f7efe71df1dcdb09c9984f0e108d95 SHA512 f299b731c109026d0d8dfa000e377cf48b43a121eff9e5529e91c0bbdf3f54ebd9c692688b23255e8073258b03a3729e0cc3e0904a478a47a448e56b4b27a0ef
 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.4_pre20200405.tar.gz 273897 BLAKE2B 6cd02d0db17d0c92b3f2b65bd46284b8432538e3899e088c2e08648a6797ed596af13e251afdf0c1747abc27fa49b56df32ce67beb72c6e99a6bda463cf9dea1 SHA512 556d519faf6e3df6efbe77a24b21e74198468b0638dd7c3143228afce5625f04707fa77aaec997998795166705271e2e8d086cd2e82609eaaef786ea36554ac4
+DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
 EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
 EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098
-EBUILD shaderc-2020.4_pre20200405.ebuild 2089 BLAKE2B ee9e8ed191ee3094cae26dfae29e8e5542f1816ea22b2891f75b9bcc825918ee5d2f6607bcf50c918c9dd38a3c08d06ee43cc6c19435311daef20f8a9eebd781 SHA512 e618ffa15344e1489b43dc3a29e571f4f88ec234988df5a729d2f9a84e905bdcf049f0252a3d76cceb89afdc636d4c38e73558983977ba4df0e93f7aa6d5fbe4
+EBUILD shaderc-2020.1.ebuild 2011 BLAKE2B 75cc8aebf8d3bdba61d554892a5a9365385e897b4f11c69b142f7d861e3e981f45c2b5feeb86d0d7617d4467eaf60ee291da07b5578a99c0b24611f909d03865 SHA512 3adbcba356cb30e0b42ab804d6ea96ba6e4b901be83c0214f0c7f233405a55df96177c9f3a788832c1e50bb7f4e321d6885ee0c5e4e239502c458e8231673cee
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
new file mode 100644
index 000000000000..f46aa5ddb668
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
@@ -0,0 +1,17 @@
+This patch is a revert of commit 15a66d72f33a099ec65e0fd37cf14548ed1d2bdb (Rolling 5 dependencies and fixing build (#1057)) because it adds usage of the .maxDualSourceDrawBuffersEXT field which is not available in any tagged release of glslang. The field is added in glslang in https://github.com/KhronosGroup/glslang/commit/e05cc20ec20a154d94256c744a3837c23719c0f9
+
+---
+diff --git b/libshaderc_util/src/resources.cc a/libshaderc_util/src/resources.cc
+index d64e47f..458a63f 100644
+--- b/libshaderc_util/src/resources.cc
++++ a/libshaderc_util/src/resources.cc
+@@ -125,7 +125,7 @@ const TBuiltInResource kDefaultTBuiltInResource = {
+     /* .maxTaskWorkGroupSizeY_NV = */ 1,
+     /* .maxTaskWorkGroupSizeZ_NV = */ 1,
+     /* .maxMeshViewCountNV = */ 4,
+-    /* .maxDualSourceDrawBuffersEXT = */ 1,
++
+     // This is the glslang TLimits structure.
+     // It defines whether or not the following features are enabled.
+     // We want them to all be enabled.
+-- 
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild b/media-libs/shaderc/shaderc-2020.1.ebuild
index 3de771d443aa..17392a54f21a 100644
--- a/media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild
+++ b/media-libs/shaderc/shaderc-2020.1.ebuild
@@ -9,23 +9,20 @@ inherit cmake-multilib python-any-r1
 
 DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
 HOMEPAGE="https://github.com/google/shaderc"
-
-SNAPSHOT_COMMIT="f175adffa9d2da6ae18a5f8d54e7b5f27df0f1c2"
-SRC_URI="https://github.com/google/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+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"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
 	>=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.3[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.1
+	>=dev-util/spirv-headers-1.5.3
 	doc? ( dev-ruby/asciidoctor )
 	test? (
 		dev-cpp/gtest
@@ -36,6 +33,10 @@ DEPEND="${RDEPEND}
 # 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}]"