Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/
Date: Wed, 01 Mar 2023 14:23:14
Message-Id: 1677680545.5ced328efeb4cdeb3c8270a2e56aa3b66ea95182.ionen@gentoo
1 commit: 5ced328efeb4cdeb3c8270a2e56aa3b66ea95182
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 1 14:00:11 2023 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 1 14:22:25 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ced328e
7
8 dev-games/godot: drop 4.0_rc5
9
10 Almost same as 4.0 bare a few bugfixes, so let's drop it.
11
12 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
13
14 dev-games/godot/Manifest | 1 -
15 dev-games/godot/godot-4.0_rc5.ebuild | 234 -----------------------------------
16 2 files changed, 235 deletions(-)
17
18 diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
19 index b00c06fc59e3..26b51903f1c2 100644
20 --- a/dev-games/godot/Manifest
21 +++ b/dev-games/godot/Manifest
22 @@ -1,3 +1,2 @@
23 DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
24 -DIST godot-4.0-rc5.tar.xz 29376936 BLAKE2B bc8de477a4597576165fb1a7f38822aa499dcba696368bb47a0b018bfaedb573d2d822e80e1e4364abfb40a72c7badc2a3ef1d2ce9b9a10a1d7d29811b4f489e SHA512 8001f0d021798e6521855ab41c1fa4db93ea898cac9267305745a822f46a8ef3f58174e3c9d402c5d22b94404e411cb56b69e018d3ea00febb885aad42c5eca7
25 DIST godot-4.0-stable.tar.xz 29435592 BLAKE2B 0802631f2995144b63c98c3a6031e7f9df771e7dd9491d38a5fcb3f52581c1f3d6a29cde5a43f9a3a83c9aaeaba9e53b22c22cdb67117f65189d916564db614b SHA512 a1de87425861dfd71bf6c6387008d72a0c80322865ffb4dbb4a87e58244d37d4d45d6f6df8e06ea6c4f979de80b364932891c65cf11c7f80727f33e28460cbd9
26
27 diff --git a/dev-games/godot/godot-4.0_rc5.ebuild b/dev-games/godot/godot-4.0_rc5.ebuild
28 deleted file mode 100644
29 index 584b6bf6273e..000000000000
30 --- a/dev-games/godot/godot-4.0_rc5.ebuild
31 +++ /dev/null
32 @@ -1,234 +0,0 @@
33 -# Copyright 2022-2023 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=8
37 -
38 -PYTHON_COMPAT=( python3_{9..11} )
39 -inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
40 -
41 -MY_P="${PN}-$(ver_rs 2 -)"
42 -
43 -DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
44 -HOMEPAGE="https://godotengine.org/"
45 -SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
46 -S="${WORKDIR}/${MY_P}"
47 -
48 -LICENSE="
49 - MIT
50 - Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
51 - gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
52 -SLOT="4"
53 -KEYWORDS="~amd64"
54 -# Enable roughly same as upstream by default so it works as expected,
55 -# except raycast (tools-only heavy dependency), and deprecated.
56 -IUSE="
57 - alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
58 - +runner speech test +theora +tools +udev +upnp +vulkan +webp"
59 -# tests need more figuring out, they are still somewhat new and volatile
60 -RESTRICT="test"
61 -
62 -# dlopen: libglvnd
63 -RDEPEND="
64 - app-arch/zstd:=
65 - dev-games/recastnavigation:=
66 - dev-libs/icu:=
67 - dev-libs/libpcre2:=[pcre32]
68 - media-libs/freetype[brotli,harfbuzz]
69 - media-libs/harfbuzz:=[icu]
70 - media-libs/libogg
71 - media-libs/libpng:=
72 - media-libs/libvorbis
73 - <net-libs/mbedtls-3:=
74 - net-libs/wslay
75 - sys-libs/zlib:=
76 - alsa? ( media-libs/alsa-lib )
77 - dbus? ( sys-apps/dbus )
78 - fontconfig? ( media-libs/fontconfig )
79 - gui? (
80 - media-libs/libglvnd
81 - x11-libs/libX11
82 - x11-libs/libXcursor
83 - x11-libs/libXext
84 - x11-libs/libXi
85 - x11-libs/libXinerama
86 - x11-libs/libXrandr
87 - x11-libs/libXrender
88 - x11-libs/libxkbcommon
89 - tools? ( raycast? ( media-libs/embree:3 ) )
90 - vulkan? ( media-libs/vulkan-loader[X] )
91 - )
92 - pulseaudio? ( media-libs/libpulse )
93 - speech? ( app-accessibility/speech-dispatcher )
94 - theora? ( media-libs/libtheora )
95 - tools? ( app-misc/ca-certificates )
96 - udev? ( virtual/udev )
97 - upnp? ( net-libs/miniupnpc:= )
98 - webp? ( media-libs/libwebp:= )"
99 -DEPEND="
100 - ${RDEPEND}
101 - gui? ( x11-base/xorg-proto )
102 - tools? ( test? ( dev-cpp/doctest ) )"
103 -BDEPEND="virtual/pkgconfig"
104 -
105 -PATCHES=(
106 - "${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
107 - "${FILESDIR}"/${PN}-4.0_rc2-musl.patch
108 - "${FILESDIR}"/${PN}-4.0_rc2-gcc13.patch
109 - "${FILESDIR}"/${PN}-4.0_rc3-scons.patch
110 -)
111 -
112 -src_prepare() {
113 - default
114 -
115 - sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
116 - sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
117 - sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
118 - -i misc/dist/linux/org.godotengine.Godot.desktop || die
119 -
120 - sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
121 -
122 - # use of builtin_ switches can be messy (see below), delete to be sure
123 - local unbundle=(
124 - doctest embree freetype graphite harfbuzz icu4c libogg
125 - libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
126 - miniupnpc pcre2 recastnavigation volk wslay zlib zstd
127 - # certs: unused by generated header, but scons panics if not found
128 - )
129 - rm -r "${unbundle[@]/#/thirdparty/}" || die
130 -
131 - ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
132 -}
133 -
134 -src_compile() {
135 - local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
136 - local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
137 -
138 - local esconsargs=(
139 - AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
140 -
141 - progress=no
142 - verbose=yes
143 -
144 - use_sowrap=no
145 -
146 - alsa=$(usex alsa)
147 - dbus=$(usex dbus)
148 - deprecated=$(usex deprecated)
149 - fontconfig=$(usex fontconfig)
150 - opengl3=$(usex gui)
151 - pulseaudio=$(usex pulseaudio)
152 - speechd=$(usex speech)
153 - udev=$(usex udev)
154 - use_volk=no # unnecessary when linking directly to libvulkan
155 - vulkan=$(usex gui $(usex vulkan))
156 - x11=$(usex gui)
157 -
158 - system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
159 -
160 - # platform/*/detect.py uses builtin_* switches to check if need
161 - # to link with system libraries, but ignores whether the dep is
162 - # actually used, so "enable" deleted builtins on disabled deps
163 - builtin_certs=no
164 - builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
165 - builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
166 - builtin_freetype=no
167 - builtin_glslang=yes #879111
168 - builtin_graphite=no
169 - builtin_harfbuzz=no
170 - builtin_icu4c=no
171 - builtin_libogg=no
172 - builtin_libpng=no
173 - builtin_libtheora=$(usex !theora)
174 - builtin_libvorbis=no
175 - builtin_libwebp=$(usex !webp)
176 - builtin_mbedtls=no
177 - builtin_miniupnpc=$(usex !upnp)
178 - builtin_msdfgen=yes # not wired for unbundling nor packaged
179 - builtin_pcre2=no
180 - builtin_recastnavigation=no
181 - builtin_rvo2=yes # bundled copy has godot-specific changes
182 - builtin_squish=yes # ^ likewise, may not be safe to unbundle
183 - builtin_wslay=no
184 - builtin_xatlas=yes # not wired for unbundling nor packaged
185 - builtin_zlib=no
186 - builtin_zstd=no
187 - # (more is bundled in third_party/ but they lack builtin_* switches)
188 -
189 - # modules with optional dependencies, "possible" to disable more but
190 - # gets messy and breaks all sorts of features (expected enabled)
191 - module_gridmap_enabled=$(usex deprecated) # fails without deprecated
192 - module_mono_enabled=no # unhandled
193 - # note raycast is only enabled on amd64+arm64, see raycast/config.py
194 - module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
195 - module_theora_enabled=$(usex theora)
196 - module_upnp_enabled=$(usex upnp)
197 - module_webp_enabled=$(usex webp)
198 -
199 - # let *FLAGS handle these, e.g. can pass -flto as-is
200 - debug_symbols=no
201 - lto=none
202 - optimize=custom
203 - use_static_cpp=no
204 - )
205 -
206 - if use runner && use tools; then
207 - # build alternate faster + ~60% smaller binary for running
208 - # games or servers without game development debug paths
209 - escons extra_suffix=runner target=template_release "${esconsargs[@]}"
210 - fi
211 -
212 - esconsargs+=(
213 - target=$(usex tools editor template_$(usex debug{,} release))
214 - dev_build=$(usex debug)
215 -
216 - # harmless but note this bakes in --test in the final binary
217 - tests=$(usex tools $(usex test))
218 - )
219 -
220 - escons extra_suffix=main "${esconsargs[@]}"
221 -}
222 -
223 -src_test() {
224 - xdg_environment_reset
225 - bin/godot*.main --headless --test || die
226 -}
227 -
228 -src_install() {
229 - local s=godot${SLOT}
230 -
231 - newbin bin/godot*.main ${s}
232 - if use runner && use tools; then
233 - newbin bin/godot*.runner ${s}-runner
234 - else
235 - # always available, revdeps shouldn't depend on [runner]
236 - dosym ${s} /usr/bin/${s}-runner
237 - fi
238 -
239 - newman misc/dist/linux/godot.6 ${s}.6
240 - dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
241 -
242 - if use gui; then
243 - newicon icon.svg ${s}.svg
244 - newmenu misc/dist/linux/org.godotengine.Godot.desktop \
245 - org.godotengine.${s^}.desktop
246 -
247 - insinto /usr/share/metainfo
248 - newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
249 - org.godotengine.${s^}.appdata.xml
250 -
251 - insinto /usr/share/mime/application
252 - newins misc/dist/linux/org.godotengine.Godot.xml \
253 - org.godotengine.${s^}.xml
254 - fi
255 -
256 - newbashcomp misc/dist/shell/godot.bash-completion ${s}
257 - bashcomp_alias ${s}{,-runner}
258 -
259 - insinto /usr/share/fish/vendor_completions.d
260 - newins misc/dist/shell/godot.fish ${s}.fish
261 - dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
262 -
263 - insinto /usr/share/zsh/site-functions
264 - newins misc/dist/shell/_godot.zsh-completion _${s}
265 - dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
266 -}