diff options
Diffstat (limited to 'dev-games/godot')
| -rw-r--r-- | dev-games/godot/Manifest | 14 | ||||
| -rw-r--r-- | dev-games/godot/files/godot-3.5-musl.patch | 9 | ||||
| -rw-r--r-- | dev-games/godot/files/godot-3.5-scons.patch | 74 | ||||
| -rw-r--r-- | dev-games/godot/files/godot-3.5.3-gcc13.patch | 9 | ||||
| -rw-r--r-- | dev-games/godot/files/godot-4.0_rc2-musl.patch | 21 | ||||
| -rw-r--r-- | dev-games/godot/files/godot-4.0_rc3-scons.patch | 15 | ||||
| -rw-r--r-- | dev-games/godot/files/godot-4.3-scons.patch | 15 | ||||
| -rw-r--r-- | dev-games/godot/godot-3.5.3.ebuild | 218 | ||||
| -rw-r--r-- | dev-games/godot/godot-4.3-r1.ebuild (renamed from dev-games/godot/godot-4.2.2.ebuild) | 98 | ||||
| -rw-r--r-- | dev-games/godot/metadata.xml | 3 |
10 files changed, 70 insertions, 406 deletions
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest index dd4df243ddf1..aeff9fa8a785 100644 --- a/dev-games/godot/Manifest +++ b/dev-games/godot/Manifest @@ -1,10 +1,4 @@ -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.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 -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 -EBUILD godot-3.5.3.ebuild 6564 BLAKE2B a2d12f6ffeb748314eadd122537d8b76d835c66e3c2a3776bd2f91c0a98c69b7b47ef8099e9a97f16f6170da29ca1a27c1d01b9837559067e91b6a397e83b28f SHA512 5de17a38a6c16cf8f0b514e223a2a75e54254b612c3c66e9f4512ff612b4bcf5e5448ea2f32a92a6b1a6240023ba5f5f2da5a1581d705f4a7533f3c14482049b -EBUILD godot-4.2.2.ebuild 6970 BLAKE2B 7636bbc9570e98a0e5eea9557b45e1389f3284d622a3705753f3a5b28eb47e7f93294f5f89fb0d7a12e63255332793818112b708003f2f7ffaea0a5fc33138f0 SHA512 930b0327472d38b10b0039d200e9fe20cb05c3b3fb5d86966d83d0d85baf498b1d2001c84472e687418562e0686a6941d0b80cf6e7ea029f90521f7f184aca59 -MISC metadata.xml 1492 BLAKE2B ae5789569351fbb3df1da26f655750404bc22d56d0e252ca83b973abaa9ed29f26afd48c263c29266eb883444c6399ab35939d57e081d4733f7ea8b5a161f737 SHA512 fe692458dbe8293a1b76a1f0f79fe01f86ed61c731eb8b6c5acf0ef24a5d0b4cba94dd1ad72abe287d584883bc08e090f48d2b709ffbf06758c45d8996432973 +AUX godot-4.3-scons.patch 524 BLAKE2B fc62a07a0560a186f2feeb931ea33b4bc5e574a4c08b7de5bfb674365d39fd2592b7e1b392402f28dd110fbe4942295e737b94d4022907eceb9142496f1c2fb6 SHA512 3968cf509462fe26e0c7e5edabb4bc1ba5b51d8353e92679b4c6842a71e003edfaa0b4e7e87fe18af85c8acff834a62c11ecc28ea6b42f6ca6790d18136d6ccf +DIST godot-4.3-stable.tar.xz 29140004 BLAKE2B 0698cf6c8ba853d094c39b461efe998c57a7de0609701e46cca48b17c29eca3da29c8644aa356cff330d1d3ae88048afc2148f5389d57cdfa1dd26784e6d9a44 SHA512 6e1eaba5c3447527ce60d623f7f81cbd90633a5a1ad4c6dd469055a43c8fb9b4807fcd3bae25331294596c2418eb6c0c9db0871c3e1405ddcc7d84e29c39a45b +EBUILD godot-4.3-r1.ebuild 7102 BLAKE2B ec84c7d9543e054109f7e405772f238c389bf6ea193c82c5649f7bfdd03fb4c5e75f535fd06d7d21e408a10f068acaecd17dfdaa857d3a93364436a6df98790d SHA512 b01d54282a2c3dd8bc6005273f8f6b1c903afff2ba3586490b036d90e0c60f0b2a5684e7703f22e77cd35eca757bc7092c19c11de91192ced0f8e09a657dbf26 +MISC metadata.xml 1250 BLAKE2B 3f7e9cb4cd29b2c6a0c46c8d494d16d324fd15ca0eb417d04cf30f7e5015d3224b845683110f57d5592601918c334f0394d7de74f8c1c8524a5123de62b09b8d SHA512 e1b2868193999fad5ec57a41e1af2bd6ee33b5f150ff8b0e6905c8e5af3706bdf0d7bfc813ba1004a293593da62a77b5af474e9d2ee166ac4dc23d0c5edc1228 diff --git a/dev-games/godot/files/godot-3.5-musl.patch b/dev-games/godot/files/godot-3.5-musl.patch deleted file mode 100644 index 0738b035480f..000000000000 --- a/dev-games/godot/files/godot-3.5-musl.patch +++ /dev/null @@ -1,9 +0,0 @@ -crash handler requires glibc or libexecinfo (not packaged), -and is always enabled if build the editor (release_debug) ---- a/platform/x11/crash_handler_x11.cpp -+++ b/platform/x11/crash_handler_x11.cpp -@@ -38,3 +38,3 @@ - --#ifdef DEBUG_ENABLED -+#if defined(DEBUG_ENABLED) && defined(__GLIBC__) - #define CRASH_HANDLER_ENABLED 1 diff --git a/dev-games/godot/files/godot-3.5-scons.patch b/dev-games/godot/files/godot-3.5-scons.patch deleted file mode 100644 index b8ed7f50311d..000000000000 --- a/dev-games/godot/files/godot-3.5-scons.patch +++ /dev/null @@ -1,74 +0,0 @@ -* add option to respect AR - (respecting PKG_CONFIG is handled in the ebuild) -* handle recastnavigation unbundling -* remove unnecessary opusfile -* remove unnecessary -no-pie -* remove -pipe from LDFLAGS, may "possibly" be relevant to: - https://bugs.gentoo.org/861689 - https://github.com/godotengine/godot/commit/f035e784 ---- a/SConstruct -+++ b/SConstruct -@@ -192,4 +192,5 @@ - opts.Add("CXX", "C++ compiler") - opts.Add("CC", "C compiler") -+opts.Add("AR", "Archiver") - opts.Add("LINK", "Linker") - opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") ---- a/platform/server/detect.py -+++ b/platform/server/detect.py -@@ -135,5 +135,4 @@ - - env.Append(CCFLAGS=["-pipe"]) -- env.Append(LINKFLAGS=["-pipe"]) - - ## Dependencies -@@ -178,4 +177,7 @@ - env.ParseConfig("pkg-config libenet --cflags --libs") - -+ if not env["builtin_recast"]: -+ env.ParseConfig("pkg-config recastnavigation --cflags --libs") -+ - if not env["builtin_squish"]: - env.ParseConfig("pkg-config libsquish --cflags --libs") -@@ -205,5 +207,5 @@ - if not env["builtin_opus"]: - env["builtin_libogg"] = False # Needed to link against system opus -- env.ParseConfig("pkg-config opus opusfile --cflags --libs") -+ env.ParseConfig("pkg-config opus --cflags --libs") - - if not env["builtin_libogg"]: ---- a/platform/x11/detect.py -+++ b/platform/x11/detect.py -@@ -232,17 +232,5 @@ - - env.Append(CCFLAGS=["-pipe"]) -- env.Append(LINKFLAGS=["-pipe"]) - -- # Check for gcc version >= 6 before adding -no-pie -- version = get_compiler_version(env) or [-1, -1] -- if using_gcc(env): -- if version[0] >= 6: -- env.Append(CCFLAGS=["-fpie"]) -- env.Append(LINKFLAGS=["-no-pie"]) -- # Do the same for clang should be fine with Clang 4 and higher -- if using_clang(env): -- if version[0] >= 4: -- env.Append(CCFLAGS=["-fpie"]) -- env.Append(LINKFLAGS=["-no-pie"]) - - ## Dependencies -@@ -298,4 +286,7 @@ - env.ParseConfig("pkg-config libenet --cflags --libs") - -+ if not env["builtin_recast"]: -+ env.ParseConfig("pkg-config recastnavigation --cflags --libs") -+ - if not env["builtin_squish"]: - env.ParseConfig("pkg-config libsquish --cflags --libs") -@@ -325,5 +316,5 @@ - if not env["builtin_opus"]: - env["builtin_libogg"] = False # Needed to link against system opus -- env.ParseConfig("pkg-config opus opusfile --cflags --libs") -+ env.ParseConfig("pkg-config opus --cflags --libs") - - if not env["builtin_libogg"]: diff --git a/dev-games/godot/files/godot-3.5.3-gcc13.patch b/dev-games/godot/files/godot-3.5.3-gcc13.patch deleted file mode 100644 index dd681b87dce5..000000000000 --- a/dev-games/godot/files/godot-3.5.3-gcc13.patch +++ /dev/null @@ -1,9 +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> diff --git a/dev-games/godot/files/godot-4.0_rc2-musl.patch b/dev-games/godot/files/godot-4.0_rc2-musl.patch deleted file mode 100644 index 3b9a458ac7d4..000000000000 --- a/dev-games/godot/files/godot-4.0_rc2-musl.patch +++ /dev/null @@ -1,21 +0,0 @@ -Crash handler requires glibc or libexecinfo (not packaged) and is enabled -if build the editor (implies debug), but can be easily turned off. -https://bugs.gentoo.org/894762 ---- a/platform/linuxbsd/crash_handler_linuxbsd.cpp -+++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp -@@ -38,3 +38,3 @@ - --#ifdef DEBUG_ENABLED -+#if defined(DEBUG_ENABLED) && defined(__GLIBC__) - #define CRASH_HANDLER_ENABLED 1 ---- a/platform/linuxbsd/detect.py -+++ b/platform/linuxbsd/detect.py -@@ -329,8 +329,2 @@ - -- if not env["execinfo"] and platform.libc_ver()[0] != "glibc": -- # The default crash handler depends on glibc, so if the host uses -- # a different libc (BSD libc, musl), fall back to libexecinfo. -- print("Note: Using `execinfo=yes` for the crash handler as required on platforms where glibc is missing.") -- env["execinfo"] = True -- - if env["execinfo"]: diff --git a/dev-games/godot/files/godot-4.0_rc3-scons.patch b/dev-games/godot/files/godot-4.0_rc3-scons.patch deleted file mode 100644 index 682e1510ac94..000000000000 --- a/dev-games/godot/files/godot-4.0_rc3-scons.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -241,2 +241,3 @@ - opts.Add("CC", "C compiler") -+opts.Add("AR", "Archiver") - opts.Add("LINK", "Linker") -@@ -569,8 +570,2 @@ - env.Append(CCFLAGS=["-g2"]) -- 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/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-3.5.3.ebuild b/dev-games/godot/godot-3.5.3.ebuild deleted file mode 100644 index c4e78535e32d..000000000000 --- a/dev-games/godot/godot-3.5.3.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit desktop python-any-r1 scons-utils 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? ( BitstreamVera OFL-1.1 ) -" -SLOT="3" -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 -" - -# dlopen: alsa-lib,pulseaudio,udev -RDEPEND=" - app-arch/zstd:= - dev-games/recastnavigation:= - dev-libs/libpcre2:=[pcre32] - media-libs/alsa-lib - media-libs/freetype[brotli] - media-libs/libpng:= - <net-libs/mbedtls-3:= - net-libs/wslay - sys-libs/zlib:= - bullet? ( sci-physics/bullet:= ) - 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 - tools? ( raycast? ( media-libs/embree:3 ) ) - ) - pulseaudio? ( media-libs/libpulse ) - theora? ( - media-libs/libogg - media-libs/libtheora - media-libs/libvorbis - ) - 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:= ) -" -DEPEND=" - ${RDEPEND} - gui? ( x11-base/xorg-proto ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-musl.patch - "${FILESDIR}"/${PN}-3.5-scons.patch - "${FILESDIR}"/${PN}-3.5.3-gcc13.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/{x11,server}/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 - # certs: unused by generated header, but scons panics if not found - ) - rm -r "${unbundle[@]/#/thirdparty/}" || die -} - -src_compile() { - local -x BUILD_NAME=gentoo # replaces "custom_build" in version string - - local esconsargs=( - AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - - platform=$(usex gui x11 server) - progress=no - verbose=yes - - deprecated=$(usex deprecated) - #execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged - minizip=yes # uses a modified bundled copy - pulseaudio=$(usex pulseaudio) - udev=$(usex udev) - - 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) - 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_libpng=no - builtin_libtheora=$(usex !theora) - builtin_libvorbis=$(usex !theora $(usex !webm)) - builtin_libvpx=$(usex !webm) - builtin_libwebp=$(usex !webp) - builtin_mbedtls=no - builtin_miniupnpc=$(usex !upnp) - builtin_opus=$(usex !webm) - builtin_pcre2=no - builtin_recast=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_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 - 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 - 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[@]}" - 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) - ) - - escons extra_suffix=main "${esconsargs[@]}" -} - -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} -} diff --git a/dev-games/godot/godot-4.2.2.ebuild b/dev-games/godot/godot-4.3-r1.ebuild index bda89ed4d705..0bf48fbd9cbf 100644 --- a/dev-games/godot/godot-4.2.2.ebuild +++ b/dev-games/godot/godot-4.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit desktop python-any-r1 flag-o-matic scons-utils inherit shell-completion toolchain-funcs xdg @@ -20,17 +20,23 @@ LICENSE=" Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 ) " -SLOT="4" +SLOT="0" 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 +webp + 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:= @@ -59,15 +65,18 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon - tools? ( raycast? ( media-libs/embree:3 ) ) - vulkan? ( media-libs/vulkan-loader[X] ) + 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 ) - upnp? ( net-libs/miniupnpc:= ) + wayland? ( + dev-libs/wayland + gui-libs/libdecor + ) webp? ( media-libs/libwebp:= ) " DEPEND=" @@ -75,32 +84,27 @@ DEPEND=" gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) ) " -BDEPEND="virtual/pkgconfig" +BDEPEND=" + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" PATCHES=( - "${FILESDIR}"/${PN}-4.0_rc2-musl.patch - "${FILESDIR}"/${PN}-4.0_rc3-scons.patch + "${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 - miniupnpc pcre2 recastnavigation volk wslay zlib zstd + 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 @@ -123,6 +127,7 @@ src_compile() { 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) @@ -130,6 +135,9 @@ src_compile() { 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 @@ -153,7 +161,7 @@ src_compile() { builtin_libvorbis=no builtin_libwebp=$(usex !webp) builtin_mbedtls=no - builtin_miniupnpc=$(usex !upnp) + 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 @@ -182,12 +190,6 @@ src_compile() { 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) @@ -196,43 +198,45 @@ src_compile() { tests=$(usex tools $(usex test)) ) - escons extra_suffix=main "${esconsargs[@]}" + escons "${esconsargs[@]}" } src_test() { xdg_environment_reset - bin/godot*.main --headless --test || die + + bin/godot* --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 + # suffix varies depending on arch/features, use wildcard to simplify + newbin bin/godot* godot - newman misc/dist/linux/godot.6 ${s}.6 + doman misc/dist/linux/godot.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 + newicon icon.svg godot.svg + domenu misc/dist/linux/org.godotengine.Godot.desktop insinto /usr/share/metainfo - newins misc/dist/linux/org.godotengine.Godot.appdata.xml \ - org.godotengine.${s^}.appdata.xml + doins misc/dist/linux/org.godotengine.Godot.appdata.xml insinto /usr/share/mime/application - newins misc/dist/linux/org.godotengine.Godot.xml \ - org.godotengine.${s^}.xml + doins misc/dist/linux/org.godotengine.Godot.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} + newbashcomp misc/dist/shell/godot.bash-completion godot + newfishcomp misc/dist/shell/godot.fish godot.fish + newzshcomp misc/dist/shell/_godot.zsh-completion _godot +} + +pkg_postinst() { + xdg_pkg_postinst + + if has_version dev-games/godot:3 || has_version dev-games/godot:4; then + elog + elog "Gentoo's godot ebuild has removed slotting support meaning that godot" + elog "is now invoked with 'godot' rather than 'godot4', and godot3 has been" + elog "removed. USE=runner and 'godot*-runner' were also removed." + fi } diff --git a/dev-games/godot/metadata.xml b/dev-games/godot/metadata.xml index 71f596fee4e9..b1acc9b2ce0d 100644 --- a/dev-games/godot/metadata.xml +++ b/dev-games/godot/metadata.xml @@ -20,12 +20,9 @@ and consoles. </longdescription> <use> - <flag name="bullet">Enable the <pkg>sci-physics/bullet</pkg> module</flag> <flag name="deprecated">Enable support for deprecated features</flag> <flag name="raycast">Enable the raycast Editor module using <pkg>media-libs/embree</pkg></flag> - <flag name="runner">Build an additional binary optimized for running games (only relevant with USE=tools)</flag> <flag name="tools">Enable the Godot Editor for game development</flag> - <flag name="webm">Enable the WebM module</flag> </use> <upstream> <doc>https://docs.godotengine.org/</doc> |