CVS commit: pkgsrc/games/openrct2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  9 17:13:36 UTC 2024

Modified Files:
        pkgsrc/games/openrct2: Makefile PLIST distinfo

Log Message:
openrct2: Update to 0.4.11. Support offline builds.

Changes:

Feature: Coloured usernames by group on multiplayer servers.
Feature: Park admittance price can now be set via text input.
Feature: [Plugin] Expose whether the game is paused to the plugin API.
Improved: “Fix all rides” cheat now also works if a mechanic is already fixing the ride.
Improved: Expose “animation is backwards” wall property in Tile Inspector.
Improved: Add a separator between “Load Game” and “Save Game”, to avoid accidental overwriting.
Change: [Plugin] Remove access to the internal owner property. Note: ownership is still accessible.
Change: Cheats menu dropdown no longer requires dragging.
Change: Hide the FPS Counter when the top toolbar/widgets have been toggled off.
Change: Construction and removal buttons can now be held down for repeated placement.
Fix: Boat Hire boats get stuck entering track (original bug).
Fix: No reason specified when placing door over unsuitable track.
Fix: Attempting to demolish a flat ride in pause mode allows you to place multiple copies.
Fix: Custom rides with long descriptions extend into lower widgets.
Fix: Fullscreen window option not correctly applied on macOS.
Fix: Crash when loading park bigger than current limits.
Fix: Map generator heightmap should respect increased height limits.
Fix: When creating a new scenario, the default name contains formatting codes.
Fix: Build errors with the ORIGINAL_RATINGS flag.
Fix: Cannot build Colosseum inside a turn or helix.
Fix: Sloped castle walls are vertically offset by one pixel (original bug).


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/games/openrct2/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/games/openrct2/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/games/openrct2/distinfo

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.57 pkgsrc/games/openrct2/Makefile:1.58
--- pkgsrc/games/openrct2/Makefile:1.57 Thu Apr 25 19:25:11 2024
+++ pkgsrc/games/openrct2/Makefile      Thu May  9 17:13:36 2024
@@ -1,22 +1,48 @@
-# $NetBSD: Makefile,v 1.57 2024/04/25 19:25:11 triaxx Exp $
+# $NetBSD: Makefile,v 1.58 2024/05/09 17:13:36 nia Exp $
 
-DISTNAME=      openrct2-0.4.10
+PKGNAME=       openrct2-0.4.11
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenRCT2/}
-GITHUB_PROJECT=        OpenRCT2
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+DIST_SUBDIR=   openrct2-${PKGVERSION_NOREV}
+
+DISTFILES=     openrct.tar.gz
+DISTFILES+=    title-sequences.zip
+DISTFILES+=    objects.zip
+DISTFILES+=    opensound.zip
+DISTFILES+=    openmusic.zip
+DISTFILES+=    replays.zip
+
+EXTRACT_ONLY+= openrct.tar.gz
+
+SITES.openrct.tar.gz= \
+       -https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v${PKGVERSION_NOREV}.tar.gz
+
+# these versions come from CMakeLists.txt
+
+SITES.title-sequences.zip= \
+       https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/
+
+SITES.objects.zip= \
+       https://github.com/OpenRCT2/objects/releases/download/v1.4.4/
+
+SITES.opensound.zip= \
+       https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/
+
+SITES.openmusic.zip= \
+       https://github.com/OpenRCT2/OpenMusic/releases/download/v1.5/
+
+SITES.replays.zip= \
+       https://github.com/OpenRCT2/replays/releases/download/v0.0.79/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/OpenRCT2/OpenRCT2/
 COMMENT=       Open source reimplementation of RollerCoaster Tycoon 2
 LICENSE=       gnu-gpl-v3
 
-USE_CMAKE=     yes
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++
+WRKSRC=                ${WRKDIR}/OpenRCT2-${PKGVERSION_NOREV}
 
-# C++17
-GCC_REQD+=     9
+USE_TOOLS+=    pkg-config unzip
+USE_LANGUAGES= c c++
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER_AR="/usr/bin/ar"
@@ -25,35 +51,34 @@ CMAKE_ARGS+=        -DDISABLE_GOOGLE_BENCHMARK=
 CMAKE_ARGS+=   -DMACOS_USE_DEPENDENCIES=OFF
 CMAKE_ARGS+=   -DMACOS_BUNDLE=OFF
 
+CMAKE_ARGS+=   -DDOWNLOAD_TITLE_SEQUENCES=OFF
+CMAKE_ARGS+=   -DDOWNLOAD_OBJECTS=OFF
+CMAKE_ARGS+=   -DDOWNLOAD_OPENSFX=OFF
+CMAKE_ARGS+=   -DDOWNLOAD_OPENMSX=OFF
+
 CXXFLAGS+=     -DORCT2_RESOURCE_DIR=\"${PREFIX}/share/openrct2\"
 
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ..
+USE_CXX_FEATURES=      c++20
 
-USE_CXX_FEATURES=      c++17
+CHECK_WRKREF_SKIP+=    share/*
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
-# XXX it cannot be built without an Internet connection.
-# Fails during install stage:
-# CMake Error at cmake_install.cmake:48 (file):
-#  file DOWNLOAD HASH mismatch
-#
-#    for file: [/wrk/games/openrct2/work/.destdir/p/share/openrct2/title/title-sequences.zip]
-#      expected hash: [304d13a126c15bf2c86ff13b81a2f2cc1856ac8d]
-#        actual hash: [da39a3ee5e6b4b0d3255bfef95601890afd80709]
-#             status: [6;"Couldn't resolve host name"]
-#
-
 SUBST_CLASSES+=                doc
 SUBST_STAGE.doc=       pre-configure
 SUBST_MESSAGE.doc=     Fixing documentation path.
 SUBST_FILES.doc=       src/openrct2/platform/Platform.macOS.mm
 SUBST_VARS.doc=                PREFIX
 
-pre-configure:
-       ${MKDIR} ${WRKSRC}/build
+post-extract:
+       unzip -d ${WRKSRC}/data/object ${DISTDIR}/${DIST_SUBDIR}/objects.zip
+       unzip -d ${WRKSRC}/data/sequence ${DISTDIR}/${DIST_SUBDIR}/title-sequences.zip
+       unzip -d ${WRKSRC}/data ${DISTDIR}/${DIST_SUBDIR}/opensound.zip
+       unzip -d ${WRKSRC}/data ${DISTDIR}/${DIST_SUBDIR}/openmusic.zip
+       unzip -d ${WRKSRC}/test/tests/testdata/replays \
+               ${DISTDIR}/${DIST_SUBDIR}/replays.zip
 
+.include "../../devel/cmake/build.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"

Index: pkgsrc/games/openrct2/PLIST
diff -u pkgsrc/games/openrct2/PLIST:1.19 pkgsrc/games/openrct2/PLIST:1.20
--- pkgsrc/games/openrct2/PLIST:1.19    Thu Apr 25 19:25:11 2024
+++ pkgsrc/games/openrct2/PLIST Thu May  9 17:13:36 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2024/04/25 19:25:11 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.20 2024/05/09 17:13:36 nia Exp $
 bin/openrct2
 bin/openrct2-cli
 lib/libopenrct2.a
@@ -56,7 +56,6 @@ share/openrct2/language/uk-UA.txt
 share/openrct2/language/vi-VN.txt
 share/openrct2/language/zh-CN.txt
 share/openrct2/language/zh-TW.txt
-share/openrct2/object/objects.zip.zipversion
 share/openrct2/object/official/audio/openrct2.audio.additional.parkobj
 share/openrct2/object/official/footpath_item/rct2dlc.footpath_item.litterpa.parkobj
 share/openrct2/object/official/footpath_railings/openrct2.footpath_railings.invisible.json
@@ -2366,14 +2365,11 @@ share/openrct2/object/rct2ww/scenery_wal
 share/openrct2/object/rct2ww/scenery_wall/rct2ww.scenery_wall.wwind04.json
 share/openrct2/object/rct2ww/scenery_wall/rct2ww.scenery_wall.wwind05.json
 share/openrct2/object/rct2ww/scenery_wall/rct2ww.scenery_wall.wwind06.json
-share/openrct2/openmusic.zip.zipversion
-share/openrct2/opensound.zip.zipversion
 share/openrct2/sequence/openrct2.parkseq
 share/openrct2/sequence/rct1.parkseq
 share/openrct2/sequence/rct1aa.parkseq
 share/openrct2/sequence/rct1aall.parkseq
 share/openrct2/sequence/rct2.parkseq
-share/openrct2/sequence/title-sequences.zip.zipversion
 share/openrct2/shaders/applypalette.frag
 share/openrct2/shaders/applypalette.vert
 share/openrct2/shaders/applytransparency.frag

Index: pkgsrc/games/openrct2/distinfo
diff -u pkgsrc/games/openrct2/distinfo:1.29 pkgsrc/games/openrct2/distinfo:1.30
--- pkgsrc/games/openrct2/distinfo:1.29 Mon Apr 29 13:43:46 2024
+++ pkgsrc/games/openrct2/distinfo      Thu May  9 17:13:36 2024
@@ -1,9 +1,23 @@
-$NetBSD: distinfo,v 1.29 2024/04/29 13:43:46 nia Exp $
+$NetBSD: distinfo,v 1.30 2024/05/09 17:13:36 nia Exp $
 
-BLAKE2s (openrct2-0.4.10.tar.gz) = 20559c09e6db6302253fa3f9895fa3e715ce60322047eae5d245164046a2c13e
-SHA512 (openrct2-0.4.10.tar.gz) = 5ed9a6c790d5603fd1605669294a56908f493f347517d4c3bc8403df91b3678996d76980a42e9e3076b02fba598ee0bd33f2ad080762898cee7c40a865eed89d
-Size (openrct2-0.4.10.tar.gz) = 21854907 bytes
-SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa
+BLAKE2s (openrct2-0.4.11/objects.zip) = 639c25c6875a1e3735d5b16f3da903eaa6204bdf4928afc09070f1b97f903134
+SHA512 (openrct2-0.4.11/objects.zip) = 602057c184970fa15e7f40804262fca55d21709d403d85b89d6c264144dc4251b9aa058b4ef37b5723c4ea39d6a317f0304fe41f1a9734766a75d1cab1170e75
+Size (openrct2-0.4.11/objects.zip) = 5392108 bytes
+BLAKE2s (openrct2-0.4.11/openmusic.zip) = 6e514c288586173dc35bdc4c08b95005c9c90a9ee556667b991d99f45ff98ac1
+SHA512 (openrct2-0.4.11/openmusic.zip) = 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3
+Size (openrct2-0.4.11/openmusic.zip) = 40548101 bytes
+BLAKE2s (openrct2-0.4.11/openrct.tar.gz) = c577dffc654729728f81b8c53c0faf5d06e77fa87f77c82e4b2573296fd985ff
+SHA512 (openrct2-0.4.11/openrct.tar.gz) = 820b0aaccdde433bf3da8a45e5893882e7a0bb1b0084fa6130ceab91489584a9d10b1ef18bac718e3f9ea910bdbcd878b7a3ca4f9361663a9fb496bb62a0ca80
+Size (openrct2-0.4.11/openrct.tar.gz) = 21842033 bytes
+BLAKE2s (openrct2-0.4.11/opensound.zip) = dc673d3cf272c0c1ccca9629771bf3d1bc2b10e27558cfed9209dfa569c35e7b
+SHA512 (openrct2-0.4.11/opensound.zip) = fc46ffb3f6243b3d783a280481ce373a8ddc8cf1fd28bfeceecf6223b72b38f1d49d0c95eea3376308a61a77c50c7a06252b6d72248cfecc493b63b65bd6512a
+Size (openrct2-0.4.11/opensound.zip) = 4012384 bytes
+BLAKE2s (openrct2-0.4.11/replays.zip) = 73840e6999d8ff5e9393bba99aae100f5d036b95ecfb0365b5192299d8042ae8
+SHA512 (openrct2-0.4.11/replays.zip) = 04acde4d60c8fa949b298dd15e38fe0421659357fa214dffb0577574e0b0ac218a01ce998f4e12e3ab13a88fbbba8096392462fda29c68a6215bc0875aaae9b2
+Size (openrct2-0.4.11/replays.zip) = 1934633 bytes
+BLAKE2s (openrct2-0.4.11/title-sequences.zip) = d9c4f888a5c31486913e43a1711e519ef6ae4f70b0c5cb7decdab2f6c03f0c8d
+SHA512 (openrct2-0.4.11/title-sequences.zip) = bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da
+Size (openrct2-0.4.11/title-sequences.zip) = 2547725 bytes
 SHA1 (patch-src_openrct2_core_String.cpp) = ddbf7d88545f260b820879aa178888b60de18cd3
 SHA1 (patch-src_openrct2_platform_Platform.Posix.cpp) = 9c052c55489cd2bb4e0f50a71c7cd48f29d3887b
 SHA1 (patch-src_openrct2_platform_Platform.h) = bfac1159b28a0ba37b2cb1a5f1be8729aba03cb8