gentoo auto-resync : 16:08:2024 - 12:22:56

3 files changed, 272 insertions, 0 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 613d4b8058d2..36b2922c205e 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -3,8 +3,11 @@ AUX godot-3.5-scons.patch 2568 BLAKE2B 0da3a29689293a0d9681eaa2877c667fbe484e7d4
 AUX godot-3.5.3-gcc13.patch 238 BLAKE2B 1bf7e8e695f2bd6764a47e10318b7f8b0046a461623fa9ff868d4affb87f6208f5c144f87d6ccc5eaf0716804d907a6fa6f50f7a764f3607d05183f614474acf SHA512 2308a382af8fe31f8e23ce6c0d6de6d4f3f2e6b1f33b960d77a1a0a0880f2eda7d2f12744a3ac13e2bb0637266668de4c6fc994fa0760103a9d4f89d244228a5
 AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9781d81897b1b24a79de792fb967886fa7be6494440fb4e8ab69a83100d455838b986ce195dc30116638db544e SHA512 97b365952a7c1e7e4088ed71d1c98eccca1449b481d05e10fd750a6d29c7635dc6112e0e033ab1555cfe51eda8c0b805df1fbe78e9c54cea2664aed8570fa077
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
+AUX godot-4.3-scons.patch 524 BLAKE2B fc62a07a0560a186f2feeb931ea33b4bc5e574a4c08b7de5bfb674365d39fd2592b7e1b392402f28dd110fbe4942295e737b94d4022907eceb9142496f1c2fb6 SHA512 3968cf509462fe26e0c7e5edabb4bc1ba5b51d8353e92679b4c6842a71e003edfaa0b4e7e87fe18af85c8acff834a62c11ecc28ea6b42f6ca6790d18136d6ccf
 DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
 DIST godot-4.2.2-stable.tar.xz 26768552 BLAKE2B e4a6040d7a1f63f841f56d74bb7b04e58f2fa26ddd8850df7f93937deb10c4af925ea2059c174d9f457222e0cddfe477498e3462bfaaf69ec8e57de8f2d43c83 SHA512 4a623063be5488957e1ede7e45b6865f6cd61bc954ac311587b9e97bed848a4083c4a7225d0a81bca285d854d33be9b07d7d0c21465c9f25b90e92b08090429c
+DIST godot-4.3-stable.tar.xz 29140004 BLAKE2B 0698cf6c8ba853d094c39b461efe998c57a7de0609701e46cca48b17c29eca3da29c8644aa356cff330d1d3ae88048afc2148f5389d57cdfa1dd26784e6d9a44 SHA512 6e1eaba5c3447527ce60d623f7f81cbd90633a5a1ad4c6dd469055a43c8fb9b4807fcd3bae25331294596c2418eb6c0c9db0871c3e1405ddcc7d84e29c39a45b
 EBUILD godot-3.5.3-r1.ebuild 6614 BLAKE2B 4fc3a695c62c1b4baf0295499b9bcc15373521810e5619e057a63154faacce5473d00d4446d6a7a75b2afb5608c19e7eb654df2bf4b0cf3410184e5632bf2c51 SHA512 bad47cd4c49bd7c10efbc461ed0d8ea3ccd473dee97f0fec6dac20118f37b90c3171d77e837726492b03d8098125daf0c2b910e6ece914c91577c96f1dff96f1
 EBUILD godot-4.2.2-r1.ebuild 7008 BLAKE2B 249385e33643809f6d3021454f353aef250c343be7f6814357d7efb7204a4f45d845718d98c5fb5fc2ef889ab76c88c8ed5d26b383f92cf43f6b3102f03003be SHA512 769fb7d2145a0293f707e698886de146a2d68a6d0519732e1000607070f7b482181b907175f0368d5e7a0b8e97188e4de6414d3e4efdc037c9f1b6b31302d795
+EBUILD godot-4.3.ebuild 7663 BLAKE2B db7af4851c4441a8390db593752006fdd2f6a958d5449eea11dff56a028b0884c9f490ce3eda4913a4366f5aaf70b7ec0f2c96d91f87dfabf33783ee97352567 SHA512 6ea56cb04ef008489a580bc8b44e394f5600556a0854305bb247d5690459441484ab1fb89c763152ecab9cb585d8485bb5590559daa3bb1c616e03fd6f3c53e4
 MISC metadata.xml 1492 BLAKE2B ae5789569351fbb3df1da26f655750404bc22d56d0e252ca83b973abaa9ed29f26afd48c263c29266eb883444c6399ab35939d57e081d4733f7ea8b5a161f737 SHA512 fe692458dbe8293a1b76a1f0f79fe01f86ed61c731eb8b6c5acf0ef24a5d0b4cba94dd1ad72abe287d584883bc08e090f48d2b709ffbf06758c45d8996432973
diff --git a/dev-games/godot/files/godot-4.3-scons.patch b/dev-games/godot/files/godot-4.3-scons.patch
new file mode 100644
index 000000000000..2451b7cf8a5f
--- /dev/null
+++ b/dev-games/godot/files/godot-4.3-scons.patch
@@ -0,0 +1,15 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -297,2 +297,3 @@
+ opts.Add("CC", "C compiler binary")
++opts.Add("AR", "Archiver")
+ opts.Add("LINK", "Linker binary")
+@@ -731,8 +732,2 @@
+             env.Append(CCFLAGS=[f"-ffile-prefix-map={project_path}=."])
+-    else:
+-        if methods.using_clang(env) and not methods.is_vanilla_clang(env):
+-            # Apple Clang, its linker doesn't like -s.
+-            env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
+-        else:
+-            env.Append(LINKFLAGS=["-s"])
+ 
diff --git a/dev-games/godot/godot-4.3.ebuild b/dev-games/godot/godot-4.3.ebuild
new file mode 100644
index 000000000000..73a8bda01e8f
--- /dev/null
+++ b/dev-games/godot/godot-4.3.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit desktop python-any-r1 flag-o-matic scons-utils
+inherit shell-completion 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
+"
+S=${WORKDIR}/${P}-stable
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	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="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +vulkan wayland +webp
+"
+REQUIRED_USE="wayland? ( gui )"
+# TODO: tests still need more figuring out
+RESTRICT="test"
+
+# mbedtls: "can" use >=mbedtls-3 but the module needs updates handle
+# the new tls1.3 default among other things, and the bundled 3.x copy
+# builds it #undef MBEDTLS_SSL_PROTO_TLS1_3 + a patch or else will get
+# "ERROR: TLS handshake error: -27648" with system's on startup
+# https://github.com/godotengine/godot/commit/40fa684c181d
+# dlopen: libglvnd
+RDEPEND="
+	app-arch/brotli:=
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	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:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:4 ) )
+		vulkan? ( media-libs/vulkan-loader[X,wayland?] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	wayland? (
+		dev-libs/wayland
+		gui-libs/libdecor
+	)
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )
+"
+BDEPEND="
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3-scons.patch
+)
+
+src_prepare() {
+	default
+
+	# handle slotting
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+	sed -e "s/godot/&${SLOT}/g" \
+		-i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || 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=(
+		brotli doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+		# miniupnpc: check if can re-add on bump, bug #934044
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	filter-lto #921017
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		execinfo=no # not packaged, disables crash handler if non-glibc
+		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))
+		wayland=$(usex wayland)
+		# TODO: retry to add optional USE=X, wayland support is new
+		# and gui build is not well wired to handle USE="-X wayland" yet
+		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 many ignore whether the dep
+		# is actually used, so "enable" deleted builtins on disabled deps
+		builtin_brotli=no
+		builtin_certs=no
+		builtin_clipper2=yes # not packaged
+		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=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=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=yes #934044 (for now, should revisit)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_openxr=yes # not packaged
+		builtin_pcre2=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
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# 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_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these
+		debug_symbols=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=template_release "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		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}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	newfishcomp misc/dist/shell/godot.fish ${s}.fish
+	newzshcomp misc/dist/shell/_godot.zsh-completion _${s}
+}