Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A36D984F5B for ; Sat, 12 Aug 2023 15:13:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YrgKTmnJ-O2B for ; Sat, 12 Aug 2023 15:13:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 55DDB84D55 for ; Sat, 12 Aug 2023 15:13:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 43188FBDB; Sat, 12 Aug 2023 15:13:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1691853187158990" MIME-Version: 1.0 Date: Sat, 12 Aug 2023 15:13:07 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/games/openrct2 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20230812151307.43188FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1691853187158990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: triaxx Date: Sat Aug 12 15:13:07 UTC 2023 Modified Files: pkgsrc/games/openrct2: Makefile PLIST distinfo pkgsrc/games/openrct2/patches: patch-src_openrct2_platform_Platform2.h patch-src_openrct2_platform_Posix.cpp Log Message: openrct2: Update to 0.3.2 upstream changes: ----------------- 0.3.2 (2020-11-01) ------------------------------------------------------------------------ - Feature: [#12110] Add Hybrid Coaster (Rocky Mountain Construction I-Box) track type. - Feature: [#12999] .sea (RCT Classic) scenarios are now listed in the “New Scenario” dialog. - Feature: [#13000] objective_options command for console. - Feature: [#13096] Add Esperanto translation. - Feature: [#13164] Add 'Objective options' to Cheats menu. - Change: [#9568] Change lift sounds of Reverser Roller Coaster and Compact Inverted Coaster to better fitting ones. - Change: [#13160] The lay-out of the Park Cheats tab has been improved. - Fix: [#1324] Last track piece map selection still visible when placing ride entrance or exit (original bug). - Fix: [#3200] Close Construction window upon selecting vehicle page. - Fix: [#4022] Fix Mac cursor offset on launch - Fix: [#4041] Garbled park option on scenario editor with custom theme. - Fix: [#4865] Offer an option to disable inhibiting the monitor power. - Fix: [#5178] Lighting effects cannot be disabled in software mode - Fix: [#5904] Empty errors on tile inspector base height change. - Fix: [#6086] Cannot install existing track design with another name. - Fix: [#6614, #8623] Colours are distorted when using OpenGL with Intel integrated graphics drivers. - Fix: [#7443] Construction arrows pulse at irregular intervals. - Fix: [#7518] Water isn't cut down by view clipping tool. - Fix: [#7748] Tooltips would not timeout for normal UI elements. - Fix: [#8015] RCT2 files are not found when put into the OpenRCT2 folder. - Fix: [#8957] Error title missing when building with insufficient funds - Fix: [#10186] Placing multiple saved rides ignores design name (original bug). - Fix: [#12368] Desync due to ghost station pieces affecting changing ride settings. - Fix: [#12940] Windows cause issues with snow drawing. - Fix: [#13019] Simulated trains sometimes open construction window when they crash. - Fix: [#13021] Mowed grass and weeds don't show up in extra zoom levels. - Fix: [#13024] Console cursor does not correctly render at current cursor position. - Fix: [#13029] Not all Junior Roller Coaster pieces are shown when "Show all track pieces" cheat is enabled. - Fix: [#13044] Rides in RCT1 saves all have "0 customers per hour". - Fix: [#13074] Entrance and exit ghosts for mazes not being removed. - Fix: [#13083] Dialog for renaming conflicting track design crops text out. - Fix: [#13097] Missing direction arrow for stations - Fix: [#13098] UI buttons for entrance and exit don't toggle according to them being built. - Fix: [#13098] Maze can still be constructed while placing entrance and exit (original bug). - Fix: [#13118] Closing construction window resets ride viewport. - Fix: [#13129] Missing error message when waiting for train to leave station on the ride measurements graph. - Fix: [#13138] Fix logical sorting of list windows. - Fix: [#13158] Cursors are drawn incorrectly in text input fields. - Fix: [#13222] Vehicle collision causes negative number of passengers (original bug). - Fix: [#13226, #7280] No error is shown when attempting to load a corrupted save. - Fix: [#13266] Plugin API: Deleting key of sharedStorage not working. - Fix: [#13278] Desync caused by ghost tiles changing the ride mode. - Fix: [#13289] Litter and vomit sometimes not loading with RCT1 saved game or scenario - Fix: [#13292] Impossible excitement rating requirements with finish building 5 coasters goal - Improved: [#13023] Made add_news_item console command last argument, assoc, optional. - Improved: [#13098] Improvements to the maze construction window user interface - Improved: [#13125] Selecting the RCT2 files now uses localised dialogs. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 pkgsrc/games/openrct2/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/openrct2/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/openrct2/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Posix.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1691853187158990 Content-Disposition: inline Content-Length: 6397 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/openrct2/Makefile diff -u pkgsrc/games/openrct2/Makefile:1.34 pkgsrc/games/openrct2/Makefile:1.35 --- pkgsrc/games/openrct2/Makefile:1.34 Mon Jul 24 08:42:53 2023 +++ pkgsrc/games/openrct2/Makefile Sat Aug 12 15:13:06 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2023/07/24 08:42:53 triaxx Exp $ +# $NetBSD: Makefile,v 1.35 2023/08/12 15:13:06 triaxx Exp $ -DISTNAME= openrct2-0.3.1 +DISTNAME= openrct2-0.3.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/} GITHUB_PROJECT= OpenRCT2 @@ -19,7 +19,6 @@ USE_LANGUAGES= c c++17 GCC_REQD+= 9 CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" -CMAKE_ARGS+= -DENABLE_SCRIPTING=OFF CXXFLAGS+= -DORCT2_RESOURCE_DIR=\"${PREFIX}/share/openrct2\" @@ -57,6 +56,7 @@ pre-configure: .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../lang/libduktape/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/icu/buildlink3.mk" Index: pkgsrc/games/openrct2/PLIST diff -u pkgsrc/games/openrct2/PLIST:1.5 pkgsrc/games/openrct2/PLIST:1.6 --- pkgsrc/games/openrct2/PLIST:1.5 Mon Jul 24 08:42:53 2023 +++ pkgsrc/games/openrct2/PLIST Sat Aug 12 15:13:06 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2023/07/24 08:42:53 triaxx Exp $ +@comment $NetBSD: PLIST,v 1.6 2023/08/12 15:13:06 triaxx Exp $ bin/openrct2 bin/openrct2-cli lib/libopenrct2.a @@ -32,6 +32,7 @@ share/openrct2/language/da-DK.txt share/openrct2/language/de-DE.txt share/openrct2/language/en-GB.txt share/openrct2/language/en-US.txt +share/openrct2/language/eo-OO.txt share/openrct2/language/es-ES.txt share/openrct2/language/fi-FI.txt share/openrct2/language/fr-FR.txt Index: pkgsrc/games/openrct2/distinfo diff -u pkgsrc/games/openrct2/distinfo:1.11 pkgsrc/games/openrct2/distinfo:1.12 --- pkgsrc/games/openrct2/distinfo:1.11 Mon Jul 24 08:42:53 2023 +++ pkgsrc/games/openrct2/distinfo Sat Aug 12 15:13:06 2023 @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.11 2023/07/24 08:42:53 triaxx Exp $ +$NetBSD: distinfo,v 1.12 2023/08/12 15:13:06 triaxx Exp $ -BLAKE2s (openrct2-0.3.1.tar.gz) = d43857bce46a11bb0557804d1541560c38b12c88cfb4e216768e160d8536dae1 -SHA512 (openrct2-0.3.1.tar.gz) = 2a6027a28a26d9770a759296cfcf38290b44b90483113e93b8762403e1043dbe88c6666245155b4c7fc9d9122f44705b718cdc8dbc7b9d3888dc9036fd5928a1 -Size (openrct2-0.3.1.tar.gz) = 11761818 bytes +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 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_platform_Platform.Linux.cpp) = d8ddd15b91baff6041b4bd85ca8ea3dd6742b6c3 SHA1 (patch-src_openrct2_platform_Platform.macOS.mm) = 8d753476ba13cc47d111ebb6de38605e604c3a9d -SHA1 (patch-src_openrct2_platform_Platform2.h) = 9d97308addb5995a430244fc04aa961f8ca0deaa -SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3 +SHA1 (patch-src_openrct2_platform_Platform2.h) = 9fbb80288cf40f626658469a3a33c0cc7b57141f +SHA1 (patch-src_openrct2_platform_Posix.cpp) = e14eb94c05ec12b7c641359b5611018a98240bc8 SHA1 (patch-src_openrct2_util_Util.cpp) = aaebb6b69cdb560a6db44fc8acc19bf23c576801 Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h:1.3 pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h:1.4 --- pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h:1.3 Sat Jul 22 10:55:16 2023 +++ pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform2.h Sat Aug 12 15:13:07 2023 @@ -1,12 +1,12 @@ -$NetBSD: patch-src_openrct2_platform_Platform2.h,v 1.3 2023/07/22 10:55:16 triaxx Exp $ +$NetBSD: patch-src_openrct2_platform_Platform2.h,v 1.4 2023/08/12 15:13:07 triaxx Exp $ Support NetBSD. ---- src/openrct2/platform/Platform2.h.orig 2020-08-15 19:13:50.000000000 +0000 +--- src/openrct2/platform/Platform2.h.orig 2020-11-01 19:00:01.000000000 +0000 +++ src/openrct2/platform/Platform2.h -@@ -37,7 +37,7 @@ namespace Platform - rct2_time GetTimeLocal(); - rct2_date GetDateLocal(); +@@ -40,7 +40,7 @@ namespace Platform + bool FindApp(const std::string& app, std::string* output); + int32_t Execute(const std::string& command, std::string* output = nullptr); -#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) +#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) || defined(__NetBSD__) Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Posix.cpp diff -u pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Posix.cpp:1.1 pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Posix.cpp:1.2 --- pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Posix.cpp:1.1 Sun Nov 17 16:19:57 2019 +++ pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Posix.cpp Sat Aug 12 15:13:07 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-src_openrct2_platform_Posix.cpp,v 1.1 2019/11/17 16:19:57 nia Exp $ +$NetBSD: patch-src_openrct2_platform_Posix.cpp,v 1.2 2023/08/12 15:13:07 triaxx Exp $ Support NetBSD. ---- src/openrct2/platform/Posix.cpp.orig 2019-10-28 20:18:47.000000000 +0000 +--- src/openrct2/platform/Posix.cpp.orig 2020-11-01 19:00:01.000000000 +0000 +++ src/openrct2/platform/Posix.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. @@ -11,5 +11,5 @@ Support NetBSD. -#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) +#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) || defined(__NetBSD__) - # include - # include + # include "../OpenRCT2.h" + # include "../config/Config.h" --_----------=_1691853187158990--