public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/files/, dev-games/godot/
Date: Sat, 27 Apr 2024 12:11:40 +0000 (UTC)	[thread overview]
Message-ID: <1714219834.a6430ced5a7bcf96474039dd0573701fdbc68501.ionen@gentoo> (raw)

commit:     a6430ced5a7bcf96474039dd0573701fdbc68501
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 11:41:50 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 12:10:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6430ced

dev-games/godot: drop 4.2.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-games/godot/Manifest                           |   1 -
 .../files/godot-4.0_beta3-headless-header.patch    |  14 --
 dev-games/godot/godot-4.2.1.ebuild                 | 239 ---------------------
 3 files changed, 254 deletions(-)

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index a3f5c91f6293..d3e0adfca766 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,3 +1,2 @@
 DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
-DIST godot-4.2.1-stable.tar.xz 26687808 BLAKE2B 0f7d06b27e2e9174dad04d1926935a46c05d39349e73a0ed146815c21f1100be04cd772c2d6b16d96f70dbfe9a5727126b4dc782c3654c36282f39ca4df87f4d SHA512 ac09046532f5cf504bd57c867ac8fcb40b30848152cd6a95ee2a2d2c7e9cce027fdfceb66fcf1146e562cbca853a484da861c45c2a5fc0a63021d309bdf04590
 DIST godot-4.2.2-stable.tar.xz 26768552 BLAKE2B e4a6040d7a1f63f841f56d74bb7b04e58f2fa26ddd8850df7f93937deb10c4af925ea2059c174d9f457222e0cddfe477498e3462bfaaf69ec8e57de8f2d43c83 SHA512 4a623063be5488957e1ede7e45b6865f6cd61bc954ac311587b9e97bed848a4083c4a7225d0a81bca285d854d33be9b07d7d0c21465c9f25b90e92b08090429c

diff --git a/dev-games/godot/files/godot-4.0_beta3-headless-header.patch b/dev-games/godot/files/godot-4.0_beta3-headless-header.patch
deleted file mode 100644
index 32475296d40a..000000000000
--- a/dev-games/godot/files/godot-4.0_beta3-headless-header.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Missing header for headless builds (quickfix, may not make much
-sense to probe renderer on headless).
-
-os_linuxbsd.cpp:249:46: error: 'RenderingServer' has not been declared
-
-Caused by: https://github.com/godotengine/godot/commit/de768afbdcf
---- a/platform/linuxbsd/os_linuxbsd.cpp
-+++ b/platform/linuxbsd/os_linuxbsd.cpp
-@@ -34,4 +34,5 @@
- #include "main/main.h"
- #include "servers/display_server.h"
-+#include "servers/rendering_server.h"
- 
- #include "modules/modules_enabled.gen.h" // For regex.

diff --git a/dev-games/godot/godot-4.2.1.ebuild b/dev-games/godot/godot-4.2.1.ebuild
deleted file mode 100644
index e3e0408382ba..000000000000
--- a/dev-games/godot/godot-4.2.1.ebuild
+++ /dev/null
@@ -1,239 +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 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 +webp
-"
-# TODO: tests still need more figuring out
-RESTRICT="test"
-
-# 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:3 ) )
-		vulkan? ( media-libs/vulkan-loader[X] )
-	)
-	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:= )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
-	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
-	"${FILESDIR}"/${PN}-4.0_rc3-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
-		# 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() {
-	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)
-		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 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=$(usex !upnp)
-		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}
-}


             reply	other threads:[~2024-04-27 12:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-27 12:11 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-16  4:23 [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/files/, dev-games/godot/ Ionen Wolkens
2023-09-25  9:36 Ionen Wolkens
2023-02-22  8:45 Ionen Wolkens
2023-02-17  1:43 Ionen Wolkens
2023-02-13 11:46 Ionen Wolkens
2023-02-02 17:26 Ionen Wolkens
2022-12-19  7:23 Ionen Wolkens
2022-12-10  9:39 Ionen Wolkens
2022-10-15  6:02 Ionen Wolkens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1714219834.a6430ced5a7bcf96474039dd0573701fdbc68501.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox