CVS commit: pkgsrc/games/openrct2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/openrct2
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Mon, 17 Jul 2023 19:41:15 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Jul 17 19:41:15 UTC 2023

Modified Files:
        pkgsrc/games/openrct2: Makefile PLIST distinfo
        pkgsrc/games/openrct2/patches: patch-src_openrct2_CMakeLists.txt
            patch-src_openrct2_common.h
Removed Files:
        pkgsrc/games/openrct2/patches:
            patch-src_openrct2-ui_UiContext.Linux.cpp
            patch-src_openrct2_Version.h patch-src_openrct2_core_FileStream.hpp
            patch-src_openrct2_platform_Linux.cpp
            patch-src_openrct2_platform_Platform.Linux.cpp

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/games/openrct2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/openrct2/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/openrct2/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/games/openrct2/patches/patch-src_openrct2-ui_UiContext.Linux.cpp \
    pkgsrc/games/openrct2/patches/patch-src_openrct2_Version.h \
    pkgsrc/games/openrct2/patches/patch-src_openrct2_core_FileStream.hpp \
    pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Linux.cpp \
    pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.Linux.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt \
    pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/openrct2/Makefile
diff -u pkgsrc/games/openrct2/Makefile:1.27 pkgsrc/games/openrct2/Makefile:1.28
--- pkgsrc/games/openrct2/Makefile:1.27 Sat May  6 19:09:27 2023
+++ pkgsrc/games/openrct2/Makefile      Mon Jul 17 19:41:15 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2023/05/06 19:09:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2023/07/17 19:41:15 triaxx Exp $
 
-DISTNAME=      openrct2-0.2.4
-PKGREVISION=   24
+DISTNAME=      openrct2-0.2.5
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenRCT2/}
 GITHUB_PROJECT=        OpenRCT2

Index: pkgsrc/games/openrct2/PLIST
diff -u pkgsrc/games/openrct2/PLIST:1.1 pkgsrc/games/openrct2/PLIST:1.2
--- pkgsrc/games/openrct2/PLIST:1.1     Sun Nov 17 16:19:57 2019
+++ pkgsrc/games/openrct2/PLIST Mon Jul 17 19:41:15 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/11/17 16:19:57 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/07/17 19:41:15 triaxx Exp $
 bin/openrct2
 bin/openrct2-cli
 lib/libopenrct2.a
@@ -46,9 +46,13 @@ share/openrct2/language/sv-SE.txt
 share/openrct2/language/tr-TR.txt
 share/openrct2/language/zh-CN.txt
 share/openrct2/language/zh-TW.txt
+share/openrct2/object/official/footpath_item/rct2.dlc.litterpa.parkobj
+share/openrct2/object/official/scenery_small/rct2.dlc.bigpanda.parkobj
+share/openrct2/object/official/scenery_small/rct2.dlc.pandagr.parkobj
 share/openrct2/object/official/station/openrct2.station.noentrance.json
 share/openrct2/object/official/station/openrct2.station.noplatformnoentrance.json
 share/openrct2/object/official/terrain/openrct2.terrain.void.parkobj
+share/openrct2/object/official/water/rct2.dlc.wtrpink.json
 share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.grey.parkobj
 share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.red.parkobj
 share/openrct2/object/rct1/terrain_edge/rct1.aa.edge.yellow.parkobj

Index: pkgsrc/games/openrct2/distinfo
diff -u pkgsrc/games/openrct2/distinfo:1.6 pkgsrc/games/openrct2/distinfo:1.7
--- pkgsrc/games/openrct2/distinfo:1.6  Thu Dec 15 19:26:35 2022
+++ pkgsrc/games/openrct2/distinfo      Mon Jul 17 19:41:15 2023
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.6 2022/12/15 19:26:35 he Exp $
+$NetBSD: distinfo,v 1.7 2023/07/17 19:41:15 triaxx Exp $
 
-BLAKE2s (openrct2-0.2.4.tar.gz) = 3f96cb44eae26acf77605e6e166fd2c85a0632db82a77019feefd5b30c803699
-SHA512 (openrct2-0.2.4.tar.gz) = 956044b5fa5e55256a33f352d2d1e8a4eb6738b98dc9894807b3628b5c5c08f3229c952fbf8b33ad867771f88c6d7e17ad1a8a4e050f8f269a6152d013afce03
-Size (openrct2-0.2.4.tar.gz) = 6805976 bytes
-SHA1 (patch-src_openrct2-ui_UiContext.Linux.cpp) = 36bd777ed772a0f18d76f699214223cc4011da6c
+BLAKE2s (openrct2-0.2.5.tar.gz) = 413448eb8583f33c48b2581b1d006f90802b757a8232983bef3a1416eae92ded
+SHA512 (openrct2-0.2.5.tar.gz) = 8ab091788a52408ef37d603581841a12ffbe5a5eced43504d8e19e89d26b1320010dc0b4a4b67080260e66e24edeb2c780d7bad9b88b58e6a7216f4e393fc516
+Size (openrct2-0.2.5.tar.gz) = 11076466 bytes
 SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa
-SHA1 (patch-src_openrct2_CMakeLists.txt) = a0553c147661396405a607f5ef62f10fc9b55f6c
-SHA1 (patch-src_openrct2_Version.h) = 5402d56aaedcac51d333d95c49f88472d9de7e91
-SHA1 (patch-src_openrct2_common.h) = 4e9458b7768291d11599f66a12e5587b8bba8a8a
-SHA1 (patch-src_openrct2_core_FileStream.hpp) = b1b69a0cb86207fd0c9d25beda3a063ee232b4fe
-SHA1 (patch-src_openrct2_platform_Linux.cpp) = 9562e6a0314a1c37192e8715bac39e1d9fd7faba
-SHA1 (patch-src_openrct2_platform_Platform.Linux.cpp) = 426b2bcbb6bf59d5093cbc27ef3f638a054cf1e8
+SHA1 (patch-src_openrct2_CMakeLists.txt) = e5d8b9484589e69e4dce9f956b2803c555a029aa
+SHA1 (patch-src_openrct2_common.h) = dee58353ac3f55895ccd958bc6a78cf339303dfd
 SHA1 (patch-src_openrct2_platform_Platform2.h) = 36da0bf860735b771837a949e67bcfe95380c684
 SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3
 SHA1 (patch-src_openrct2_util_Util.cpp) = 4086d3a99c24581f82f950ad87b7a0e5f94b9e40

Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt
diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt:1.1 pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt:1.2
--- pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt:1.1 Sat May 30 20:47:08 2020
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt     Mon Jul 17 19:41:15 2023
@@ -1,18 +1,21 @@
-$NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.1 2020/05/30 20:47:08 joerg Exp $
+$NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.2 2023/07/17 19:41:15 triaxx Exp $
 
---- src/openrct2/CMakeLists.txt.orig   2020-05-27 23:23:58.110984083 +0000
+GCC 9 does not require linking with -lstdc++fs to use types and functions in
+<filesystem> now (https://gcc.gnu.org/gcc-9/changes.html).
+
+--- src/openrct2/CMakeLists.txt.orig   2020-03-24 20:46:30.000000000 +0000
 +++ src/openrct2/CMakeLists.txt
-@@ -143,13 +143,6 @@ if (NOT MINGW AND NOT MSVC)
-     endif ()
- endif ()
+@@ -17,13 +17,6 @@ add_library(${PROJECT_NAME} ${OPENRCT2_C
+ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+ SET_CHECK_CXX_FLAGS(${PROJECT_NAME})
  
--if (NOT APPLE AND NOT MINGW AND NOT MSVC)
--    # This is ugly hack to work around https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899.
--    # Once C++17 is enabled (and thus old compilers are no longer supported, this needs to be gone.
--    # We cannot simply detect the _compiler_ version, as the bug exists with the C++ _library_
--    target_link_libraries(${PROJECT_NAME} gcc_s gcc)
--endif ()
+-# GCC / Clang likes us to pass the -lstdc++fs flag to link C++17 filesystem implementation.
+-if (NOT MINGW)
+-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-        target_link_libraries(${PROJECT_NAME} stdc++fs)
+-    endif()
+-endif()
 -
- if (NOT DISABLE_TTF)
-     if (STATIC)
-         target_link_libraries(${PROJECT_NAME} ${FREETYPE_STATIC_LIBRARIES})
+ if (NOT DISABLE_NETWORK OR NOT DISABLE_HTTP)
+     if (WIN32)
+         target_link_libraries(${PROJECT_NAME} bcrypt)
Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h
diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h:1.1 pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h:1.2
--- pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h:1.1       Thu Dec 15 19:26:35 2022
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h   Mon Jul 17 19:41:15 2023
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_openrct2_common.h,v 1.1 2022/12/15 19:26:35 he Exp $
+$NetBSD: patch-src_openrct2_common.h,v 1.2 2023/07/17 19:41:15 triaxx Exp $
 
 Take a stab at supporting big-endian ports.
 
 --- src/openrct2/common.h.orig 2019-10-28 20:18:47.000000000 +0000
 +++ src/openrct2/common.h
-@@ -73,6 +73,12 @@ const constexpr auto ror64 = ror<uint64_
+@@ -92,6 +92,12 @@ const constexpr auto ror64 = ror<uint64_
  #        define HIBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF))
  #    endif // __BYTE_ORDER__
  
 +#    if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#      define RCT2_ENDIANESS __ORDER_BIG_ENDIAN__
-+#      define LOBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF))
-+#      define HIBYTE(w) ((uint8_t)(w))
++#        define RCT2_ENDIANESS __ORDER_BIG_ENDIAN__
++#        define LOBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF))
++#        define HIBYTE(w) ((uint8_t)(w))
 +#    endif
 +
  #    ifndef RCT2_ENDIANESS

Prev by Date: CVS commit: pkgsrc/parallel/py-threadpoolctl
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/parallel/py-threadpoolctl
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index