From 7e149b5feeef9e7db5b3afebc0238a05f244869c Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Thu, 2 Feb 2023 11:21:42 -0500 Subject: dev-games/godot: add 4.0_beta17 Signed-off-by: Ionen Wolkens --- dev-games/godot/Manifest | 1 + .../files/godot-4.0_beta17-no-deprecated-fix.patch | 51 +++++ dev-games/godot/godot-4.0_beta17.ebuild | 241 +++++++++++++++++++++ 3 files changed, 293 insertions(+) create mode 100644 dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch create mode 100644 dev-games/godot/godot-4.0_beta17.ebuild (limited to 'dev-games') diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest index 06dd3e2f3ce4..7b19a1782cc3 100644 --- a/dev-games/godot/Manifest +++ b/dev-games/godot/Manifest @@ -1,2 +1,3 @@ DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f DIST godot-4.0-beta16.tar.xz 31937624 BLAKE2B 998edcd6d9f118cb96a4f84b81b73c36d060d297702fa2a9dc4be936c7ca9aa35b77db16caf5ed19662fcae700f59e329393a17fd88448d8a6ff8f484a136f9c SHA512 c9cf5b66675dfe9253852eee7748a5c2bd04f356524def6e9925bef73baee3239f9f9405a92d373dcadbaff7c3288e54e547ae3cb46974bea61bfb68576b7c13 +DIST godot-4.0-beta17.tar.xz 31965968 BLAKE2B 897153aa9b36ccb7aea29749534e7a04452cd24ef5e8404063a1f96c6b61633d3f175279f08e49bbc6479a9df0f0ffe7cf4030d483502af7a90cc5cdd24f4010 SHA512 1a0a74a3538947cc3942fdbc27e941e8fe1b4424b257444176ea19fb6db3cc6c374f24190d1779a530cb61b5e42ff242842692d0878280862c5644e9de93d5c9 diff --git a/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch b/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch new file mode 100644 index 000000000000..8c4a14edc4bb --- /dev/null +++ b/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch @@ -0,0 +1,51 @@ +Backport to fix build with USE=-deprecated + +https://github.com/godotengine/godot/commit/c197b398c38727c6cce3d2fec7aa07d2e1020e09 +From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= +Date: Wed, 1 Feb 2023 22:29:33 +0100 +Subject: [PATCH] Fix build with `deprecated=no` not exclude + ProjectConverter3To4 options + +Fixes #72520. +--- a/main/main.cpp ++++ b/main/main.cpp +@@ -2366,8 +2366,10 @@ bool Main::start() { + String _export_preset; + bool export_debug = false; + bool export_pack_only = false; ++#ifndef DISABLE_DEPRECATED + bool converting_project = false; + bool validating_converting_project = false; ++#endif // DISABLE_DEPRECATED + #endif + + main_timer_sync.init(OS::get_singleton()->get_ticks_usec()); +@@ -2383,10 +2385,12 @@ bool Main::start() { + #ifdef TOOLS_ENABLED + } else if (args[i] == "--no-docbase") { + doc_base = false; ++#ifndef DISABLE_DEPRECATED + } else if (args[i] == "--convert-3to4") { + converting_project = true; + } else if (args[i] == "--validate-conversion-3to4") { + validating_converting_project = true; ++#endif // DISABLE_DEPRECATED + } else if (args[i] == "-e" || args[i] == "--editor") { + editor = true; + } else if (args[i] == "-p" || args[i] == "--project-manager") { +@@ -2547,6 +2551,7 @@ bool Main::start() { + return false; + } + ++#ifndef DISABLE_DEPRECATED + if (converting_project) { + int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert(); + OS::get_singleton()->set_exit_code(exit_code); +@@ -2557,6 +2562,7 @@ bool Main::start() { + OS::get_singleton()->set_exit_code(exit_code); + return false; + } ++#endif // DISABLE_DEPRECATED + + #endif + diff --git a/dev-games/godot/godot-4.0_beta17.ebuild b/dev-games/godot/godot-4.0_beta17.ebuild new file mode 100644 index 000000000000..712797804adc --- /dev/null +++ b/dev-games/godot/godot-4.0_beta17.ebuild @@ -0,0 +1,241 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit bash-completion-r1 desktop optfeature python-any-r1 +inherit scons-utils toolchain-funcs xdg + +MY_P="${PN}-$(ver_rs 2 -)" + +DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor" +HOMEPAGE="https://godotengine.org/" +SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE=" + MIT + AFL-2.1 Apache-2.0 BSD Boost-1.0 CC0-1.0 LGPL-2.1+ 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="debug deprecated +gui raycast +runner test +theora +tools +upnp +vulkan +webp" +# disable tests until out of beta, tests themselves are new and can be volatile +RESTRICT="test" + +# dlopen: libX*,libglvnd +RDEPEND=" + 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 +