From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F18D1581FB for ; Thu, 29 Aug 2024 05:16:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C1A8E29E5; Thu, 29 Aug 2024 05:16:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCA98E29E5 for ; Thu, 29 Aug 2024 05:16:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F132F335DEB for ; Thu, 29 Aug 2024 05:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FBF714D0 for ; Thu, 29 Aug 2024 05:16:10 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1724908542.9340b600665afa885f4588818ea6b5dd18402c9f.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/, dev-games/godot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/godot/Manifest dev-games/godot/files/godot-3.5-musl.patch dev-games/godot/files/godot-3.5-scons.patch dev-games/godot/files/godot-3.5.3-gcc13.patch dev-games/godot/files/godot-4.0_rc2-musl.patch dev-games/godot/files/godot-4.0_rc3-scons.patch dev-games/godot/godot-3.5.3-r1.ebuild dev-games/godot/godot-4.2.2-r1.ebuild dev-games/godot/metadata.xml X-VCS-Directories: dev-games/godot/ dev-games/godot/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 9340b600665afa885f4588818ea6b5dd18402c9f X-VCS-Branch: master Date: Thu, 29 Aug 2024 05:16:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3a90cf90-ea0a-4cea-8624-477ec6e02b9a X-Archives-Hash: 207e2f7fec36d90f2201d2b99d69705a commit: 9340b600665afa885f4588818ea6b5dd18402c9f Author: Ionen Wolkens gentoo org> AuthorDate: Thu Aug 29 03:33:15 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Aug 29 05:15:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9340b600 dev-games/godot: drop 3.5.3-r1, 4.2.2-r1 Upon consideration, we'll no longer be slotting godot (bug #938658 was a trigger, but been consider undoing this for a long time either way). Not *essential* to remove these now given they will not conflict with SLOT=0, but would rather cleanup at same time to avoid confusion. As a bonus, it drops consumers of embree:3 wrt bug #938522 and a lot of patches. Considered keeping the 3.x (even unslotted) given it's still supported, but release cycle is slow and it issues with new python/gcc add to the maintenance burden. Been a while since godot4 been released, so hopefully most users migrated. Bug: https://bugs.gentoo.org/938522 Bug: https://bugs.gentoo.org/938658 Signed-off-by: Ionen Wolkens gentoo.org> dev-games/godot/Manifest | 2 - dev-games/godot/files/godot-3.5-musl.patch | 9 - dev-games/godot/files/godot-3.5-scons.patch | 74 -------- dev-games/godot/files/godot-3.5.3-gcc13.patch | 9 - dev-games/godot/files/godot-4.0_rc2-musl.patch | 21 --- dev-games/godot/files/godot-4.0_rc3-scons.patch | 15 -- dev-games/godot/godot-3.5.3-r1.ebuild | 218 ---------------------- dev-games/godot/godot-4.2.2-r1.ebuild | 238 ------------------------ dev-games/godot/metadata.xml | 2 - 9 files changed, 588 deletions(-) diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest index 8d87ae02a38c..5a5473e4a4b7 100644 --- a/dev-games/godot/Manifest +++ b/dev-games/godot/Manifest @@ -1,3 +1 @@ -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 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 - #include 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/godot-3.5.3-r1.ebuild b/dev-games/godot/godot-3.5.3-r1.ebuild deleted file mode 100644 index 9a41621d39b5..000000000000 --- a/dev-games/godot/godot-3.5.3-r1.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:= - - Enable the sci-physics/bullet module Enable support for deprecated features Enable the raycast Editor module using media-libs/embree Build an additional binary optimized for running games (only relevant with USE=tools) Enable the Godot Editor for game development - Enable the WebM module https://docs.godotengine.org/