pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/openrct2
Module Name: pkgsrc
Committed By: triaxx
Date: Sun Aug 20 20:02:49 UTC 2023
Modified Files:
pkgsrc/games/openrct2: Makefile PLIST distinfo
pkgsrc/games/openrct2/patches: patch-src_openrct2_CMakeLists.txt
patch-src_openrct2_common.h
patch-src_openrct2_platform_Platform.macOS.mm
patch-src_openrct2_util_Util.cpp
Log Message:
openrct2: Update to 0.3.3
upstream changes:
-----------------
0.3.3 (2021-03-13)
------------------------------------------------------------------------
- Feature: [#6677] Add Discord RPC to macOS builds.
- Feature: [#6844] Enhanced track designer with ability to add/remove scenery and footpaths.
- Feature: [#7059] Landscape doors for the Ghost Train.
- Feature: [#11859] Add on-ride photo section to Air Powered Vertical and Reverse Freefall Coaster.
- Feature: [#12307] Allow extraction of GOG installer via innoextract (for Linux users).
- Feature: [#13057] Make GameAction flags accessible by plugins.
- Feature: [#13078] [Plugin] Add colour picker widget.
- Feature: [#13376] Open custom window at specified tab.
- Feature: [#13384] [Plugin] Expose all TileElement data.
- Feature: [#13398] Add pause button to the Track Designer.
- Feature: [#13436] macOS: use new icon that matches Big Sur's style.
- Feature: [#13495] [Plugin] Add properties for park value, guests and company value.
- Feature: [#13509] [Plugin] Add ability to format strings using OpenRCT2 string framework.
- Feature: [#13512] [Plugin] Add item separators to list view.
- Feature: [#13583] [Plugin] Add allowed_hosts to plugin section of config.
- Feature: [#13593] [Plugin] Add ability to read and change the position of ride vehicles.
- Feature: [#13613] Add single-rail roller coaster (Rocky Mountain Construction Raptor).
- Feature: [#13614] Add terrain surfaces from RollerCoaster Tycoon 1.
- Feature: [#13675] [Plugin] Add context.setInterval and context.setTimeout.
- Feature: [#13848] Replace shortcut engine allowing multiple bindings from different input devices.
- Feature: [#13927] [Plugin] Add isVisible and text box widget.
- Feature: [#13965] Make ride construction shortcuts work for footpath, too.
- Feature: [#13969] [Plugin] Add APIs for editing title sequences.
- Feature: [#14002] [Plugin] Use allowed_hosts when checking the binding IP for listening.
- Feature: [#14059] [Plugin] Add optional filter to custom tools.
- Feature: [#14142] [Plugin] Add option for taking transparent screenshots.
- Feature: [#14171] [Plugin] Add API for getting network traffic statistics.
- Feature: [#14171] [Plugin] Add API for creating custom widgets.
- Feature: [#14171] [Plugin] Add API for drawing graphics for custom widgets.
- Feature: [#14171] [Plugin] Add click event to spinners and allow them to be held down.
- Feature: [#14252] [Plugin] Add API for vehicle g-forces.
- Change: [#13346] [Plugin] Renamed FootpathScenery to FootpathAddition, fix typos.
- Change: [#13857] Change Rotation Control Toggle to track element number 256
- Fix: [#4605, #11912] Water palettes are not updated properly when selected in Object Selection.
- Fix: [#7772] Hacked vehicles may incorrectly not mark a vehicle object as in use causing accidental removal when remove_unused_objects is used.
- Fix: [#9631, #10716] Banners drawing glitches when there are more than 32 on the screen at once.
- Fix: [#11438] Freeze when shrinking map size.
- Fix: [#11484] Console output does not properly return to column 0 after line ending.
- Fix: [#12895] Mechanics are called to repair rides that have already been fixed.
- Fix: [#13048] Keyboard mute button interpreted as `C` key.
- Fix: [#13102] Underflow on height chart (Ride measurements).
- Fix: [#13234] Incorrect vehicle mass after using Remove All Guests cheat.
- Fix: [#13236] New ride type appears as new vehicle type in research.
- Fix: [#13257] Rides that are exactly the minimum objective length are not counted.
- Fix: [#13334] Uninitialised variables in CustomTabDesc.
- Fix: [#13342] Rename tabChange to onTabChange in WindowDesc interface.
- Fix: [#13427] Newly created Go-Karts show “Race won by <blank>”.
- Fix: [#13431] [Plugin] UI disabled widgets can still be interacted with.
- Fix: [#13454] Plug-ins do not load on Windows if the user directory contains non-ASCII characters.
- Fix: [#13466] “Build 5 roller coasters” excitement corrupted in Park window.
- Fix: [#13469] Exception thrown from plugin in context.subscribe.
- Fix: [#13477] Plug-in widget tooltips do not work.
- Fix: [#13489] Mechanics continue heading to inspect broken down rides.
- Fix: [#13510] [Plugin] list view scroll resets when items is set.
- Fix: [#13574] Crash when a JSON object does not set `originalId`.
- Fix: [#13832] Players last action position is invalid on opening/closing a ride in multiplayer.
- Fix: [#13937] Pathfinding gets confused when two entrances/exits from the same ride are on top of each other.
- Fix: [#13961] Animation for Guests sliding down Spiral Slide is missing on close zoom levels.
- Fix: [#14012] 'Finish 5 roller coasters' goal is listed incorrectly in scenario selector.
- Fix: [#14095] Holding down [-][+] buttons does not decrease/increase number of circuits.
- Fix: [#14225] Desync when “allow early scenario completion” is enabled.
- Fix: [#14247] Scenarios from RCT1 allow hiring too many staff.
- Improved: [#6022] Allow up to 128 ride objects to be selected in track designer.
- Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths.
- Improved: [#13386] A GUI error message is now displayed if the language files are missing.
- Improved: [#14193] [Plugin] Add TileElement union type and use it in Tile interface instead of BaseTileElement.
- Improved: [#14193] [Plugin] Add exact type field to each TileElement, add type field to WidgetBase.
- Improved: [#14193] [Plugin] Change single quotes to double quotes in openrct2.d.ts.
- Removed: [#13423] Built-in explode guests cheat (replaced by plug-in).
- Removed: [#14186] Network traffic window (replaced by plug-in).
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/games/openrct2/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/openrct2/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/openrct2/distinfo
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp
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.35 pkgsrc/games/openrct2/Makefile:1.36
--- pkgsrc/games/openrct2/Makefile:1.35 Sat Aug 12 15:13:06 2023
+++ pkgsrc/games/openrct2/Makefile Sun Aug 20 20:02:49 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2023/08/12 15:13:06 triaxx Exp $
+# $NetBSD: Makefile,v 1.36 2023/08/20 20:02:49 triaxx Exp $
-DISTNAME= openrct2-0.3.2
+DISTNAME= openrct2-0.3.3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/}
GITHUB_PROJECT= OpenRCT2
@@ -19,6 +19,9 @@ USE_LANGUAGES= c c++17
GCC_REQD+= 9
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_AR="/usr/bin/ar"
+CMAKE_ARGS+= -DDISABLE_DISCORD_RPC=ON
+CMAKE_ARGS+= -DDISABLE_GOOGLE_BENCHMARK=ON
CXXFLAGS+= -DORCT2_RESOURCE_DIR=\"${PREFIX}/share/openrct2\"
Index: pkgsrc/games/openrct2/PLIST
diff -u pkgsrc/games/openrct2/PLIST:1.6 pkgsrc/games/openrct2/PLIST:1.7
--- pkgsrc/games/openrct2/PLIST:1.6 Sat Aug 12 15:13:06 2023
+++ pkgsrc/games/openrct2/PLIST Sun Aug 20 20:02:49 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/08/12 15:13:06 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.7 2023/08/20 20:02:49 triaxx Exp $
bin/openrct2
bin/openrct2-cli
lib/libopenrct2.a
@@ -61,7 +61,6 @@ share/openrct2/object/official/scenery_s
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/wall/official.mg-prar.parkobj
share/openrct2/object/official/water/rct2.dlc.wtrpink.json
Index: pkgsrc/games/openrct2/distinfo
diff -u pkgsrc/games/openrct2/distinfo:1.12 pkgsrc/games/openrct2/distinfo:1.13
--- pkgsrc/games/openrct2/distinfo:1.12 Sat Aug 12 15:13:06 2023
+++ pkgsrc/games/openrct2/distinfo Sun Aug 20 20:02:49 2023
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.12 2023/08/12 15:13:06 triaxx Exp $
+$NetBSD: distinfo,v 1.13 2023/08/20 20:02:49 triaxx Exp $
-BLAKE2s (openrct2-0.3.2.tar.gz) = 6debbf407dcf0e61e5fbac619dd1edecd204b1120708c99e965d5a52b8e54034
-SHA512 (openrct2-0.3.2.tar.gz) = e9986ce1fb7e57b4ac80b1de6c99f6b9d26a7a37b4e7fe081528f4faac41833871f9bcf8df864302b8d902271561fc44e606acf8d9adfaf789f69fbc4ae379a7
-Size (openrct2-0.3.2.tar.gz) = 12749225 bytes
+BLAKE2s (openrct2-0.3.3.tar.gz) = 638d604cdae3986a9b79dbf1edf1c2f1f917286ab8b4f71f8db1438c99910151
+SHA512 (openrct2-0.3.3.tar.gz) = de270f043aa9c0c8955eda060c52e430556f212443f4ebb01d2a19012ad84ae81547b65a906bbcf4f04e7a816477abbd05866ddd635903194f6444e8c3cc58f8
+Size (openrct2-0.3.3.tar.gz) = 14107179 bytes
SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa
-SHA1 (patch-src_openrct2_CMakeLists.txt) = 065da10b53f1bcf8c0a66f82f7b1f96fa3735631
-SHA1 (patch-src_openrct2_common.h) = e041bf7afab0d400b0860811e21bdc35503de573
+SHA1 (patch-src_openrct2_CMakeLists.txt) = c423e635fa9dfcba8aca8c30ca427e6729200b0f
+SHA1 (patch-src_openrct2_common.h) = d6575cff0c1f8c969b13f9b6ce4dd28e4bae29e5
SHA1 (patch-src_openrct2_platform_Platform.Linux.cpp) = d8ddd15b91baff6041b4bd85ca8ea3dd6742b6c3
-SHA1 (patch-src_openrct2_platform_Platform.macOS.mm) = 8d753476ba13cc47d111ebb6de38605e604c3a9d
+SHA1 (patch-src_openrct2_platform_Platform.macOS.mm) = c7558e67add17fc903c8f3172c45b369b931717b
SHA1 (patch-src_openrct2_platform_Platform2.h) = 9fbb80288cf40f626658469a3a33c0cc7b57141f
SHA1 (patch-src_openrct2_platform_Posix.cpp) = e14eb94c05ec12b7c641359b5611018a98240bc8
-SHA1 (patch-src_openrct2_util_Util.cpp) = aaebb6b69cdb560a6db44fc8acc19bf23c576801
+SHA1 (patch-src_openrct2_util_Util.cpp) = 0eb88757667a1bf9e341d1bb8ef78a9715243344
Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt
diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt:1.5 pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt:1.6
--- pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt:1.5 Mon Jul 24 08:42:53 2023
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt Sun Aug 20 20:02:49 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.5 2023/07/24 08:42:53 triaxx Exp $
+$NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.6 2023/08/20 20:02:49 triaxx Exp $
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-09-27 20:57:34.000000000 +0000
+++ src/openrct2/CMakeLists.txt
-@@ -22,13 +22,6 @@ add_library(${PROJECT_NAME} ${OPENRCT2_C
+@@ -25,13 +25,6 @@ add_library(${PROJECT_NAME} ${OPENRCT2_C
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
SET_CHECK_CXX_FLAGS(${PROJECT_NAME})
Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h
diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h:1.4 pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h:1.5
--- pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h:1.4 Sat Jul 22 10:55:16 2023
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h Sun Aug 20 20:02:49 2023
@@ -1,19 +1,19 @@
-$NetBSD: patch-src_openrct2_common.h,v 1.4 2023/07/22 10:55:16 triaxx Exp $
+$NetBSD: patch-src_openrct2_common.h,v 1.5 2023/08/20 20:02:49 triaxx Exp $
-Take a stab at supporting big-endian ports.
+Add big endian support.
---- src/openrct2/common.h.orig 2020-08-15 19:13:50.000000000 +0000
+--- src/openrct2/common.h.orig 2021-03-13 11:17:05.000000000 +0000
+++ src/openrct2/common.h
-@@ -91,6 +91,12 @@ namespace
- # define LOBYTE(w) (static_cast<uint8_t>(w))
+@@ -92,6 +92,12 @@ namespace
# define HIBYTE(w) (static_cast<uint8_t>((static_cast<uint16_t>(w) >> 8) & 0xFF))
# endif // __BYTE_ORDER__
-+
+
+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+# define RCT2_ENDIANESS __ORDER_BIG_ENDIAN__
+# define LOBYTE(w) (static_cast<uint8_t>((static_cast<uint16_t>(w) >> 8) & 0xFF))
+# define HIBYTE(w) (static_cast<uint8_t>(w))
+# endif
-
- # ifndef RCT2_ENDIANESS
- # error Unknown endianess!
++
+ # ifndef RCT2_ENDIANNESS
+ # error Unknown endianness!
+ # endif // RCT2_ENDIANNESS
Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm
diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm:1.1 pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm:1.2
--- pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm:1.1 Sun Jul 23 21:15:43 2023
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm Sun Aug 20 20:02:49 2023
@@ -1,26 +1,29 @@
-$NetBSD: patch-src_openrct2_platform_Platform.macOS.mm,v 1.1 2023/07/23 21:15:43 triaxx Exp $
+$NetBSD: patch-src_openrct2_platform_Platform.macOS.mm,v 1.2 2023/08/20 20:02:49 triaxx Exp $
Support pkgsrc.
---- src/openrct2/platform/Platform.macOS.mm.orig 2020-08-15 19:13:50.000000000 +0000
+--- src/openrct2/platform/Platform.macOS.mm.orig 2021-03-13 11:17:05.000000000 +0000
+++ src/openrct2/platform/Platform.macOS.mm
-@@ -73,18 +73,7 @@ namespace Platform
- }
- else
- {
-- auto exePath = GetCurrentExecutablePath();
-- auto exeDirectory = Path::GetDirectory(exePath);
-- path = Path::Combine(exeDirectory, "data");
-- NSString* nsPath = [NSString stringWithUTF8String:path.c_str()];
-- if (![[NSFileManager defaultManager] fileExistsAtPath:nsPath])
-- {
-- path = GetBundlePath();
-- if (path.empty())
-- {
-- path = "/";
+@@ -89,21 +89,7 @@ namespace Platform
+ }
+ else
+ {
+- // this is not in an app bundle
+- auto exePath = GetCurrentExecutablePath();
+- auto exeDirectory = Path::GetDirectory(exePath);
+-
+- // check build and install paths
+- NSArray *dataSearchLocations = @[@"data", @"../share/openrct2"];
+-
+- for (NSString *searchLocation in dataSearchLocations) {
+- path = Path::Combine(exeDirectory, [searchLocation UTF8String]);
+- NSString* nsPath = [NSString stringWithUTF8String:path.c_str()];
+- if ([[NSFileManager defaultManager] fileExistsAtPath:nsPath])
+- {
+- return path;
+- }
- }
-- }
-+ path = "@PREFIX@/share/openrct2";
++ return "@PREFIX@/share/openrct2";
+ }
}
- return path;
- }
+ return "/";
Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp
diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp:1.3 pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp:1.4
--- pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp:1.3 Sat Jul 22 10:55:16 2023
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp Sun Aug 20 20:02:49 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_openrct2_util_Util.cpp,v 1.3 2023/07/22 10:55:16 triaxx Exp $
+$NetBSD: patch-src_openrct2_util_Util.cpp,v 1.4 2023/08/20 20:02:49 triaxx Exp $
Support NetBSD.
--- src/openrct2/util/Util.cpp.orig 2020-05-27 23:27:33.350998119 +0000
+++ src/openrct2/util/Util.cpp
-@@ -184,7 +184,7 @@ int32_t bitscanforward(int32_t source)
+@@ -206,7 +206,7 @@ int32_t bitscanforward(int32_t source)
#endif
}
@@ -13,7 +13,7 @@ Support NetBSD.
# include <cpuid.h>
# define OpenRCT2_CPUID_GNUC_X86
#elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008
-@@ -223,7 +223,7 @@ bool sse41_available()
+@@ -245,7 +245,7 @@ bool sse41_available()
bool avx2_available()
{
Home |
Main Index |
Thread Index |
Old Index