1 |
commit: a6cc2e8778e1a0095d91c407a1d9f04fde96350f |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 27 21:49:28 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 27 22:33:43 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6cc2e87 |
7 |
|
8 |
games-simulation/openrct2: drop 0.3.5.1-r1 |
9 |
|
10 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
11 |
|
12 |
games-simulation/openrct2/Manifest | 4 - |
13 |
.../openrct2-0.2.4-include-additional-paths.patch | 33 ---- |
14 |
.../openrct2/files/openrct2-0.3.5.1-ccache.patch | 58 ------- |
15 |
.../openrct2/openrct2-0.3.5.1-r1.ebuild | 166 --------------------- |
16 |
4 files changed, 261 deletions(-) |
17 |
|
18 |
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest |
19 |
index 711cad0443aa..12bcabc744f6 100644 |
20 |
--- a/games-simulation/openrct2/Manifest |
21 |
+++ b/games-simulation/openrct2/Manifest |
22 |
@@ -1,8 +1,4 @@ |
23 |
-DIST openrct2-0.3.5.1.tar.gz 14178153 BLAKE2B a1f15fd427392195502e917f1fd4d8064a2905c1995c9e94157073c6acc026d1f716fb06294768630aa75d104d7c851388c72c38653e4804deeb8237b4a31c00 SHA512 0e36db302631b75aa1411eca945bddd1120997efbc48ba9172887f834670f34e345b8c96f363cdc8791d94bb4df32f6e70e30001989c194a8c525e2614241c84 |
24 |
DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0 |
25 |
-DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0 |
26 |
DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5 |
27 |
-DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57 |
28 |
DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69 |
29 |
-DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e |
30 |
DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487 |
31 |
|
32 |
diff --git a/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch |
33 |
deleted file mode 100644 |
34 |
index d7c3bb7b4442..000000000000 |
35 |
--- a/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch |
36 |
+++ /dev/null |
37 |
@@ -1,33 +0,0 @@ |
38 |
-From 370b6c6ee48dd1ccc68e03f4bba3e9a2cb2067aa Mon Sep 17 00:00:00 2001 |
39 |
-From: Conrad Kostecki <conrad@××××××××.com> |
40 |
-Date: Sat, 9 Nov 2019 22:32:03 +0100 |
41 |
-Subject: [PATCH] src/openrct2/config/Config.cpp: Search additional paths for |
42 |
- rct data. |
43 |
- |
44 |
-With '/usr/share/openrct2/rct{1,2}_data' added into the search path list, |
45 |
-it makes possible to install rct{1,2} game files globally, |
46 |
-so every user on a linux system can run OpenRCT2 directly. |
47 |
---- |
48 |
- src/openrct2/config/Config.cpp | 2 ++ |
49 |
- 1 file changed, 2 insertions(+) |
50 |
- |
51 |
-diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp |
52 |
-index 08d59488eea..969533f8820 100644 |
53 |
---- a/src/openrct2/config/Config.cpp |
54 |
-+++ b/src/openrct2/config/Config.cpp |
55 |
-@@ -615,6 +615,7 @@ namespace Config |
56 |
- log_verbose("config_find_rct1_path(...)"); |
57 |
- |
58 |
- static constexpr const utf8* searchLocations[] = { |
59 |
-+ R"(/usr/share/openrct2/rct1_data)", |
60 |
- R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", |
61 |
- R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", |
62 |
- R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)", |
63 |
-@@ -659,6 +660,7 @@ namespace Config |
64 |
- log_verbose("config_find_rct2_path(...)"); |
65 |
- |
66 |
- static constexpr const utf8* searchLocations[] = { |
67 |
-+ R"(/usr/share/openrct2/rct2_data)", |
68 |
- R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)", |
69 |
- R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)", |
70 |
- R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", |
71 |
|
72 |
diff --git a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch b/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch |
73 |
deleted file mode 100644 |
74 |
index 97a529c6a8e2..000000000000 |
75 |
--- a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch |
76 |
+++ /dev/null |
77 |
@@ -1,58 +0,0 @@ |
78 |
-From cb6d7418c53e10bd4120891f6a2312d3ef839ca8 Mon Sep 17 00:00:00 2001 |
79 |
-From: Conrad Kostecki <conikost@g.o> |
80 |
-Date: Sun, 12 Dec 2021 23:04:58 +0100 |
81 |
-Subject: [PATCH] CMakeLists.txt: update CCache handling (#16185) |
82 |
- |
83 |
-This PR updated slightly the handling of CCache. With the current |
84 |
-implementation, when CCache is not being installed, CMake will complain, |
85 |
-that OPENRCT2_USE_CCACHE is not set. |
86 |
- |
87 |
-This logic is slightly updated, so the option OPENRCT2_USE_CCACHE is always |
88 |
-being available and when this option is enabled (default ON), it will |
89 |
-search for CCache and warn, if it's not found. |
90 |
- |
91 |
-The idea behind is, as in Gentoo, we never let CCache be used by the |
92 |
-package itself, instead, we enabled it globally. But this the old logic, |
93 |
-on systems, which don't have CCache installed, it will complain about |
94 |
-OPENRCT2_USE_CCACHE not being used, but we have to make sure, OpenRCT2 |
95 |
-will never use by itself CCache and this message will be gone.. |
96 |
- |
97 |
-Signed-off-by: Conrad Kostecki <conikost@g.o> |
98 |
---- |
99 |
- CMakeLists.txt | 23 +++++++++++++---------- |
100 |
- 1 file changed, 13 insertions(+), 10 deletions(-) |
101 |
- |
102 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
103 |
-index 8d202cf5a9b8..566f3a8a9688 100644 |
104 |
---- a/CMakeLists.txt |
105 |
-+++ b/CMakeLists.txt |
106 |
-@@ -8,16 +8,19 @@ endif() |
107 |
- # if it is available |
108 |
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") |
109 |
- |
110 |
--find_package(CCache) |
111 |
-- |
112 |
--if (CCache_FOUND) |
113 |
-- option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON) |
114 |
-- if (OPENRCT2_USE_CCACHE) |
115 |
-- # Use e.g. "ccache clang++" instead of "clang++" |
116 |
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}") |
117 |
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCache_EXECUTABLE}") |
118 |
-- endif (OPENRCT2_USE_CCACHE) |
119 |
--endif (CCache_FOUND) |
120 |
-+option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON) |
121 |
-+ |
122 |
-+if (OPENRCT2_USE_CCACHE) |
123 |
-+ find_package(CCache) |
124 |
-+ |
125 |
-+ if (CCache_FOUND) |
126 |
-+ # Use e.g. "ccache clang++" instead of "clang++" |
127 |
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}") |
128 |
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCache_EXECUTABLE}") |
129 |
-+ else() |
130 |
-+ message("Usage of CCache was enabled, but CCache was not found, so CCache is not being enabled.") |
131 |
-+ endif() |
132 |
-+endif (OPENRCT2_USE_CCACHE) |
133 |
- |
134 |
- if (APPLE) |
135 |
- execute_process(COMMAND /usr/bin/uname -m OUTPUT_VARIABLE SYSTEM_MACOS_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) |
136 |
|
137 |
diff --git a/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild |
138 |
deleted file mode 100644 |
139 |
index e02fe6c1811b..000000000000 |
140 |
--- a/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild |
141 |
+++ /dev/null |
142 |
@@ -1,166 +0,0 @@ |
143 |
-# Copyright 1999-2022 Gentoo Authors |
144 |
-# Distributed under the terms of the GNU General Public License v2 |
145 |
- |
146 |
-EAPI=8 |
147 |
- |
148 |
-inherit cmake readme.gentoo-r1 xdg-utils |
149 |
- |
150 |
-MY_PN="OpenRCT2" |
151 |
-MY_PN_OBJ="objects" |
152 |
-MY_PN_RPL="replays" |
153 |
-MY_PN_TS="title-sequences" |
154 |
-MY_PV_OBJ="1.0.21" |
155 |
-MY_PV_RPL="0.0.57" |
156 |
-MY_PV_TS="0.1.2c" |
157 |
- |
158 |
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2" |
159 |
-HOMEPAGE="https://openrct2.org/" |
160 |
-SRC_URI=" |
161 |
- https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
162 |
- https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip |
163 |
- https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip |
164 |
- test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip ) |
165 |
-" |
166 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
167 |
- |
168 |
-LICENSE="GPL-3" |
169 |
-SLOT="0" |
170 |
-KEYWORDS="amd64 ~arm ~arm64 x86" |
171 |
-IUSE="dedicated +lightfx +opengl scripting test +truetype" |
172 |
-RESTRICT="!test? ( test )" |
173 |
- |
174 |
-COMMON_DEPEND=" |
175 |
- dev-libs/icu:= |
176 |
- dev-libs/jansson:= |
177 |
- dev-libs/libzip:= |
178 |
- media-libs/libpng:0= |
179 |
- net-misc/curl[ssl] |
180 |
- sys-libs/zlib |
181 |
- !dedicated? ( |
182 |
- media-libs/libsdl2 |
183 |
- media-libs/speexdsp |
184 |
- opengl? ( virtual/opengl ) |
185 |
- ) |
186 |
- dev-libs/openssl:0= |
187 |
- scripting? ( dev-lang/duktape:= ) |
188 |
- truetype? ( |
189 |
- media-libs/fontconfig:1.0 |
190 |
- media-libs/freetype:2 |
191 |
- ) |
192 |
-" |
193 |
- |
194 |
-RDEPEND=" |
195 |
- ${COMMON_DEPEND} |
196 |
- dedicated? ( |
197 |
- acct-group/openrct2 |
198 |
- acct-user/openrct2 |
199 |
- ) |
200 |
-" |
201 |
- |
202 |
-DEPEND=" |
203 |
- ${COMMON_DEPEND} |
204 |
- dev-cpp/nlohmann_json |
205 |
- test? ( dev-cpp/gtest ) |
206 |
-" |
207 |
- |
208 |
-BDEPEND=" |
209 |
- app-arch/unzip |
210 |
- virtual/pkgconfig |
211 |
-" |
212 |
- |
213 |
-PATCHES=( |
214 |
- "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch" |
215 |
- "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch" |
216 |
- "${FILESDIR}/${PN}-0.3.5.1-ccache.patch" |
217 |
-) |
218 |
- |
219 |
-src_unpack() { |
220 |
- unpack "${P}".tar.gz |
221 |
- |
222 |
- mkdir -p "${S}"/data/sequence || die |
223 |
- cd "${S}"/data/sequence || die |
224 |
- unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip |
225 |
- |
226 |
- mkdir -p "${S}"/data/object || die |
227 |
- cd "${S}"/data/object || die |
228 |
- unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip |
229 |
- |
230 |
- if use test; then |
231 |
- mkdir -p "${S}"/testdata/replays || die |
232 |
- cd "${S}"/testdata/replays || die |
233 |
- unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip |
234 |
- fi |
235 |
-} |
236 |
- |
237 |
-src_prepare() { |
238 |
- cmake_src_prepare |
239 |
- |
240 |
- # Don't treat warnings as errors. |
241 |
- sed -e 's/-Werror//' -i CMakeLists.txt || die |
242 |
-} |
243 |
- |
244 |
-src_configure() { |
245 |
- # Note: There is currently no support for Disord-RPC and Google Benchmark, |
246 |
- # as both packages do not exist in Gentoo, so support for them has been disabled. |
247 |
- local mycmakeargs=( |
248 |
- -DDISABLE_DISCORD_RPC=ON |
249 |
- -DDISABLE_GOOGLE_BENCHMARK=ON |
250 |
- -DDISABLE_GUI=$(usex dedicated) |
251 |
- -DDISABLE_HTTP=OFF |
252 |
- -DDISABLE_IPO=ON |
253 |
- -DDISABLE_NETWORK=OFF |
254 |
- $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "") |
255 |
- -DDISABLE_TTF=$(usex !truetype) |
256 |
- -DDOWNLOAD_OBJECTS=OFF |
257 |
- -DDOWNLOAD_REPLAYS=OFF |
258 |
- -DDOWNLOAD_TITLE_SEQUENCES=OFF |
259 |
- -DENABLE_LIGHTFX=$(usex lightfx) |
260 |
- -DENABLE_SCRIPTING=$(usex scripting) |
261 |
- -DOPENRCT2_USE_CCACHE=OFF |
262 |
- -DPORTABLE=OFF |
263 |
- -DSTATIC=OFF |
264 |
- $(usex test "-DSYSTEM_GTEST=ON" "") |
265 |
- -DWITH_TESTS=$(usex test) |
266 |
- -DUSE_MMAP=ON |
267 |
- ) |
268 |
- |
269 |
- cmake_src_configure |
270 |
-} |
271 |
- |
272 |
-src_test() { |
273 |
- # Since the tests need the OpenRCT2 data, |
274 |
- # we need to symlink them into the build directory, |
275 |
- # otherwise some tests will fail, as they don't find the OpenRCT2 data. |
276 |
- # It is currently not possible to override that path. |
277 |
- # See: https://github.com/OpenRCT2/OpenRCT2/issues/6473 |
278 |
- ln -s "${S}"/data "${BUILD_DIR}" || die |
279 |
- |
280 |
- cmake_src_test |
281 |
-} |
282 |
- |
283 |
-src_install() { |
284 |
- use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" ) |
285 |
- |
286 |
- cmake_src_install |
287 |
- |
288 |
- if use dedicated; then |
289 |
- newinitd "${FILESDIR}"/openrct2.initd openrct2 |
290 |
- newconfd "${FILESDIR}"/openrct2.confd openrct2 |
291 |
- fi |
292 |
- |
293 |
- readme.gentoo_create_doc |
294 |
-} |
295 |
- |
296 |
-pkg_postinst() { |
297 |
- readme.gentoo_print_elog |
298 |
- |
299 |
- xdg_desktop_database_update |
300 |
- xdg_icon_cache_update |
301 |
- xdg_mimeinfo_database_update |
302 |
-} |
303 |
- |
304 |
-pkg_postrm() { |
305 |
- xdg_desktop_database_update |
306 |
- xdg_icon_cache_update |
307 |
- xdg_mimeinfo_database_update |
308 |
-} |