gentoo auto-resync : 29:12:2022 - 02:14:02

4 files changed, 81 insertions, 2 deletions

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 6a00690b6311..4e846e1cc105 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,10 +1,13 @@
 AUX glslang-1.3.224-Fix-cmake-file-install-dir.patch 13162 BLAKE2B fb58095f7f9c136e3d1aeacb0d7e0a1ddc4d8972a160f8e31e7542526ae9eed9c1acb07dc1bf160e58f8df2582420b9df4532c0aae723729293b0fa5b4bc24df SHA512 8eb4cf63767d83219b56996477521da067f06e0d9db52c8a5a7c842e28f988935181cacb5727795c33fc75ec81d6085c6d30f0498ed4f1a8c3e6fbe33c1cc7be
 AUX glslang-1.3.231-Install-static-libs.patch 2628 BLAKE2B 4d70627a22636bb2d47b6f6295a7e47f74e485227f8673e92998dad46ef8cb35cbd581b85d744fe6cec24ac1d0458689e3aad3b703a83e2cac369da3c5bd5bff SHA512 f5e4ad9cd39ce4be50aba81c075dbca3f05a84190ba54cbd36fdb494c003e1c45d8878e03aefb9ff341c6959d465207782f2e285f8b28d9b9bff60ceb5c4a9b8
+AUX glslang-1.3.236-Install-static-libs.patch 1460 BLAKE2B f17b5b7325e112d52a65767166530c9976833a2a893e608fe89c662a2e84feccd8e51b36a620dcf94b269cbeb96307744b4376799821dd4d4e422ad8fd887b14 SHA512 032da16afb9ca98bb0377625fc16458c641836fb3bb63940818c1bf4b068b6fe03b3f14b03cf00e10991236ca20d292293c67d02dbc429b2e3714e6a8bf85b19
 DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8
 DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4
 DIST glslang-1.3.231.tar.gz 3657070 BLAKE2B 3a33854d165e966f339027f73d0f05bf4a2df5998f379529413209eaca2b3e95939ead4bb606e7f65effb7a32e81ce40f4bd7af94b2e6fbad1ed8d809f6a1f19 SHA512 2235c476b03bcb93ac9d0d8a88fdf980f6435086d7ce13a1d9c8ff223880d788a49f35e7392f1b5af9174da7b501a171b80ce4e89bc0c6d609d2b737da982e56
+DIST glslang-1.3.236.tar.gz 3659402 BLAKE2B 7ee37cf00e5d9bd821253d7c907d29422410cf6809f7ec09551b1d0b08e53924add24595a52b241017b69890037ea91660be1ea5645e18cb1e0bba80ad224a5b SHA512 4758b137a31bc6ef999c6b00f4d4a55c0edc879eb09082acbc22a56549a53e61ee5a67e705a40f679f2e25f3a5f1245c14a880e646febc5270e8374809debcb3
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e
 EBUILD glslang-1.3.224-r1.ebuild 874 BLAKE2B adb8e53b4667fc094fed4f3568bb82a338906bc6056c2975fa04ce3346c43c79a4140c052efdd286b37eb6f6350b0b70fcbc343fc5e35592ee36d3e7f0f531c2 SHA512 9ace062e32cd94a8691afe87c4d838c639b1227fa8cd7bca53ab9999cd031a5734ad620dbcfa54a34ff741efc91968f62f4099474e45aba76e261a2b5bfe8e74
 EBUILD glslang-1.3.231-r2.ebuild 963 BLAKE2B d11d386b707d88221f5c343656a633e587d954416d5e57b20c4c19542ff474cc6f4dbb75c6f6f3d65272231191c2fd00080ba8a016f3953c84e1e2f74d81e6d8 SHA512 e74c76895c057becf0b0af51a135241d99df48b4814c7cceb755ad4591f3f877ba122460d8cbdce72bc3f85cae3071f622f70678fc7319c89f26e8d793579ecb
-EBUILD glslang-9999.ebuild 978 BLAKE2B 35807072685f3364ccb38b47af47cf8f6ed3c918b246312877a22659b20af6cb8d3f6a0dc7a404a1fdc0d55c4d516804621cd6b543f1efac28bc8908a3c559a8 SHA512 069143c55a6c62101a4efe4f220e219e4970592663be8c5fcc89fed2c80ae5ff5393a2ee363d74af747b92e2b5aaaecdb15955ef5f821da5ec128cee7899c225
+EBUILD glslang-1.3.236.ebuild 969 BLAKE2B 6f11eb37e246b2ed1c1fe0887907131b715faa57081b824a2e91642d23bafdcf9cf55fce8cf09d1dbb8426c0263314cb034a6738b8a05b04dba4478b9a9955b0 SHA512 d9c97a111902298a6cadfb01c5fd9e77f8afe0b3bfaba773644f6836a60a408ffa22d8707247d0fd9cb3450ec08c5d957390945fb9a8ee752482b984e5ce7bb9
+EBUILD glslang-9999.ebuild 978 BLAKE2B ca18b9b116c80bffcacce02c29b629dc308903f4e9ac65c186b2977eaded341bf153bbf35e41a05d1a5bdd1a9b7f90e626c1e68c40fdc6f8867b5bd05c174c2f SHA512 d14a3497bce484549bfa9ba0cfa99f361302f6dd69d862cc02ed9e43ab5533cbb80808904b9767e9bf4b933b73034f700db4c77e69d6fac56b247dbf4993124b
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
new file mode 100644
index 000000000000..826e0f6cd856
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
@@ -0,0 +1,39 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index b44cbc73..41f6de93 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -41,7 +41,7 @@ if(WIN32)
+     source_group("Source" FILES ${SOURCES})
+ endif(WIN32)
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OGLCompiler EXPORT glslang-targets)
+ 
+     # Backward compatibility
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index a8b14911..57ec1efd 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -203,7 +203,7 @@ endif()
+ ################################################################################
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS glslang EXPORT glslang-targets)
+-    if(NOT BUILD_SHARED_LIBS)
++    if(BUILD_SHARED_LIBS)
+         install(TARGETS MachineIndependent EXPORT glslang-targets)
+         install(TARGETS GenericCodeGen EXPORT glslang-targets)
+ 
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 16eb939b..959788dc 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -52,7 +52,7 @@ else()
+     target_link_libraries(OSDependent Threads::Threads)
+ endif()
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT glslang-targets)
+ 
+     # Backward compatibility
diff --git a/dev-util/glslang/glslang-1.3.236.ebuild b/dev-util/glslang/glslang-1.3.236.ebuild
new file mode 100644
index 000000000000..519eb9fd2b13
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.236.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
+
+LICENSE="BSD"
+SLOT="0/1"
+
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index c7d6b2354929..cfde31bd6156 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -19,7 +19,7 @@ fi
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.231-Install-static-libs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
 
 LICENSE="BSD"
 SLOT="0/1"