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/
Date: Wed,  2 Nov 2022 05:38:12 +0000 (UTC)	[thread overview]
Message-ID: <1667367455.eadf9e483802d7a98ad61a60ae054b5cd42f9472.ionen@gentoo> (raw)

commit:     eadf9e483802d7a98ad61a60ae054b5cd42f9472
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 04:59:53 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 05:37:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadf9e48

dev-games/godot: add 4.0_beta4

Also fix optimize usage, was fine in beta2 but in beta3 the
meaning changed and =none isn't 'pass nothing' but rather -O0.
The new optimize=custom is the one we want.

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

 dev-games/godot/Manifest               |   1 +
 dev-games/godot/godot-4.0_beta4.ebuild | 255 +++++++++++++++++++++++++++++++++
 2 files changed, 256 insertions(+)

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index d0338ddf87ab..78fe5b926575 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-beta3.tar.xz 31187404 BLAKE2B 98af9e1394b9d35286ff97ead83bd8fe2287b52b059589d7d35a349a00fd88aee8c58f4f391a2a7287dabe51e9e9d64d48883fb5bf464ffee608ec62bc1ab06a SHA512 14fa2d7b0c0c86d6a82022e48306a0b440c58fa7b0ddc24fd65833009afedbbca038ba43e796610ffee031c3e83cc071c80d11b9c91e5bfa7bebd81ad6621508
+DIST godot-4.0-beta4.tar.xz 31234960 BLAKE2B aef52b0171cc5dfbbe7393ee06db247812662b9e52d9bbb1a5fa6278a5245c3aa484c327b9238e863c6ffa51d3fc66e89bf4ea66c9369efc02cf41b525855e8e SHA512 8183d65fdde27e2ac111ec8509a1dc8f1eacf539d88782b131d0f4b480a8ae3f40ffea66cfb23b2b67d474565b7f87e3903c681b696e02d39dd5ca908240eb4a

diff --git a/dev-games/godot/godot-4.0_beta4.ebuild b/dev-games/godot/godot-4.0_beta4.ebuild
new file mode 100644
index 000000000000..9a915964766b
--- /dev/null
+++ b/dev-games/godot/godot-4.0_beta4.ebuild
@@ -0,0 +1,255 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 desktop python-any-r1 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
+	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="
+	+dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +webp"
+# Disable tests until out of beta, tests themselves are new and can be volatile
+RESTRICT="test" # "!test? ( test ) !tools? ( test ) !webp? ( test )"
+
+# dlopen: alsa-lib,dbus,fontconfig,pulseaudio,speech-dispatcher,udev
+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
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		dev-util/glslang
+		media-libs/alsa-lib
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader[X]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		dbus? ( sys-apps/dbus )
+		pulseaudio? ( media-libs/libpulse )
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		udev? ( virtual/udev )
+	)
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	gui? (
+		dev-util/vulkan-headers
+		x11-base/xorg-proto
+	)
+	tools? ( test? ( dev-cpp/doctest ) )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-musl.patch
+	"${FILESDIR}"/${PN}-4.0_alpha14-scons.patch
+	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+)
+
+src_prepare() {
+	default
+
+	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 -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=(
+		doctest embree freetype glslang graphite harfbuzz icu4c libogg libpng
+		libtheora libvorbis libwebp mbedtls miniupnpc pcre2 recastnavigation
+		volk vulkan/include wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	# do symlinks to avoid too much patching with hardcoded header paths
+	mkdir thirdparty/lib{vorbis,ogg} || die
+	ln -s "${ESYSROOT}"/usr/include thirdparty/zstd || die
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+	ln -s "${ESYSROOT}"/usr/include/ogg thirdparty/libogg/ || die
+	ln -s "${ESYSROOT}"/usr/include/vorbis thirdparty/libvorbis/ || die
+}
+
+src_compile() {
+	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		deprecated=$(usex deprecated)
+		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
+		fontconfig=$(usex fontconfig)
+		minizip=yes # uses a modified bundled copy
+		opengl3=$(usex gui)
+		pulseaudio=$(usex gui $(usex pulseaudio))
+		speechd=$(usex speech)
+		udev=$(usex gui $(usex udev))
+		use_dbus=$(usex gui $(usex dbus))
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui) # hard-required and favored by upstream over gles3
+		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 ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		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_glslang=$(usex !gui)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu=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_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
+		# also bundled but lacking a builtin_* switch:
+		#	amd-fsr, basis_universal, cvtt, etcpak, fonts, glad,
+		#	jpeg-compressor, meshoptimizer, minimp3, minizip (patched to
+		#	seek in archives), noise, oidn, openxr, spirv-reflect, thorvg,
+		#	tinyexr, vhacd, vulkan (minus include/) and the misc directory.
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_glslang_enabled=$(usex gui)
+		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
+		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, e.g. can pass -flto as-is
+		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}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]] && has_version ${CATEGORY}/${PN}:3; then
+		elog
+		elog "Remember to make backups before opening any Godot <=3.x projects in Godot 4."
+		elog "Automated migration is only partial, and it would be difficult to revert."
+	fi
+}


             reply	other threads:[~2022-11-02  5:38 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-02  5:38 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29  5:16 [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/ Ionen Wolkens
2024-06-11 14:46 Ionen Wolkens
2024-04-18  5:14 Ionen Wolkens
2024-03-26 17:30 Ionen Wolkens
2024-03-26 17:30 Ionen Wolkens
2024-03-26 17:30 Ionen Wolkens
2024-03-26 17:30 Ionen Wolkens
2023-12-12 13:17 Ionen Wolkens
2023-11-30 11:52 Ionen Wolkens
2023-11-09 15:49 Ionen Wolkens
2023-11-02  0:05 Ionen Wolkens
2023-11-02  0:05 Ionen Wolkens
2023-10-04 14:25 Ionen Wolkens
2023-08-03 11:58 Ionen Wolkens
2023-07-18 19:11 Ionen Wolkens
2023-07-18 19:11 Ionen Wolkens
2023-05-26 23:16 Ionen Wolkens
2023-05-23  2:52 Sam James
2023-05-19 12:46 Ionen Wolkens
2023-04-17 20:45 Ionen Wolkens
2023-04-04 13:08 Ionen Wolkens
2023-03-20 21:04 Ionen Wolkens
2023-03-07 10:24 Ionen Wolkens
2023-03-01 14:23 Ionen Wolkens
2023-03-01 14:23 Ionen Wolkens
2023-02-25 12:16 Ionen Wolkens
2023-02-25 12:16 Ionen Wolkens
2023-02-24 10:17 Ionen Wolkens
2023-02-15  6:25 Ionen Wolkens
2023-02-08 17:36 Ionen Wolkens
2023-02-08 17:36 Ionen Wolkens
2023-02-02 17:26 Ionen Wolkens
2023-01-28  6:04 Ionen Wolkens
2023-01-28  6:04 Ionen Wolkens
2023-01-25 15:31 Ionen Wolkens
2023-01-25 15:31 Ionen Wolkens
2023-01-21 10:01 Ionen Wolkens
2023-01-21 10:01 Ionen Wolkens
2023-01-18 15:51 Ionen Wolkens
2023-01-18 12:03 Ionen Wolkens
2023-01-18 12:03 Ionen Wolkens
2023-01-14  7:32 Ionen Wolkens
2023-01-14  7:32 Ionen Wolkens
2023-01-11 11:26 Ionen Wolkens
2022-12-29 20:29 Ionen Wolkens
2022-12-24  6:04 Ionen Wolkens
2022-12-24  6:04 Ionen Wolkens
2022-12-20  6:44 Ionen Wolkens
2022-12-16  0:10 Ionen Wolkens
2022-12-10  9:39 Ionen Wolkens
2022-12-02  3:18 Ionen Wolkens
2022-12-02  3:18 Ionen Wolkens
2022-12-02  3:18 Ionen Wolkens
2022-11-24  6:35 Ionen Wolkens
2022-11-24  6:35 Ionen Wolkens
2022-11-16 20:31 Ionen Wolkens
2022-11-05 21:43 Ionen Wolkens
2022-11-02  7:33 Ionen Wolkens
2022-11-01 20:39 Ionen Wolkens
2022-10-15  5:23 Ionen Wolkens
2022-10-09  0:29 Ionen Wolkens
2022-09-30 12:42 Ionen Wolkens
2022-09-28 13:53 Ionen Wolkens
2022-09-16  6:15 Ionen Wolkens
2022-09-16  6:15 Ionen Wolkens
2022-09-14  4:05 Ionen Wolkens
2022-09-14  4:05 Ionen Wolkens
2022-09-07 21:47 Ionen Wolkens
2022-08-30 21:48 Ionen Wolkens
2022-08-30 21:48 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=1667367455.eadf9e483802d7a98ad61a60ae054b5cd42f9472.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