Sat Jul 22 02:15:17 2023 UTC ()
openrct2: Update to 0.2.6

upstream changes:
-----------------
0.2.6 (2020-04-17)
------------------------------------------------------------------------
- Feature: [#10925] Show hovered values on finance charts.
- Feature: [#11013] Ctrl+C copies input dialog text to clipboard.
- Feature: [#11218] load_park command for console
- Feature: [#11272] Option for toggling notifications for 'Ride casualties' and 'Stuck or stalled vehicles'.
- Feature: [#11281] add_news_item command for console
- Feature: [#11300] Add powered launch and reverse incline launched shuttle mode to the Stand-Up Roller Coaster (for RCT1 parity).
- Fix: [#475] Water sides drawn incorrectly (original bug).
- Fix: [#6123, #7907, #9472, #11028] Cannot build some track designs with 4 stations (original bug).
- Fix: [#6238] Invalid tile elem iteration in Guest::UpdateUsingBin
- Fix: [#7094] Back wall edge texture in water missing.
- Fix: [#9719] Hacked walls in RCT1 saves are imported incorrectly.
- Fix: [#10372, #10509, #10806] Lift base sections incorrectly exporting, causing various lift related bugs.
- Fix: [#10928] File browser's date column is too narrow.
- Fix: [#10951, #11160] Attempting to place park entrances creates ghost entrances in random locations.
- Fix: [#11005] Company value overflows.
- Fix: [#11027] Third color on walls becomes black when saving.
- Fix: [#11063] Scrolling position persists when switching tabs in the scenery window.
- Fix: [#11106] Crash on getting invalid vehicle index.
- Fix: [#11126] Cannot place Frightmare track design.
- Fix: [#11208] Cannot export parks with RCT2 DLC objects.
- Fix: [#11230] Seat Rotation not imported correctly for hacked rides.
- Fix: [#11225] Replay manager cannot handle track designs.
- Fix: [#11246] Fix Various Import/Export issues with Boat locations, balloon frame number.
- Fix: [#11258] Properly remove format codes from imported strings.
- Fix: [#11286] Fix banner tooltip colour.
- Fix: Small red gardens in RCT1 saves are imported in the wrong colour.
- Improved: [#11157] Slimmer virtual floor lines.


(triaxx)
diff -r1.30 -r1.31 pkgsrc/games/openrct2/Makefile
diff -r1.2 -r1.3 pkgsrc/games/openrct2/PLIST
diff -r1.7 -r1.8 pkgsrc/games/openrct2/distinfo
diff -r1.2 -r1.3 pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt
diff -r1.2 -r1.3 pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h
diff -r1.1 -r1.2 pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h
diff -r1.1 -r1.2 pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp
Sat Jul 22 11:15:17 2023
Tue Jul 18 04:41:15 2023
pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt,v
anoncvs not yet been updated
Sat Jul 22 11:15:17 2023
Tue Jul 18 04:41:15 2023
pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h,v
anoncvs not yet been updated
Sat Jul 22 11:15:17 2023
Mon Jun 26 19:38:34 2023
pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h,v
anoncvs not yet been updated
cvs diff -r1.30 -r1.31 pkgsrc/games/openrct2/Makefile (expand / switch to unified diff)

--- pkgsrc/games/openrct2/Makefile 2023/07/21 22:02:14 1.30
+++ pkgsrc/games/openrct2/Makefile 2023/07/22 02:15:16 1.31
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.30 2023/07/21 22:02:14 nia Exp $ 1# $NetBSD: Makefile,v 1.31 2023/07/22 02:15:16 triaxx Exp $
2 2
3DISTNAME= openrct2-0.2.5 3DISTNAME= openrct2-0.2.6
4CATEGORIES= games 4CATEGORIES= games
5MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/}
6GITHUB_PROJECT= OpenRCT2 6GITHUB_PROJECT= OpenRCT2
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/OpenRCT2/OpenRCT2/ 10HOMEPAGE= https://github.com/OpenRCT2/OpenRCT2/
11COMMENT= Open source reimplementation of RollerCoaster Tycoon 2 11COMMENT= Open source reimplementation of RollerCoaster Tycoon 2
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16USE_LANGUAGES= c c++17 16USE_LANGUAGES= c c++17
17 17
 18GCC_REQD+= 9
18USE_CXX_FEATURES+= c++17 filesystem 19USE_CXX_FEATURES+= c++17 filesystem
19 20
20CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" 21CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
21 22
22CXXFLAGS+= -DORCT2_RESOURCE_DIR=\"${PREFIX}/share/openrct2\" 23CXXFLAGS+= -DORCT2_RESOURCE_DIR=\"${PREFIX}/share/openrct2\"
23 24
24CONFIGURE_DIRS= build 25CONFIGURE_DIRS= build
25CMAKE_ARG_PATH= .. 26CMAKE_ARG_PATH= ..
26 27
27BUILDLINK_TRANSFORM+= rm:-Werror 28BUILDLINK_TRANSFORM+= rm:-Werror
28 29
29# XXX it cannot be built without an Internet connection. 30# XXX it cannot be built without an Internet connection.
30# Fails during install stage: 31# Fails during install stage:
cvs diff -r1.2 -r1.3 pkgsrc/games/openrct2/PLIST (expand / switch to unified diff)

--- pkgsrc/games/openrct2/PLIST 2023/07/17 19:41:15 1.2
+++ pkgsrc/games/openrct2/PLIST 2023/07/22 02:15:16 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2023/07/17 19:41:15 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.3 2023/07/22 02:15:16 triaxx Exp $
2bin/openrct2 2bin/openrct2
3bin/openrct2-cli 3bin/openrct2-cli
4lib/libopenrct2.a 4lib/libopenrct2.a
5man/man6/openrct2.6 5man/man6/openrct2.6
6share/applications/openrct2-savegame.desktop 6share/applications/openrct2-savegame.desktop
7share/applications/openrct2-scenario.desktop 7share/applications/openrct2-scenario.desktop
8share/applications/openrct2-uri.desktop 8share/applications/openrct2-uri.desktop
9share/applications/openrct2.desktop 9share/applications/openrct2.desktop
10share/doc/openrct2/changelog.txt 10share/doc/openrct2/changelog.txt
11share/doc/openrct2/contributors.md 11share/doc/openrct2/contributors.md
12share/doc/openrct2/licence.txt 12share/doc/openrct2/licence.txt
13share/doc/openrct2/readme.txt 13share/doc/openrct2/readme.txt
14share/icons/hicolor/128x128/apps/openrct2.png 14share/icons/hicolor/128x128/apps/openrct2.png
cvs diff -r1.7 -r1.8 pkgsrc/games/openrct2/distinfo (expand / switch to unified diff)

--- pkgsrc/games/openrct2/distinfo 2023/07/17 19:41:15 1.7
+++ pkgsrc/games/openrct2/distinfo 2023/07/22 02:15:16 1.8
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.7 2023/07/17 19:41:15 triaxx Exp $ 1$NetBSD: distinfo,v 1.8 2023/07/22 02:15:16 triaxx Exp $
2 2
3BLAKE2s (openrct2-0.2.5.tar.gz) = 413448eb8583f33c48b2581b1d006f90802b757a8232983bef3a1416eae92ded 3BLAKE2s (openrct2-0.2.6.tar.gz) = ebf606cb7bac239ed2c137c14eca364c3ae4bfa96944921781eff3ace486da12
4SHA512 (openrct2-0.2.5.tar.gz) = 8ab091788a52408ef37d603581841a12ffbe5a5eced43504d8e19e89d26b1320010dc0b4a4b67080260e66e24edeb2c780d7bad9b88b58e6a7216f4e393fc516 4SHA512 (openrct2-0.2.6.tar.gz) = abe7c344b7588b169c95ffe0ab9028f72614d9b5783d81fa4f97f206d90d8cbaa0b91f04314c10926dbd5f68bba166558c428557f598abb343d306800611fb24
5Size (openrct2-0.2.5.tar.gz) = 11076466 bytes 5Size (openrct2-0.2.6.tar.gz) = 11094308 bytes
6SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa 6SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa
7SHA1 (patch-src_openrct2_CMakeLists.txt) = e5d8b9484589e69e4dce9f956b2803c555a029aa 7SHA1 (patch-src_openrct2_CMakeLists.txt) = 174dfe359939980347082a9bae7b505680d0f900
8SHA1 (patch-src_openrct2_common.h) = dee58353ac3f55895ccd958bc6a78cf339303dfd 8SHA1 (patch-src_openrct2_common.h) = 32bb78f825307e59067f365b7af2484c69ca4b97
9SHA1 (patch-src_openrct2_platform_Platform2.h) = 36da0bf860735b771837a949e67bcfe95380c684 9SHA1 (patch-src_openrct2_platform_Platform2.h) = 6615ab04abccfe6e00fac3f779dd25ff17041a7c
10SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3 10SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3
11SHA1 (patch-src_openrct2_util_Util.cpp) = 4086d3a99c24581f82f950ad87b7a0e5f94b9e40 11SHA1 (patch-src_openrct2_util_Util.cpp) = aaebb6b69cdb560a6db44fc8acc19bf23c576801
cvs diff -r1.2 -r1.3 pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt 2023/07/17 19:41:15 1.2
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt 1.3
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1$NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.2 2023/07/17 19:41:15 triaxx Exp $ 
2 
3GCC 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 
7+++ src/openrct2/CMakeLists.txt 
8@@ -17,13 +17,6 @@ add_library(${PROJECT_NAME} ${OPENRCT2_C 
9 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") 
10 SET_CHECK_CXX_FLAGS(${PROJECT_NAME}) 
11  
12-# GCC / Clang likes us to pass the -lstdc++fs flag to link C++17 filesystem implementation. 
13-if (NOT MINGW) 
14- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 
15- target_link_libraries(${PROJECT_NAME} stdc++fs) 
16- endif() 
17-endif() 
18- 
19 if (NOT DISABLE_NETWORK OR NOT DISABLE_HTTP) 
20 if (WIN32) 
21 target_link_libraries(${PROJECT_NAME} bcrypt) 
cvs diff -r1.2 -r1.3 pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h (expand / switch to unified diff)

--- pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h 2023/07/17 19:41:15 1.2
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_common.h 1.3
@@ -1,19 +0,0 @@ @@ -1,19 +0,0 @@
1$NetBSD: patch-src_openrct2_common.h,v 1.2 2023/07/17 19:41:15 triaxx Exp $ 
2 
3Take a stab at supporting big-endian ports. 
4 
5--- src/openrct2/common.h.orig 2019-10-28 20:18:47.000000000 +0000 
6+++ src/openrct2/common.h 
7@@ -92,6 +92,12 @@ const constexpr auto ror64 = ror<uint64_ 
8 # define HIBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF)) 
9 # endif // __BYTE_ORDER__ 
10  
11+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 
12+# define RCT2_ENDIANESS __ORDER_BIG_ENDIAN__ 
13+# define LOBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF)) 
14+# define HIBYTE(w) ((uint8_t)(w)) 
15+# endif 
16+ 
17 # ifndef RCT2_ENDIANESS 
18 # error Unknown endianess! 
19 # endif // RCT2_ENDIANESS 
cvs diff -r1.1 -r1.2 pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h (expand / switch to unified diff)

--- pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h 2019/11/17 16:19:57 1.1
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h 1.2
@@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
1$NetBSD: patch-src_openrct2_platform_Platform2.h,v 1.1 2019/11/17 16:19:57 nia Exp $ 
2 
3Support NetBSD. 
4 
5--- src/openrct2/platform/Platform2.h.orig 2019-10-28 20:18:47.000000000 +0000 
6+++ src/openrct2/platform/Platform2.h 
7@@ -33,7 +33,7 @@ namespace Platform 
8 std::string GetDocsPath(); 
9 std::string GetCurrentExecutablePath(); 
10  
11-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) 
12+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) || defined(__NetBSD__) 
13 std::string GetEnvironmentPath(const char* name); 
14 std::string GetHomePath(); 
15 #endif 
cvs diff -r1.1 -r1.2 pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp (expand / switch to unified diff)

--- pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp 2020/05/30 20:47:08 1.1
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp 2023/07/22 02:15:16 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-src_openrct2_util_Util.cpp,v 1.1 2020/05/30 20:47:08 joerg Exp $ 1$NetBSD: patch-src_openrct2_util_Util.cpp,v 1.2 2023/07/22 02:15:16 triaxx Exp $
 2
 3Support NetBSD.
2 4
3--- src/openrct2/util/Util.cpp.orig 2020-05-27 23:27:33.350998119 +0000 5--- src/openrct2/util/Util.cpp.orig 2020-05-27 23:27:33.350998119 +0000
4+++ src/openrct2/util/Util.cpp 6+++ src/openrct2/util/Util.cpp
5@@ -184,7 +184,7 @@ int32_t bitscanforward(int32_t source) 7@@ -184,7 +184,7 @@ int32_t bitscanforward(int32_t source)
6 #endif 8 #endif
7 } 9 }
8  10
9-#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) 11-#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
10+#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__clang__) 12+#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__clang__)
11 # include <cpuid.h> 13 # include <cpuid.h>
12 # define OpenRCT2_CPUID_GNUC_X86 14 # define OpenRCT2_CPUID_GNUC_X86
13 #elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008 15 #elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008
14@@ -223,7 +223,7 @@ bool sse41_available() 16@@ -223,7 +223,7 @@ bool sse41_available()