git: 179482930342 - main - games/openrct2: update to 0.4.9

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Sat, 09 Mar 2024 12:57:46 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1794829303426a09a65fd810374f592a553533de

commit 1794829303426a09a65fd810374f592a553533de
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-03-06 11:21:11 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2024-03-09 12:57:35 +0000

    games/openrct2: update to 0.4.9
    
    Changelog:      https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.9
---
 games/openrct2/Makefile                            |  8 +--
 games/openrct2/distinfo                            | 14 ++---
 .../files/patch-src_openrct2_config_Config.cpp     |  4 +-
 .../files/patch-src_openrct2_core_String.cpp       | 10 +++
 games/openrct2/pkg-plist                           | 71 +++++++++++++++++++++-
 5 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index c81c63653c9e..5b7e9a84fdd9 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	openrct2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.8
+DISTVERSION=	0.4.9
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.6/:sequence \
-		https://github.com/OpenRCT2/objects/releases/download/v1.3.13/:object \
+		https://github.com/OpenRCT2/objects/releases/download/v1.4.0/:object \
 		https://github.com/OpenRCT2/OpenMusic/releases/download/v1.5/:openmsx \
-		https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.3/:opensfx
+		https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/:opensfx
 DISTFILES=	title-sequences.zip:sequence \
 		objects.zip:object\
 		openmusic.zip:openmsx \
@@ -34,7 +34,6 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libbenchmark.so:devel/benchmark \
 		libogg.so:audio/libogg
 
-#USES=		cmake compiler:c++17-lang desktop-file-utils gl iconv
 USES=		cmake compiler:c++17-lang desktop-file-utils gl \
 		localbase:ldflags pkgconfig sdl shared-mime-info ssl
 USE_GITHUB=	yes
@@ -45,6 +44,7 @@ USE_LDCONFIG=	yes
 USE_SDL=	sdl2
 
 CMAKE_ON=	BUILD_SHARED_LIBS
+CXXFLAGS+=	-Wno-error=deprecated-pragma
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/openrct2/distinfo b/games/openrct2/distinfo
index 69c431ed5b61..52d0e83f2026 100644
--- a/games/openrct2/distinfo
+++ b/games/openrct2/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1707067409
+TIMESTAMP = 1709431002
 SHA256 (title-sequences.zip) = 6e7c7b554717072bfc7acb96fd0101dc8e7f0ea0ea316367a05c2e92950c9029
 SIZE (title-sequences.zip) = 7945853
-SHA256 (objects.zip) = 0711779d69778652d4430d4173903e2444673be374b0ed78c797b5636349b968
-SIZE (objects.zip) = 4708920
+SHA256 (objects.zip) = c7ea3f5c6dfe2ef0a7ac0a428fc9281beac7f5290f0a9ebecbfb6313a3b525d8
+SIZE (objects.zip) = 5314707
 SHA256 (openmusic.zip) = c3fac4caa90398a2b4c5bb32e0dd0f44073086fe16121d3dc49b3ca120474068
 SIZE (openmusic.zip) = 40548101
-SHA256 (opensound.zip) = 70be1b6ff8cc24ad8031a2e0cdd445b5dd3c52c886a8e5f70401f75152e4ae6c
-SIZE (opensound.zip) = 3820122
-SHA256 (OpenRCT2-OpenRCT2-v0.4.8_GH0.tar.gz) = b79bdfd91e2676b0238a94ef3a53bf13a6b6ba417a8d77056a8ea2a903967fd1
-SIZE (OpenRCT2-OpenRCT2-v0.4.8_GH0.tar.gz) = 21699121
+SHA256 (opensound.zip) = a952148be164c128e4fd3aea96822e5f051edd9a0b1f2c84de7f7628ce3b2e18
+SIZE (opensound.zip) = 4012384
+SHA256 (OpenRCT2-OpenRCT2-v0.4.9_GH0.tar.gz) = d9eb7bb99923152122716707888a6182491662e106bef91b86106fa7b45b4309
+SIZE (OpenRCT2-OpenRCT2-v0.4.9_GH0.tar.gz) = 21819673
diff --git a/games/openrct2/files/patch-src_openrct2_config_Config.cpp b/games/openrct2/files/patch-src_openrct2_config_Config.cpp
index 1702a5804a9c..ac74c77601a0 100644
--- a/games/openrct2/files/patch-src_openrct2_config_Config.cpp
+++ b/games/openrct2/files/patch-src_openrct2_config_Config.cpp
@@ -1,6 +1,6 @@
---- src/openrct2/config/Config.cpp.orig	2023-03-28 15:48:53 UTC
+--- src/openrct2/config/Config.cpp.orig	2024-03-02 20:26:41 UTC
 +++ src/openrct2/config/Config.cpp
-@@ -686,6 +686,8 @@ namespace Config
+@@ -700,6 +700,8 @@ namespace Config
      {
          LOG_VERBOSE("config_find_rct2_path(...)");
  
diff --git a/games/openrct2/files/patch-src_openrct2_core_String.cpp b/games/openrct2/files/patch-src_openrct2_core_String.cpp
new file mode 100644
index 000000000000..2ee9031a5b46
--- /dev/null
+++ b/games/openrct2/files/patch-src_openrct2_core_String.cpp
@@ -0,0 +1,10 @@
+--- src/openrct2/core/String.cpp.orig	2024-03-06 10:18:48 UTC
++++ src/openrct2/core/String.cpp
+@@ -15,7 +15,6 @@
+ #include <stdexcept>
+ #include <vector>
+ #ifndef _WIN32
+-#    include <alloca.h>
+ #    include <unicode/ucnv.h>
+ #    include <unicode/unistr.h>
+ #    include <unicode/utypes.h>
diff --git a/games/openrct2/pkg-plist b/games/openrct2/pkg-plist
index 94a6bfd722cf..a185aa1ed659 100644
--- a/games/openrct2/pkg-plist
+++ b/games/openrct2/pkg-plist
@@ -51,6 +51,7 @@ share/mime/packages/openrct2.xml
 %%DATADIR%%/language/ru-RU.txt
 %%DATADIR%%/language/sv-SE.txt
 %%DATADIR%%/language/tr-TR.txt
+%%DATADIR%%/language/uk-UA.txt
 %%DATADIR%%/language/vi-VN.txt
 %%DATADIR%%/language/zh-CN.txt
 %%DATADIR%%/language/zh-TW.txt
@@ -98,13 +99,17 @@ share/mime/packages/openrct2.xml
 %%DATADIR%%/object/official/scenery_small/toontowner.scenery_small.ttrfwd07.parkobj
 %%DATADIR%%/object/official/scenery_small/toontowner.scenery_small.ttrfwd08.parkobj
 %%DATADIR%%/object/official/scenery_small/toontowner.scenery_small.xxbbbr01.parkobj
+%%DATADIR%%/object/official/scenery_small/toontowner.scenery_small.xxbbbr01_fix.parkobj
 %%DATADIR%%/object/official/scenery_wall/couger.scenery_wall.acww33.parkobj
 %%DATADIR%%/object/official/scenery_wall/couger.scenery_wall.acwwf32.parkobj
 %%DATADIR%%/object/official/scenery_wall/mamabear.scenery_wall.mg-prar.parkobj
 %%DATADIR%%/object/official/station/openrct2.station.noentrance.json
 %%DATADIR%%/object/official/station/openrct2.station.noplatformnoentrance.json
 %%DATADIR%%/object/official/terrain_edge/official.terrain_edge.void.parkobj
+%%DATADIR%%/object/official/terrain_edge/rct1beta.terrain_edge.brick.parkobj
+%%DATADIR%%/object/official/terrain_edge/rct1beta.terrain_edge.rock.parkobj
 %%DATADIR%%/object/official/terrain_surface/openrct2.terrain_surface.void.parkobj
+%%DATADIR%%/object/official/terrain_surface/rct1beta.terrain_surface.wildflowers.parkobj
 %%DATADIR%%/object/official/water/rct2dlc.water.wtrpink.json
 %%DATADIR%%/object/rct1/audio/rct1.audio.title.json
 %%DATADIR%%/object/rct1/footpath_railings/rct1ll.footpath_railings.bamboo.parkobj
@@ -125,19 +130,82 @@ share/mime/packages/openrct2.xml
 %%DATADIR%%/object/rct1/footpath_surface/rct1aa.footpath_surface.tiles_grey.parkobj
 %%DATADIR%%/object/rct1/footpath_surface/rct1ll.footpath_surface.tiles_green.parkobj
 %%DATADIR%%/object/rct1/footpath_surface/rct1ll.footpath_surface.tiles_red.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.bobsleigh_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.bumper_boats.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.cat_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.chairlift_cars.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.corkscrew_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.dinghies.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.dodgems.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.fruity_ices_stall.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.go_karts.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.horses.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.inverted_trains.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.ladybird_trains.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.log_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.logs.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.mine_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.mine_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.motorbikes.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.mouse_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.pickup_trucks.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.racing_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.reverse_freefall_car.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.river_rapids_boats.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.rocket_cars.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.single_person_swinging_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.small_monorail_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.sports_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.steam_trains.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.steel_rc_trains.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.steel_rc_trains_reversed.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.streamlined_monorail_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.suspended_swinging_aeroplane_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.suspended_swinging_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.swinging_lay_down_cars.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.toilets.parkobj
+%%DATADIR%%/object/rct1/ride/rct1.ride.vertical_drop_trains.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.wooden_rc_trains.parkobj
 %%DATADIR%%/object/rct1/ride/rct1.ride.wooden_rc_trains_reversed.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.bicycles.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.floorless_twister_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.flying_saucers.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.ghost_train_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.heartline_twister_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.hyper_twister_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.mini_helicopters.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.reverser_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.side_friction_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.ski_lift_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.splash_boats.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.stand_up_twister_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.steam_trains_covered.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.steel_wild_mouse_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.suspended_monorail_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.twister_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.vintage_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1aa.ride.virginia_reel_tubs.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.4_across_inverted_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.air_powered_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.coaster_boats.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.face_off_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.hypercoaster_trains.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.inverted_hairpin_cars.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.jet_skis.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.rafts.parkobj
+%%DATADIR%%/object/rct1/ride/rct1ll.ride.steam_trains_american.parkobj
+%%DATADIR%%/object/rct1/scenery_wall/rct1.scenery_wall.playing_card_wall_1.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1.scenery_wall.playing_card_wall_2.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1.scenery_wall.roman_column_wall.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_brown.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_brown_gate.json
 %%DATADIR%%/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_red.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_white.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1aa.scenery_wall.glass_wall.parkobj
+%%DATADIR%%/object/rct1/scenery_wall/rct1aa.scenery_wall.wooden_post_wall_1.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1aa.scenery_wall.wooden_post_wall_2.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1ll.scenery_wall.medieval_wooden_fence.json
+%%DATADIR%%/object/rct1/scenery_wall/rct1ll.scenery_wall.wooden_fence_brown_snow.json
 %%DATADIR%%/object/rct1/terrain_edge/rct1.terrain_edge.brick.parkobj
 %%DATADIR%%/object/rct1/terrain_edge/rct1.terrain_edge.iron.parkobj
 %%DATADIR%%/object/rct1/terrain_edge/rct1aa.terrain_edge.grey.parkobj
@@ -888,7 +956,7 @@ share/mime/packages/openrct2.xml
 %%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc12.json
 %%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc13.json
 %%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc14.json
-%%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc15.json
+%%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc15.parkobj
 %%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc16.json
 %%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc17.json
 %%DATADIR%%/object/rct2/scenery_wall/rct2.scenery_wall.wc18.json
@@ -1702,6 +1770,7 @@ share/mime/packages/openrct2.xml
 %%DATADIR%%/object/rct2ww/scenery_large/rct2ww.scenery_large.cowboy01.json
 %%DATADIR%%/object/rct2ww/scenery_large/rct2ww.scenery_large.cowboy02.json
 %%DATADIR%%/object/rct2ww/scenery_large/rct2ww.scenery_large.damtower.json
+%%DATADIR%%/object/rct2ww/scenery_large/rct2ww.scenery_large.damtower_fix.json
 %%DATADIR%%/object/rct2ww/scenery_large/rct2ww.scenery_large.easerlnd.json
 %%DATADIR%%/object/rct2ww/scenery_large/rct2ww.scenery_large.eiffel.json
 %%DATADIR%%/object/rct2ww/scenery_large/rct2ww.scenery_large.evilsam.json