Gentoo Archives: gentoo-commits

From: Jay Faulkner <jay@×××.cc>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-games/godot/files/, dev-games/godot/
Date: Fri, 02 Sep 2022 02:21:36
Message-Id: 1662085260.220f64b1c15644bd4853eff296c38b2cd4018f76.jayf@gentoo
1 commit: 220f64b1c15644bd4853eff296c38b2cd4018f76
2 Author: Jay Faulkner <jay <AT> jvf <DOT> cc>
3 AuthorDate: Fri Sep 2 02:20:28 2022 +0000
4 Commit: Jay Faulkner <jay <AT> jvf <DOT> cc>
5 CommitDate: Fri Sep 2 02:21:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=220f64b1
7
8 dev-games/godot: treeclean, migrated to ::gentoo
9
10 Signed-Off-By: Jay Faulkner <jay <AT> jvf.cc>
11
12 dev-games/godot/Manifest | 1 -
13 .../godot/files/godot-3.3.2-fix-llvm-build.patch | 36 -----
14 dev-games/godot/godot-3.3.2-r1.ebuild | 145 ---------------------
15 dev-games/godot/metadata.xml | 30 -----
16 4 files changed, 212 deletions(-)
17
18 diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
19 deleted file mode 100644
20 index 26b22352d..000000000
21 --- a/dev-games/godot/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST godot-3.3.2.tar.gz 29524679 BLAKE2B 1d7ee1703388d98c41524f64a99859216b060daad4502c4118adf31a95d45aa230d058630ae8735282a9b5d9f7c1ee464fb4caf9f92e3e55340370e007102f8d SHA512 3a8d187d44460ce0f28f9d26fabb30b5a9af651d9d1a1446480823885aae3ad018e32a072d4d60cf5d2c152b97759cee2172ca314c517d01cff8ddf05d91c24e
25
26 diff --git a/dev-games/godot/files/godot-3.3.2-fix-llvm-build.patch b/dev-games/godot/files/godot-3.3.2-fix-llvm-build.patch
27 deleted file mode 100644
28 index 7cb5823eb..000000000
29 --- a/dev-games/godot/files/godot-3.3.2-fix-llvm-build.patch
30 +++ /dev/null
31 @@ -1,36 +0,0 @@
32 -diff --git a/SConstruct b/SConstruct
33 -index c30f533..388be69 100644
34 ---- a/SConstruct
35 -+++ b/SConstruct
36 -@@ -174,6 +174,8 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in Zstd library", True))
37 - # Compilation environment setup
38 - opts.Add("CXX", "C++ compiler")
39 - opts.Add("CC", "C compiler")
40 -+opts.Add("AR", "Archiver")
41 -+opts.Add("RANLIB", "Random Access Library Indexer")
42 - opts.Add("LINK", "Linker")
43 - opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers")
44 - opts.Add("CFLAGS", "Custom flags for the C compiler")
45 -diff --git a/platform/x11/detect.py b/platform/x11/detect.py
46 -index ba5fb30..d907701 100644
47 ---- a/platform/x11/detect.py
48 -+++ b/platform/x11/detect.py
49 -@@ -129,7 +129,6 @@ def configure(env):
50 - if "clang++" not in os.path.basename(env["CXX"]):
51 - env["CC"] = "clang"
52 - env["CXX"] = "clang++"
53 -- env.extra_suffix = ".llvm" + env.extra_suffix
54 -
55 - if env["use_lld"]:
56 - if env["use_llvm"]:
57 -@@ -189,10 +188,6 @@ def configure(env):
58 - env.Append(CCFLAGS=["-flto"])
59 - env.Append(LINKFLAGS=["-flto"])
60 -
61 -- if not env["use_llvm"]:
62 -- env["RANLIB"] = "gcc-ranlib"
63 -- env["AR"] = "gcc-ar"
64 --
65 - env.Append(CCFLAGS=["-pipe"])
66 - env.Append(LINKFLAGS=["-pipe"])
67 -
68
69 diff --git a/dev-games/godot/godot-3.3.2-r1.ebuild b/dev-games/godot/godot-3.3.2-r1.ebuild
70 deleted file mode 100644
71 index bee4feb73..000000000
72 --- a/dev-games/godot/godot-3.3.2-r1.ebuild
73 +++ /dev/null
74 @@ -1,145 +0,0 @@
75 -# Copyright 1999-2021 Gentoo Authors
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -EAPI=7
79 -PYTHON_COMPAT=( python3_{8..9} )
80 -
81 -inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
82 -
83 -DESCRIPTION="Multi-platform 2D and 3D game engine"
84 -HOMEPAGE="https://godotengine.org"
85 -
86 -SRC_URI="https://github.com/godotengine/${PN}/archive/${PV}-stable.tar.gz -> ${P}.tar.gz"
87 -S="${WORKDIR}/${P}-stable"
88 -KEYWORDS="~amd64 ~x86"
89 -
90 -LICENSE="Apache-2.0 Boost-1.0 BSD CC-BY-3.0 MIT MPL-2.0 OFL-1.1 public-domain ZLIB"
91 -SLOT="0/3"
92 -IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus pulseaudio +raycast +theora +udev +upnp +vorbis +webp"
93 -
94 -RDEPEND="
95 - app-arch/lz4
96 - app-arch/zstd
97 - dev-libs/libpcre2[pcre32]
98 - media-libs/alsa-lib
99 - media-libs/embree:3
100 - media-libs/libpng:0=
101 - media-libs/libvpx
102 - media-libs/mesa[gles2]
103 - sys-libs/zlib
104 - x11-libs/libX11
105 - x11-libs/libXcursor
106 - x11-libs/libXi
107 - x11-libs/libXinerama
108 - virtual/glu
109 - virtual/opengl
110 - bullet? ( >=sci-physics/bullet-2.89 )
111 - enet? ( net-libs/enet:= )
112 - freetype? ( media-libs/freetype:2 )
113 - mbedtls? ( net-libs/mbedtls )
114 - ogg? ( media-libs/libogg )
115 - opus? (
116 - media-libs/opus
117 - media-libs/opusfile
118 - )
119 - pulseaudio? ( media-sound/pulseaudio )
120 - theora? ( media-libs/libtheora )
121 - udev? ( virtual/udev )
122 - upnp? ( net-libs/miniupnpc )
123 - vorbis? ( media-libs/libvorbis )
124 - webp? ( media-libs/libwebp )
125 -"
126 -DEPEND="
127 - ${RDEPEND}
128 - dev-lang/yasm
129 -"
130 -BDEPEND="virtual/pkgconfig"
131 -
132 -PATCHES=(
133 - "${FILESDIR}"/${P}-fix-llvm-build.patch
134 -)
135 -
136 -src_prepare() {
137 - default
138 - rm -r thirdparty/{bullet,embree,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die
139 -}
140 -
141 -src_configure() {
142 - myesconsargs=(
143 - CC="$(tc-getCC)"
144 - CXX="$(tc-getCXX)"
145 - AR="$(tc-getAR)"
146 - RANLIB="$(tc-getRANLIB)"
147 - )
148 - # Remove builtin third-party packages, link with system ones instead
149 - myesconsargs+=(
150 - builtin_bullet=no
151 - builtin_embree=no
152 - builtin_enet=no
153 - builtin_freetype=no
154 - builtin_libogg=no
155 - builtin_libpng=no
156 - builtin_libtheora=no
157 - builtin_libvorbis=no
158 - builtin_libvpx=no
159 - builtin_libwebp=no
160 - builtin_mbedtls=no
161 - builtin_miniupnpc=no
162 - builtin_opus=no
163 - builtin_pcre2=no
164 - builtin_pcre2_with_jit=no
165 - builtin_zlib=no
166 - builtin_zstd=no
167 - )
168 - myesconsargs+=(
169 - # Mono bindings requires MSBuild which is only available on Windows
170 - module_mono_enabled=no
171 - module_bullet_enabled=$(usex bullet)
172 - module_enet_enabled=$(usex enet)
173 - module_freetype_enabled=$(usex freetype)
174 - module_mbedtls_enabled=$(usex mbedtls)
175 - module_ogg_enabled=$(usex ogg)
176 - module_opus_enabled=$(usex opus)
177 - module_raycast_enabled=$(usex raycast)
178 - module_theora_enabled=$(usex theora)
179 - module_upnp_enabled=$(usex upnp)
180 - module_vorbis_enabled=$(usex vorbis)
181 - module_webp_enabled=$(usex webp)
182 - )
183 - # Misc options
184 - myesconsargs+=(
185 - platform=x11
186 - progress=yes
187 - tools=yes
188 - verbose=yes
189 - deprecated=$(usex deprecated)
190 - pulseaudio=$(usex pulseaudio)
191 - target=$(usex debug debug release_debug)
192 - udev=$(usex udev)
193 - use_lto=$(usex lto)
194 - )
195 -}
196 -
197 -src_compile() {
198 - escons "${myesconsargs[@]}"
199 -}
200 -
201 -src_install() {
202 - local godot_binary="${PN}.x11.opt.tools"
203 -
204 - if [[ "${ARCH}" == "amd64" ]]; then
205 - godot_binary="${godot_binary}.64"
206 - elif [[ "${ARCH}" == "x86" ]]; then
207 - godot_binary="${godot_binary}.32"
208 - fi
209 -
210 - newbin bin/${godot_binary} ${PN}
211 - newicon icon.svg ${PN}.svg
212 - doman misc/dist/linux/${PN}.6
213 - domenu misc/dist/linux/org.godotengine.Godot.desktop
214 - insinto /usr/share/metainfo
215 - doins misc/dist/linux/org.godotengine.Godot.appdata.xml
216 - insinto /usr/share/mime/application
217 - doins misc/dist/linux/org.godotengine.Godot.xml
218 - dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
219 -}
220
221 diff --git a/dev-games/godot/metadata.xml b/dev-games/godot/metadata.xml
222 deleted file mode 100644
223 index 46939a55b..000000000
224 --- a/dev-games/godot/metadata.xml
225 +++ /dev/null
226 @@ -1,30 +0,0 @@
227 -<?xml version="1.0" encoding="UTF-8"?>
228 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
229 -<pkgmetadata>
230 - <maintainer type="person">
231 - <email>rossbridger.cc@×××××.com</email>
232 - <name>Ross Charles Campbell</name>
233 - </maintainer>
234 - <longdescription lang="en">
235 -Godot Engine is a feature-packed, cross-platform game engine to create 2D and
236 -3D games from a unified interface. It provides a comprehensive set of common
237 -tools, so users can focus on making games without having to reinvent the wheel.
238 -Games can be exported in one click to a number of platforms, including the major
239 -desktop platforms (Linux, macOS, Windows) as well as mobile (Android, iOS) and
240 -web-based (HTML5) platforms.
241 - </longdescription>
242 - <use>
243 - <flag name="bullet">Enable support for <pkg>sci-physics/bullet</pkg></flag>
244 - <flag restrict="&gt;=dev-games/godot-3.3.0" name="deprecated">Enable deprecated features</flag>
245 - <flag name="enet">Enable support for <pkg>net-libs/enet</pkg></flag>
246 - <flag name="freetype">Enable support for <pkg>media-libs/freetype</pkg></flag>
247 - <flag name="lto">Enable support for link time optimization</flag>
248 - <flag name="mbedtls">Enable support for <pkg>net-libs/mbedtls</pkg></flag>
249 - <flag name="raycast">Enable raycast module using <pkg>media-libs/embree</pkg></flag>
250 - </use>
251 - <upstream>
252 - <remote-id type="github">godotengine/godot</remote-id>
253 - <bugs-to>https://github.com/godotengine/godot/issues</bugs-to>
254 - <doc lang="en">https://docs.godotengine.org/en/stable/index.html</doc>
255 - </upstream>
256 -</pkgmetadata>