openrct2: Update to 0.2.5 pkgsrc changes: --------------- * Remove patches which have been merged upstream. * Update versions incrementally since the last one does not work. upstream changes: ----------------- 0.2.5 (2020-03-24) ------------------------------------------------------------------------ - Feature: [#3154] Use a random title sequence each time it is shown. - Feature: [#6553] Android version now runs in full screen. - Feature: [#7865] Transport rides can now be synchronised. - Feature: [#9073] Shortcut keys for the Tile Inspector. - Feature: [#10305] Add two shortcuts for increasing and decreasing the scaling factor. - Feature: [#10189] Make Track Designs work in multiplayer. - Feature: [#10357] Added window for scenery scatter tool, allowing for area and density selection. - Feature: [#10637] Console command to remove all floating objects. - Change: [#1164] Use available translations for shortcut key bindings. - Change: [#10997] Speed is automatically reset to normal upon scenario completion. - Fix: [#2485] Hide Vertical Faces not applied to the edges of water. - Fix: [#5249] No collision detection when building ride entrance at heights > 85.5m. - Fix: [#6766] Changelog window doesn't open on some platforms. - Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour. - Fix: [#7854] Cannot build a custom spiral roller coaster design. - Fix: [#7854] Empty entries in spiral roller coaster designs list. - Fix: [#8151] Game freezes upon demolishing mazes at odd heights. - Fix: [#8875] RCT1 competition scenarios are classified incorrectly. - Fix: [#10176] Mistake in the sprite for the land tool's 6x6 grid. - Fix: [#10196] Doors unable to be placed at end of track corners. - Fix: [#10228] Can't import RCT1 Deluxe from Steam. - Fix: [#10313] Path furniture can be placed on level crossings. - Fix: [#10325] Crash when banners have no text. - Fix: [#10376] No ratings generated when a shop and track intersect. - Fix: [#10420] Money effect causing false positive desync. - Fix: [#10477] Large Scenery cannot be placed higher using SHIFT. - Fix: [#10489] Hosts last player action not being synchronized. - Fix: [#10543] Secondary shop item prices are not imported correctly from RCT1 saves. - Fix: [#10547] RCT1 parks have too many rides available. - Fix: [#10587] Update last action coordinates on correct player. - Fix: [#10631] Game bugs out and crashes if you get too many stations via copying stations with the tile inspector. - Fix: [#10662] Duck cheat tooltips look odd and do not explain anything. - Fix: [#10694] The lift hill speed of the flying roller coaster cannot be changed (original bug). - Fix: [#10705] Apply multithreaded rendering to all viewports. - Fix: [#10739] Mountain tool overlay for even-numbered selections. - Fix: [#10752] Mute button state not correctly set at startup. - Fix: [#10822] Can place too many peep spawns. - Fix: [#10898] Banner text has an offset in tile inspector window. - Fix: [#10904] RCT1/LL-scenarios with red water won't open. - Fix: [#10941] The Clear Scenery tool gives refunds for ghost elements. - Fix: [#10963] Light effects are drawn off-centre in some rotations. - Fix: [#10993] Bottom toolbar not refreshing when a guest leaves the park. - Fix: [#11001] Rides list does not use natural sorting. - Fix: [objects#54] Stage Coach cars are not considered covered by the game. - Fix: [objects#56] Handymen cut grass incorrectly. - Improved: [#682] The staff patrol area is now drawn on the water, instead of on the surface under water. - Improved: [#10858] Added horizontal grid lines to finance charts. - Improved: [#10884] Added y-axes and labels to park window charts. - Improved: [#10970] Introduced optional light effects for vehicles at night. - Removed: [#6898] LOADMM and LOADRCT1 title sequence commands (use LOADSC instead).diff -r1.27 -r1.28 pkgsrc/games/openrct2/Makefile
(triaxx)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.27 2023/05/06 19:09:27 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.28 2023/07/17 19:41:15 triaxx Exp $ | |
2 | 2 | |||
3 | DISTNAME= openrct2-0.2.4 | 3 | DISTNAME= openrct2-0.2.5 | |
4 | PKGREVISION= 24 | |||
5 | CATEGORIES= games | 4 | CATEGORIES= games | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/} | |
7 | GITHUB_PROJECT= OpenRCT2 | 6 | GITHUB_PROJECT= OpenRCT2 | |
8 | GITHUB_TAG= v${PKGVERSION_NOREV} | 7 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://github.com/OpenRCT2/OpenRCT2/ | 10 | HOMEPAGE= https://github.com/OpenRCT2/OpenRCT2/ | |
12 | COMMENT= Open source reimplementation of RollerCoaster Tycoon 2 | 11 | COMMENT= Open source reimplementation of RollerCoaster Tycoon 2 | |
13 | LICENSE= gnu-gpl-v3 | 12 | LICENSE= gnu-gpl-v3 | |
14 | 13 | |||
15 | USE_CMAKE= yes | 14 | USE_CMAKE= yes | |
16 | USE_TOOLS+= pkg-config | 15 | USE_TOOLS+= pkg-config | |
17 | USE_LANGUAGES= c c++17 | 16 | USE_LANGUAGES= c c++17 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1 2019/11/17 16:19:57 nia Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2023/07/17 19:41:15 triaxx Exp $ | |
2 | bin/openrct2 | 2 | bin/openrct2 | |
3 | bin/openrct2-cli | 3 | bin/openrct2-cli | |
4 | lib/libopenrct2.a | 4 | lib/libopenrct2.a | |
5 | man/man6/openrct2.6 | 5 | man/man6/openrct2.6 | |
6 | share/applications/openrct2-savegame.desktop | 6 | share/applications/openrct2-savegame.desktop | |
7 | share/applications/openrct2-scenario.desktop | 7 | share/applications/openrct2-scenario.desktop | |
8 | share/applications/openrct2-uri.desktop | 8 | share/applications/openrct2-uri.desktop | |
9 | share/applications/openrct2.desktop | 9 | share/applications/openrct2.desktop | |
10 | share/doc/openrct2/changelog.txt | 10 | share/doc/openrct2/changelog.txt | |
11 | share/doc/openrct2/contributors.md | 11 | share/doc/openrct2/contributors.md | |
12 | share/doc/openrct2/licence.txt | 12 | share/doc/openrct2/licence.txt | |
13 | share/doc/openrct2/readme.txt | 13 | share/doc/openrct2/readme.txt | |
14 | share/icons/hicolor/128x128/apps/openrct2.png | 14 | share/icons/hicolor/128x128/apps/openrct2.png | |
@@ -36,29 +36,33 @@ share/openrct2/language/fr-FR.txt | @@ -36,29 +36,33 @@ share/openrct2/language/fr-FR.txt | |||
36 | share/openrct2/language/hu-HU.txt | 36 | share/openrct2/language/hu-HU.txt | |
37 | share/openrct2/language/it-IT.txt | 37 | share/openrct2/language/it-IT.txt | |
38 | share/openrct2/language/ja-JP.txt | 38 | share/openrct2/language/ja-JP.txt | |
39 | share/openrct2/language/ko-KR.txt | 39 | share/openrct2/language/ko-KR.txt | |
40 | share/openrct2/language/nb-NO.txt | 40 | share/openrct2/language/nb-NO.txt | |
41 | share/openrct2/language/nl-NL.txt | 41 | share/openrct2/language/nl-NL.txt | |
42 | share/openrct2/language/pl-PL.txt | 42 | share/openrct2/language/pl-PL.txt | |
43 | share/openrct2/language/pt-BR.txt | 43 | share/openrct2/language/pt-BR.txt | |
44 | share/openrct2/language/ru-RU.txt | 44 | share/openrct2/language/ru-RU.txt | |
45 | share/openrct2/language/sv-SE.txt | 45 | share/openrct2/language/sv-SE.txt | |
46 | share/openrct2/language/tr-TR.txt | 46 | share/openrct2/language/tr-TR.txt | |
47 | share/openrct2/language/zh-CN.txt | 47 | share/openrct2/language/zh-CN.txt | |
48 | share/openrct2/language/zh-TW.txt | 48 | share/openrct2/language/zh-TW.txt | |
49 | share/openrct2/object/official/footpath_item/rct2.dlc.litterpa.parkobj | |||
50 | share/openrct2/object/official/scenery_small/rct2.dlc.bigpanda.parkobj | |||
51 | share/openrct2/object/official/scenery_small/rct2.dlc.pandagr.parkobj | |||
49 | share/openrct2/object/official/station/openrct2.station.noentrance.json | 52 | share/openrct2/object/official/station/openrct2.station.noentrance.json | |
50 | share/openrct2/object/official/station/openrct2.station.noplatformnoentrance.json | 53 | share/openrct2/object/official/station/openrct2.station.noplatformnoentrance.json | |
51 | share/openrct2/object/official/terrain/openrct2.terrain.void.parkobj | 54 | share/openrct2/object/official/terrain/openrct2.terrain.void.parkobj | |
55 | share/openrct2/object/official/water/rct2.dlc.wtrpink.json | |||
52 | share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.grey.parkobj | 56 | share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.grey.parkobj | |
53 | share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.red.parkobj | 57 | share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.red.parkobj | |
54 | share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.yellow.parkobj | 58 | share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.yellow.parkobj | |
55 | share/openrct2/object/rct1/terrain_edge/rct1.edge.brick.parkobj | 59 | share/openrct2/object/rct1/terrain_edge/rct1.edge.brick.parkobj | |
56 | share/openrct2/object/rct1/terrain_edge/rct1.edge.iron.parkobj | 60 | share/openrct2/object/rct1/terrain_edge/rct1.edge.iron.parkobj | |
57 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.green.parkobj | 61 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.green.parkobj | |
58 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.purple.parkobj | 62 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.purple.parkobj | |
59 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.skyscrapera.parkobj | 63 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.skyscrapera.parkobj | |
60 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.skyscraperb.parkobj | 64 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.skyscraperb.parkobj | |
61 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.stonebrown.parkobj | 65 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.stonebrown.parkobj | |
62 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.stonegrey.parkobj | 66 | share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.stonegrey.parkobj | |
63 | share/openrct2/object/rct1/terrain_surface/rct1.aa.surface.roofred.parkobj | 67 | share/openrct2/object/rct1/terrain_surface/rct1.aa.surface.roofred.parkobj | |
64 | share/openrct2/object/rct1/terrain_surface/rct1.ll.surface.roofgrey.parkobj | 68 | share/openrct2/object/rct1/terrain_surface/rct1.ll.surface.roofgrey.parkobj |
@@ -1,16 +1,11 @@ | @@ -1,16 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.6 2022/12/15 19:26:35 he Exp $ | 1 | $NetBSD: distinfo,v 1.7 2023/07/17 19:41:15 triaxx Exp $ | |
2 | 2 | |||
3 | BLAKE2s (openrct2-0.2.4.tar.gz) = 3f96cb44eae26acf77605e6e166fd2c85a0632db82a77019feefd5b30c803699 | 3 | BLAKE2s (openrct2-0.2.5.tar.gz) = 413448eb8583f33c48b2581b1d006f90802b757a8232983bef3a1416eae92ded | |
4 | SHA512 (openrct2-0.2.4.tar.gz) = 956044b5fa5e55256a33f352d2d1e8a4eb6738b98dc9894807b3628b5c5c08f3229c952fbf8b33ad867771f88c6d7e17ad1a8a4e050f8f269a6152d013afce03 | 4 | SHA512 (openrct2-0.2.5.tar.gz) = 8ab091788a52408ef37d603581841a12ffbe5a5eced43504d8e19e89d26b1320010dc0b4a4b67080260e66e24edeb2c780d7bad9b88b58e6a7216f4e393fc516 | |
5 | Size (openrct2-0.2.4.tar.gz) = 6805976 bytes | 5 | Size (openrct2-0.2.5.tar.gz) = 11076466 bytes | |
6 | SHA1 (patch-src_openrct2-ui_UiContext.Linux.cpp) = 36bd777ed772a0f18d76f699214223cc4011da6c | |||
7 | SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa | 6 | SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa | |
8 | SHA1 (patch-src_openrct2_CMakeLists.txt) = a0553c147661396405a607f5ef62f10fc9b55f6c | 7 | SHA1 (patch-src_openrct2_CMakeLists.txt) = e5d8b9484589e69e4dce9f956b2803c555a029aa | |
9 | SHA1 (patch-src_openrct2_Version.h) = 5402d56aaedcac51d333d95c49f88472d9de7e91 | 8 | SHA1 (patch-src_openrct2_common.h) = dee58353ac3f55895ccd958bc6a78cf339303dfd | |
10 | SHA1 (patch-src_openrct2_common.h) = 4e9458b7768291d11599f66a12e5587b8bba8a8a | |||
11 | SHA1 (patch-src_openrct2_core_FileStream.hpp) = b1b69a0cb86207fd0c9d25beda3a063ee232b4fe | |||
12 | SHA1 (patch-src_openrct2_platform_Linux.cpp) = 9562e6a0314a1c37192e8715bac39e1d9fd7faba | |||
13 | SHA1 (patch-src_openrct2_platform_Platform.Linux.cpp) = 426b2bcbb6bf59d5093cbc27ef3f638a054cf1e8 | |||
14 | SHA1 (patch-src_openrct2_platform_Platform2.h) = 36da0bf860735b771837a949e67bcfe95380c684 | 9 | SHA1 (patch-src_openrct2_platform_Platform2.h) = 36da0bf860735b771837a949e67bcfe95380c684 | |
15 | SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3 | 10 | SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3 | |
16 | SHA1 (patch-src_openrct2_util_Util.cpp) = 4086d3a99c24581f82f950ad87b7a0e5f94b9e40 | 11 | SHA1 (patch-src_openrct2_util_Util.cpp) = 4086d3a99c24581f82f950ad87b7a0e5f94b9e40 |
@@ -1,18 +1,21 @@ | @@ -1,18 +1,21 @@ | |||
1 | $NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.1 2020/05/30 20:47:08 joerg Exp $ | 1 | $NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.2 2023/07/17 19:41:15 triaxx Exp $ | |
2 | 2 | |||
3 | --- src/openrct2/CMakeLists.txt.orig 2020-05-27 23:23:58.110984083 +0000 | 3 | GCC 9 does not require linking with -lstdc++fs to use types and functions in | |
4 | <filesystem> now (https://gcc.gnu.org/gcc-9/changes.html). | |||
5 | ||||
6 | --- src/openrct2/CMakeLists.txt.orig 2020-03-24 20:46:30.000000000 +0000 | |||
4 | +++ src/openrct2/CMakeLists.txt | 7 | +++ src/openrct2/CMakeLists.txt | |
5 | @@ -143,13 +143,6 @@ if (NOT MINGW AND NOT MSVC) | 8 | @@ -17,13 +17,6 @@ add_library(${PROJECT_NAME} ${OPENRCT2_C | |
6 | endif () | 9 | set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") | |
7 | endif () | 10 | SET_CHECK_CXX_FLAGS(${PROJECT_NAME}) | |
8 | 11 | |||
9 | -if (NOT APPLE AND NOT MINGW AND NOT MSVC) | 12 | -# GCC / Clang likes us to pass the -lstdc++fs flag to link C++17 filesystem implementation. | |
10 | - # This is ugly hack to work around https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899. | 13 | -if (NOT MINGW) | |
11 | - # Once C++17 is enabled (and thus old compilers are no longer supported, this needs to be gone. | 14 | - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | |
12 | - # We cannot simply detect the _compiler_ version, as the bug exists with the C++ _library_ | 15 | - target_link_libraries(${PROJECT_NAME} stdc++fs) | |
13 | - target_link_libraries(${PROJECT_NAME} gcc_s gcc) | 16 | - endif() | |
14 | -endif () | 17 | -endif() | |
15 | - | 18 | - | |
16 | if (NOT DISABLE_TTF) | 19 | if (NOT DISABLE_NETWORK OR NOT DISABLE_HTTP) | |
17 | if (STATIC) | 20 | if (WIN32) | |
18 | target_link_libraries(${PROJECT_NAME} ${FREETYPE_STATIC_LIBRARIES}) | 21 | target_link_libraries(${PROJECT_NAME} bcrypt) |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-src_openrct2_common.h,v 1.1 2022/12/15 19:26:35 he Exp $ | 1 | $NetBSD: patch-src_openrct2_common.h,v 1.2 2023/07/17 19:41:15 triaxx Exp $ | |
2 | 2 | |||
3 | Take a stab at supporting big-endian ports. | 3 | Take a stab at supporting big-endian ports. | |
4 | 4 | |||
5 | --- src/openrct2/common.h.orig 2019-10-28 20:18:47.000000000 +0000 | 5 | --- src/openrct2/common.h.orig 2019-10-28 20:18:47.000000000 +0000 | |
6 | +++ src/openrct2/common.h | 6 | +++ src/openrct2/common.h | |
7 | @@ -73,6 +73,12 @@ const constexpr auto ror64 = ror<uint64_ | 7 | @@ -92,6 +92,12 @@ const constexpr auto ror64 = ror<uint64_ | |
8 | # define HIBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF)) | 8 | # define HIBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF)) | |
9 | # endif // __BYTE_ORDER__ | 9 | # endif // __BYTE_ORDER__ | |
10 | 10 | |||
11 | +# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ | 11 | +# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ | |
12 | +# define RCT2_ENDIANESS __ORDER_BIG_ENDIAN__ | 12 | +# define RCT2_ENDIANESS __ORDER_BIG_ENDIAN__ | |
13 | +# define LOBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF)) | 13 | +# define LOBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF)) | |
14 | +# define HIBYTE(w) ((uint8_t)(w)) | 14 | +# define HIBYTE(w) ((uint8_t)(w)) | |
15 | +# endif | 15 | +# endif | |
16 | + | 16 | + | |
17 | # ifndef RCT2_ENDIANESS | 17 | # ifndef RCT2_ENDIANESS | |
18 | # error Unknown endianess! | 18 | # error Unknown endianess! | |
19 | # endif // RCT2_ENDIANESS | 19 | # endif // RCT2_ENDIANESS |