Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
Date: Wed, 27 Apr 2022 20:08:47
Message-Id: 1651090108.a842ee787e7808305494b309969e233f50dc39d0.conikost@gentoo
1 commit: a842ee787e7808305494b309969e233f50dc39d0
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 27 19:58:02 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 20:08:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a842ee78
7
8 games-simulation/openrct2: bump to 0.4.0
9
10 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
11
12 games-simulation/openrct2/Manifest | 6 ++++--
13 .../openrct2-0.4.0-include-additional-paths.patch | 18 ++++++++++++++++++
14 ...{openrct2-9999.ebuild => openrct2-0.4.0.ebuild} | 22 ++++++++++------------
15 games-simulation/openrct2/openrct2-9999.ebuild | 8 ++++----
16 4 files changed, 36 insertions(+), 18 deletions(-)
17
18 diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
19 index 97cca94ac7a4..711cad0443aa 100644
20 --- a/games-simulation/openrct2/Manifest
21 +++ b/games-simulation/openrct2/Manifest
22 @@ -1,6 +1,8 @@
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.4.zip 3392474 BLAKE2B 5f539cbbdd93828cebfa6977c6c11ac878c3ec39e0b937ddf00e598f874ccf5f1822e02d6c7e508a42e2ee01242b304b013f07d16dbf94085191b62f76b8dbfb SHA512 910538010d1258f73f8290dd79ef24f463e2afcf0e5876b5f7b6a0671250fbea11180474440df6f0c3d6c356948c5f7a305a44214b53695dc26f15158dfd5214
27 +DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
28 DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
29 -DIST openrct2-replays-0.0.62.zip 1466858 BLAKE2B 651e46a554e90d7692c2dc0f8dcffaadb58ffaf7f9a282d499f4c032c8412730da58f660d03b0e73d26893ce7b9a3a437029893acd7f3fd4e9267ce85eb0ee68 SHA512 69705858ebde1dc9a698915c0d5ed56e1c9d5cb29b919d99eebefe81fdb68d9c17acc58431618410b69cf67ad14e1994ec9ac86530127ca87cdc5603de899137
30 +DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
31 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
32 +DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
33
34 diff --git a/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch
35 new file mode 100644
36 index 000000000000..b90d48c63c33
37 --- /dev/null
38 +++ b/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch
39 @@ -0,0 +1,18 @@
40 +--- a/src/openrct2/config/Config.cpp
41 ++++ b/src/openrct2/config/Config.cpp
42 +@@ -638,6 +638,7 @@
43 + log_verbose("config_find_rct1_path(...)");
44 +
45 + static constexpr u8string_view searchLocations[] = {
46 ++ R"(/usr/share/openrct2/rct1_data)",
47 + R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
48 + R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
49 + R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)",
50 +@@ -683,6 +684,7 @@
51 + log_verbose("config_find_rct2_path(...)");
52 +
53 + static constexpr u8string_view searchLocations[] = {
54 ++ R"(/usr/share/openrct2/rct2_data)",
55 + R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)",
56 + R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)",
57 + R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)",
58
59 diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-0.4.0.ebuild
60 similarity index 91%
61 copy from games-simulation/openrct2/openrct2-9999.ebuild
62 copy to games-simulation/openrct2/openrct2-0.4.0.ebuild
63 index 293da48f84c1..4a5b89ba4216 100644
64 --- a/games-simulation/openrct2/openrct2-9999.ebuild
65 +++ b/games-simulation/openrct2/openrct2-0.4.0.ebuild
66 @@ -3,31 +3,31 @@
67
68 EAPI=8
69
70 -inherit cmake git-r3 readme.gentoo-r1 xdg-utils
71 -
72 -EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
73 -EGIT_BRANCH="develop"
74 +inherit cmake readme.gentoo-r1 xdg-utils
75
76 MY_PN="OpenRCT2"
77 MY_PN_OBJ="objects"
78 MY_PN_RPL="replays"
79 MY_PN_TS="title-sequences"
80 -MY_PV_OBJ="1.2.4"
81 -MY_PV_RPL="0.0.62"
82 -MY_PV_TS="0.1.2c"
83 +MY_PV_OBJ="1.2.7"
84 +MY_PV_RPL="0.0.67"
85 +MY_PV_TS="0.4.0"
86
87 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
88 HOMEPAGE="https://openrct2.org/"
89 SRC_URI="
90 + https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
91 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
92 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
93 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 )
94 "
95 +S="${WORKDIR}/${MY_PN}-${PV}"
96
97 LICENSE="GPL-3"
98 SLOT="0"
99 -KEYWORDS=""
100 +KEYWORDS="~amd64 ~arm ~arm64 ~x86"
101 IUSE="dedicated +lightfx +opengl scripting test +truetype"
102 +RESTRICT="!test? ( test )"
103
104 COMMON_DEPEND="
105 dev-libs/icu:=
106 @@ -68,15 +68,13 @@ BDEPEND="
107 virtual/pkgconfig
108 "
109
110 -RESTRICT="!test? ( test )"
111 -
112 PATCHES=(
113 - "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
114 "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
115 + "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
116 )
117
118 src_unpack() {
119 - git-r3_src_unpack
120 + unpack "${P}".tar.gz
121
122 mkdir -p "${S}"/data/sequence || die
123 cd "${S}"/data/sequence || die
124
125 diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
126 index 293da48f84c1..cd60805a4bee 100644
127 --- a/games-simulation/openrct2/openrct2-9999.ebuild
128 +++ b/games-simulation/openrct2/openrct2-9999.ebuild
129 @@ -12,9 +12,9 @@ MY_PN="OpenRCT2"
130 MY_PN_OBJ="objects"
131 MY_PN_RPL="replays"
132 MY_PN_TS="title-sequences"
133 -MY_PV_OBJ="1.2.4"
134 -MY_PV_RPL="0.0.62"
135 -MY_PV_TS="0.1.2c"
136 +MY_PV_OBJ="1.2.7"
137 +MY_PV_RPL="0.0.67"
138 +MY_PV_TS="0.4.0"
139
140 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
141 HOMEPAGE="https://openrct2.org/"
142 @@ -71,8 +71,8 @@ BDEPEND="
143 RESTRICT="!test? ( test )"
144
145 PATCHES=(
146 - "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
147 "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
148 + "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
149 )
150
151 src_unpack() {
Report Message
Find on MARC Find on Google Groups