gentoo auto-resync : 04:10:2023 - 17:51:59

3 files changed, 78 insertions, 72 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index ff4c70719610..06133b48db3e 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,16 +1,15 @@
 AUX godot-3.5-musl.patch 325 BLAKE2B 6069b159c7844d471ecf79d080cb4b3d5b21cf82093379961e163efe52866e1d25ca8075ee1ba653aabcaf912592968dca6fba43cb4907d703711af237bacf50 SHA512 828e5870fdec8cd4c4f132db24de722f73f330dc278b21020cf38aaf26498c69723e1fc75855dd01683452c3628a782a3957ff47d5ecf2e13da1bd8aee3a5805
 AUX godot-3.5-scons.patch 2568 BLAKE2B 0da3a29689293a0d9681eaa2877c667fbe484e7d479eb7525f3621640f397dc77bd000780a142418a74e671b6f5b241e27898f5cac71376eb684d3e995a9ac33 SHA512 d7f230da26ebcc40ad0c8c59046a863aeca69c314661ccbcab86c49f545df9662c68bc51d72a146033385ed09812ce2de92aae58a32462402f89542a47069202
-AUX godot-3.5.2-gcc13.patch 433 BLAKE2B f9a5e7e700084910ff7c5e5d3d778a6b9f4358e084ae198499626378c99ad6a4cc97941455bba3f1fa74cd80ed570fd855e1665af1260ad861b5ea9b735829c7 SHA512 ade16845dc997850a790ac30f7076f9ffb37a9b586ebc0be3adafc49dd9eace846b56730ee09ff4e7e016ceae345d6b2caa1bb1c55c1cbde680e346dc63b7639
 AUX godot-3.5.3-gcc13.patch 238 BLAKE2B 1bf7e8e695f2bd6764a47e10318b7f8b0046a461623fa9ff868d4affb87f6208f5c144f87d6ccc5eaf0716804d907a6fa6f50f7a764f3607d05183f614474acf SHA512 2308a382af8fe31f8e23ce6c0d6de6d4f3f2e6b1f33b960d77a1a0a0880f2eda7d2f12744a3ac13e2bb0637266668de4c6fc994fa0760103a9d4f89d244228a5
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9781d81897b1b24a79de792fb967886fa7be6494440fb4e8ab69a83100d455838b986ce195dc30116638db544e SHA512 97b365952a7c1e7e4088ed71d1c98eccca1449b481d05e10fd750a6d29c7635dc6112e0e033ab1555cfe51eda8c0b805df1fbe78e9c54cea2664aed8570fa077
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
-DIST godot-3.5.2-stable.tar.xz 24047432 BLAKE2B a4d600cb174b2f79cc91c583b1052db2e7e2921003ffd5a307a2484af9cc050b600e763b6016ba2df043ba5e492f0bdd13c207fd3a3d794b6602f7c574093cb0 SHA512 e9f3c8b23cd69422639fe22948fb1f5f2071dff6e013fee3c08d6d3c1f39de4dfc252d32eb395c847021c9bbc1b2fa320500140ff3e684bf00530889ba48a181
 DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
 DIST godot-4.0.4-stable.tar.xz 30267060 BLAKE2B 42f5f0c89edb96eb6f36c54229671f233ed0a49a769361195f9aaf807b45fe3968aeeaad204fc07e200114d852e4651f9dc8eb137c4f3aca7b8e8e1203ebcdc9 SHA512 4dadc123995d7262ffa6c5002d08611038957c59a8bd742284b9b62577de6b7182aad807db7a231180a355df0f25d10babdc914faf9287ed401152d98762bb5f
 DIST godot-4.1.1-stable.tar.xz 30681136 BLAKE2B 18e6dae0428812493ecdd8d76cc99c2264873707d4abac0146a1d9b9cbffe2f678c346951a714d0d211fd380b433f910cc952e1720a2c4933febeb7d64283369 SHA512 9fc4bdff2ef3f5ad173514709591941f1dff32dd7cc54224a85691b34b6a5f1d01addc9b4f8d996bc6f774cee5c722181122a39b498b23e48e8d70629ff8ff0b
-EBUILD godot-3.5.2.ebuild 6661 BLAKE2B efa30faa7c394c5971a62f6ce072c276585e7b4ce3399767c4143cbd444f7a98746a01332532d15dbe47bbc054c38901e46bbe56033c2fe4e815206c7094901f SHA512 ec2c9e02cf77a139d1ee27eec23e36e5eceb64e5513866131a08a9e6c37c31f722bc0a2b6c363ab36626ebb711d3ea6eb433e08c06cb8f24f31e891bea7d51de
+DIST godot-4.1.2-stable.tar.xz 31020196 BLAKE2B fbdc4470a4db78a810dcbd7700c46dd03a9d9802c08cbad68dd3aedbc00678f7285837f34642ac833c000164f4a98559cb82bcb615ca353cf319e771d55cdc6a SHA512 d9e3c948aeece3586632ed2a8c94ca2107a6b5b4bb1ae8dc264e350fbfcb4cc1f4cd4cf7fdcd61a5b0351511c12e34d83275a79d5e0361e2eee67c8447b5f831
 EBUILD godot-3.5.3.ebuild 6667 BLAKE2B 9a6c6642b12bab97d0c91f9b65b48505532c5d713eb2c13ddbb3c074d6d62ff6913eddb34c6394c57a5db3870661158631cc40b870c3e6a345e490340c8b32b3 SHA512 9085bec5650281edbf46e2ea8ce3242bb40c7e8760f093c709fb21c8454caac54896ebdcea42d0d59e9069e681f8722f3c2029373617f501fff2df8cecbccd27
 EBUILD godot-4.0.4.ebuild 6983 BLAKE2B d089b3cd44737743c572ddd4496064c635f2934e367fbf834bb3527c852061cbaec8283405a7ccad7f59a6bf210fb5a44727c114b228056f98f0f2a819f7e889 SHA512 0aa73012f7b271939e5055f21db46d3d613c5b6eddde7f428418c0ffc0cc7a53aa7038fb417f4ff826dd1ab68e1f6baeea6293148f0a945a41987d01a44ead1e
 EBUILD godot-4.1.1.ebuild 7033 BLAKE2B 5ff93d7024d6404470339708928c7012a4ab843a4e535ddc033e5f05bde3934120f0fa4e174c480e8681a4a6a640fd2a7b37c35455d3a9c65164b718422d2661 SHA512 1b5a0bd0bd24bbbe7b5d77d489217fde719c94a452f113f079a9c575b81cfc62a3220675b6a310bb75e2d5f40e556a1f444fd7b70e2c13ebf03c367091891a8a
+EBUILD godot-4.1.2.ebuild 7075 BLAKE2B cfb19fc3bad4deee505de14044034a7a9e68832f1d773ade24ccfbf63d62fbf969d894b40d06b305b6cae728797a1bbcd3150f0e9149068a466b4833770c8d2d SHA512 f8dbcfde3ee9db5bc0ad971938d8f4a5d3c3627a3cd120b02969ea15aee5aae8611d89f931ae2edd4eb8f1ea970d5171ece5f51d57bf54a75da30b3fec155097
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/files/godot-3.5.2-gcc13.patch b/dev-games/godot/files/godot-3.5.2-gcc13.patch
deleted file mode 100644
index 789c78415bcd..000000000000
--- a/dev-games/godot/files/godot-3.5.2-gcc13.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Issues seem(?) to only trigger when gcc13 is combined with musl.
-
-https://bugs.gentoo.org/906363
---- a/modules/fbx/fbx_parser/FBXCommon.h
-+++ b/modules/fbx/fbx_parser/FBXCommon.h
-@@ -78,2 +78,3 @@
- 
-+#include <cstdint>
- #include <string>
---- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
-+++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
-@@ -17,2 +17,3 @@
- #define VHACD_MANIFOLD_MESH_H
-+#include <cstdint>
- #include "vhacdCircularList.h"
diff --git a/dev-games/godot/godot-3.5.2.ebuild b/dev-games/godot/godot-4.1.2.ebuild
index 445f05a3f238..91c42a256140 100644
--- a/dev-games/godot/godot-3.5.2.ebuild
+++ b/dev-games/godot/godot-4.1.2.ebuild
@@ -1,42 +1,53 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
 
 DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
 HOMEPAGE="https://godotengine.org/"
 SRC_URI="
 	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz"
+	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
+"
 S="${WORKDIR}/${P}-stable"
 
 LICENSE="
 	MIT
 	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( BitstreamVera OFL-1.1 )"
-SLOT="3"
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+"
+SLOT="4"
 KEYWORDS="~amd64"
 # Enable roughly same as upstream by default so it works as expected,
 # except raycast (tools-only heavy dependency), and deprecated.
 IUSE="
-	+bullet debug deprecated +gui pulseaudio raycast +runner +theora
-	+tools +udev +upnp +webm +webp"
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp
+"
+# TODO: tests still need more figuring out
+RESTRICT="test"
 
-# dlopen: alsa-lib,pulseaudio,udev
+# dlopen: libglvnd
 RDEPEND="
+	app-arch/brotli:=
 	app-arch/zstd:=
 	dev-games/recastnavigation:=
+	dev-libs/icu:=
 	dev-libs/libpcre2:=[pcre32]
-	media-libs/alsa-lib
-	media-libs/freetype[brotli]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
 	media-libs/libpng:=
+	media-libs/libvorbis
 	<net-libs/mbedtls-3:=
 	net-libs/wslay
 	sys-libs/zlib:=
-	bullet? ( sci-physics/bullet:= )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
 	gui? (
 		media-libs/libglvnd
 		x11-libs/libX11
@@ -46,32 +57,29 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXrandr
 		x11-libs/libXrender
+		x11-libs/libxkbcommon
 		tools? ( raycast? ( media-libs/embree:3 ) )
+		vulkan? ( media-libs/vulkan-loader[X] )
 	)
 	pulseaudio? ( media-libs/libpulse )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
 	tools? ( app-misc/ca-certificates )
 	udev? ( virtual/udev )
 	upnp? ( net-libs/miniupnpc:= )
-	webm? (
-		media-libs/libvorbis
-		media-libs/libvpx:=
-		media-libs/opus
-	)
-	webp? ( media-libs/libwebp:= )"
+	webp? ( media-libs/libwebp:= )
+"
 DEPEND="
 	${RDEPEND}
-	gui? ( x11-base/xorg-proto )"
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-musl.patch
-	"${FILESDIR}"/${PN}-3.5-scons.patch
-	"${FILESDIR}"/${PN}-3.5.2-gcc13.patch
+	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
+	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
 )
 
 src_prepare() {
@@ -82,15 +90,18 @@ src_prepare() {
 	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
 		-i misc/dist/linux/org.godotengine.Godot.desktop || die
 
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/{x11,server}/detect.py || die
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
 
 	# use of builtin_ switches can be messy (see below), delete to be sure
 	local unbundle=(
-		bullet embree freetype libogg libpng libtheora libvorbis libvpx
-		libwebp mbedtls miniupnpc opus pcre2 recastnavigation wslay zlib zstd
+		brotli doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
 		# certs: unused by generated header, but scons panics if not found
 	)
 	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
 }
 
 src_compile() {
@@ -99,37 +110,48 @@ src_compile() {
 	local esconsargs=(
 		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 
-		platform=$(usex gui x11 server)
 		progress=no
 		verbose=yes
 
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
 		deprecated=$(usex deprecated)
-		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
-		minizip=yes # uses a modified bundled copy
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
 		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
 		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		x11=$(usex gui)
 
 		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
 
 		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_bullet=$(usex !bullet)
+		# to link with system libraries, but many ignore whether the dep
+		# is actually used, so "enable" deleted builtins on disabled deps
+		builtin_brotli=no
 		builtin_certs=no
 		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_libogg=yes # unused
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
 		builtin_libpng=no
 		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=$(usex !theora $(usex !webm))
-		builtin_libvpx=$(usex !webm)
+		builtin_libvorbis=no
 		builtin_libwebp=$(usex !webp)
 		builtin_mbedtls=no
 		builtin_miniupnpc=$(usex !upnp)
-		builtin_opus=$(usex !webm)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_openxr=yes # not packaged
 		builtin_pcre2=no
-		builtin_recast=no
+		builtin_recastnavigation=no
 		builtin_rvo2=yes # bundled copy has godot-specific changes
 		builtin_squish=yes # ^ likewise, may not be safe to unbundle
 		builtin_wslay=no
@@ -140,42 +162,42 @@ src_compile() {
 
 		# modules with optional dependencies, "possible" to disable more but
 		# gets messy and breaks all sorts of features (expected enabled)
-		module_bullet_enabled=$(usex bullet)
 		module_mono_enabled=no # unhandled
-		module_ogg_enabled=no # unused
-		module_opus_enabled=no # unused, support is gone and webm uses system's
-		# note raycast is disabled on many arches, see raycast/config.py
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
 		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
 		module_theora_enabled=$(usex theora)
 		module_upnp_enabled=$(usex upnp)
-		module_vorbis_enabled=no # unused, non-theora/webm uses stb_vorbis
-		module_webm_enabled=$(usex webm)
 		module_webp_enabled=$(usex webp)
 
 		# let *FLAGS handle these, e.g. can pass -flto as-is
 		debug_symbols=no
-		optimize=none
-		use_lto=no
+		lto=none
+		optimize=custom
 		use_static_cpp=no
 	)
 
 	if use runner && use tools; then
 		# build alternate faster + ~60% smaller binary for running
 		# games or servers without game development debug paths
-		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
+		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
 	fi
 
 	esconsargs+=(
-		# debug: debug for godot itself
-		# release_debug: debug for game development
-		# release: no debugging paths, only available with tools=no
-		target=$(usex debug{,} $(usex tools release_debug release))
-		tools=$(usex tools)
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
 	)
 
 	escons extra_suffix=main "${esconsargs[@]}"
 }
 
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
 src_install() {
 	local s=godot${SLOT}