[gentoo-commits] repo/gentoo:master commit in: dev-games/godot/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     badc538a3013607d16632ca551697b3eb462bd74
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 06:56:01 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 07:32:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badc538a

dev-games/godot: switch to bundled glslang+vulkan-headers

Similarly to pcsx2, this uses part of the glslang private API
and can break easily with the system's copy. Also use bundled
vulkan-headers given mismatching with glslang is also volatile.

Revbump given it could've built with the old glslang and possibly
have ill effects after updating it.

Closes: https://bugs.gentoo.org/879111
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 ...godot-4.0_beta4.ebuild => godot-4.0_beta4-r1.ebuild} | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/dev-games/godot/godot-4.0_beta4.ebuild b/dev-games/godot/godot-4.0_beta4-r1.ebuild
similarity index 95%
rename from dev-games/godot/godot-4.0_beta4.ebuild
rename to dev-games/godot/godot-4.0_beta4-r1.ebuild
index 9a915964766b..b790692736f4 100644
--- a/dev-games/godot/godot-4.0_beta4.ebuild
+++ b/dev-games/godot/godot-4.0_beta4-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="
 	sys-libs/zlib:=
 	fontconfig? ( media-libs/fontconfig )
 	gui? (
-		dev-util/glslang
 		media-libs/alsa-lib
 		media-libs/libglvnd[X]
 		media-libs/vulkan-loader[X]
@@ -66,10 +65,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )"
 DEPEND="
 	${RDEPEND}
-	gui? (
-		dev-util/vulkan-headers
-		x11-base/xorg-proto
-	)
+	gui? ( x11-base/xorg-proto )
 	tools? ( test? ( dev-cpp/doctest ) )"
 BDEPEND="virtual/pkgconfig"
 
@@ -91,9 +87,9 @@ src_prepare() {
 
 	# use of builtin_ switches can be messy (see below), delete to be sure
 	local unbundle=(
-		doctest embree freetype glslang graphite harfbuzz icu4c libogg libpng
-		libtheora libvorbis libwebp mbedtls miniupnpc pcre2 recastnavigation
-		volk vulkan/include wslay zlib zstd
+		doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp mbedtls miniupnpc
+		pcre2 recastnavigation volk wslay zlib zstd
 		# certs: unused by generated header, but scons panics if not found
 	)
 	rm -r "${unbundle[@]/#/thirdparty/}" || die
@@ -138,7 +134,7 @@ src_compile() {
 		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
 		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
 		builtin_freetype=no
-		builtin_glslang=$(usex !gui)
+		builtin_glslang=yes #879111
 		builtin_graphite=no
 		builtin_harfbuzz=no
 		builtin_icu=no
@@ -162,11 +158,10 @@ src_compile() {
 		#	amd-fsr, basis_universal, cvtt, etcpak, fonts, glad,
 		#	jpeg-compressor, meshoptimizer, minimp3, minizip (patched to
 		#	seek in archives), noise, oidn, openxr, spirv-reflect, thorvg,
-		#	tinyexr, vhacd, vulkan (minus include/) and the misc directory.
+		#	tinyexr, vhacd, vulkan, and the misc directory.
 
 		# modules with optional dependencies, "possible" to disable more but
 		# gets messy and breaks all sorts of features (expected enabled)
-		module_glslang_enabled=$(usex gui)
 		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
 		module_mono_enabled=no # unhandled
 		# note raycast is only enabled on amd64+arm64, see raycast/config.py