Hi ports --
Attached is an update to OpenRCT2.
Changelog is here:
https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.1
Works well on amd64.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openrct2/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 11 Sep 2020 21:12:48 -0000 1.15
+++ Makefile 18 Oct 2020 21:43:49 -0000
@@ -3,7 +3,7 @@
# "#error Unknown endianess!" in src/openrct2/common.h
NOT_FOR_ARCHS = ${BE_ARCHS}
-V = 0.3.0
+V = 0.3.1
COMMENT = open source re-implementation of RollerCoaster Tycoon 2
DISTNAME = openrct2-${V}
CATEGORIES = games x11
@@ -15,7 +15,7 @@ MAINTAINER = Brian Callahan <bcallah@ope
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL SDL2 c crypto curl duktape fontconfig
-WANTLIB += freetype icuuc jansson m png speexdsp ssl z zip
+WANTLIB += freetype icuuc m png speexdsp ssl z zip
# Upstream does not make proper source releases.
# See: https://github.com/OpenRCT2/OpenRCT2/issues/5887
@@ -28,7 +28,6 @@ MODULES = devel/cmake
LIB_DEPENDS = archivers/libzip \
audio/speexdsp \
- devel/jansson \
devel/sdl2 \
graphics/png \
lang/duktape \
@@ -43,18 +42,22 @@ CONFIGURE_ARGS = -DDOWNLOAD_OBJECTS=OFF
-DDOWNLOAD_REPLAYS=OFF \
-DDOWNLOAD_TITLE_SEQUENCES=OFF \
-DOPENRCT2_BRANCH=master \
- -DOPENRCT2_COMMIT_SHA1_SHORT="135cc10"
+ -DOPENRCT2_COMMIT_SHA1_SHORT="d01dcea"
# Downloads things. See: https://github.com/OpenRCT2/OpenRCT2/issues/5710
NO_TEST = Yes
-# Upstream changed the location to read title sequences from.
-# https://github.com/rdbaris/OpenRCT2/commit/2a00293d88bb38e65040cde888842d9bf1e236ab
+# Work around some upstream lack of inclusion of needed includes
post-extract:
- mv ${WRKSRC}/data/title ${WRKSRC}/data/sequence
+ mkdir -p ${WRKSRC}/nlohmann
+ mv ${WRKSRC}/json.hpp ${WRKSRC}/nlohmann
pre-configure:
sed -i 's,/usr/local,${TRUEPREFIX},g' \
${WRKSRC}/src/openrct2/platform/Platform.Linux.cpp
+
+# Upstream misnamed this
+post-install:
+ mv ${PREFIX}/share/openrct2/objects ${PREFIX}/share/openrct2/object
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openrct2/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 11 Sep 2020 21:12:48 -0000 1.6
+++ distinfo 18 Oct 2020 21:43:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (openrct2-0.3.0.tar.gz) = Rd/u46dApsJRNdE3oPtQvzoU8Bdrp5jsszgwzwDDXDs=
-SIZE (openrct2-0.3.0.tar.gz) = 16184154
+SHA256 (openrct2-0.3.1.tar.gz) = WLDsXzICo8r2MNPf+pz6QO2EdXrlQx/a97szuVA6UTQ=
+SIZE (openrct2-0.3.1.tar.gz) = 16379173
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/openrct2/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Sep 2020 21:12:48 -0000 1.5
+++ patches/patch-CMakeLists_txt 18 Oct 2020 21:43:49 -0000
@@ -6,7 +6,7 @@ Remove -Werror.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -103,25 +103,6 @@ execute_process(
+@@ -113,25 +113,6 @@ execute_process(
ERROR_QUIET
)
@@ -32,7 +32,7 @@ Index: CMakeLists.txt
# Defines
if (USE_MMAP)
add_definitions(-DUSE_MMAP)
-@@ -249,7 +230,7 @@ else ()
+@@ -259,7 +240,7 @@ else ()
# Compiler flags
set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0â3.")
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/openrct2/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 11 Sep 2020 21:12:48 -0000 1.9
+++ pkg/PLIST 18 Oct 2020 21:43:50 -0000
@@ -72,6 +72,9 @@ share/openrct2/object/official/scenery_s
share/openrct2/object/official/scenery_small/rct2.dlc.pandagr.parkobj
share/openrct2/object/official/station/
share/openrct2/object/official/station/openrct2.station.noentrance.json
+share/openrct2/object/official/station/openrct2.station.noplatformnoentrance.json
+share/openrct2/object/official/terrain/
+share/openrct2/object/official/terrain/openrct2.terrain.void.parkobj
share/openrct2/object/official/wall/
share/openrct2/object/official/wall/official.mg-prar.parkobj
share/openrct2/object/official/water/
@@ -89,6 +92,11 @@ share/openrct2/object/rct1/terrain_edge/
share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.skyscraperb.parkobj
share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.stonebrown.parkobj
share/openrct2/object/rct1/terrain_edge/rct1.ll.edge.stonegrey.parkobj
+share/openrct2/object/rct1/terrain_surface/
+share/openrct2/object/rct1/terrain_surface/rct1.aa.surface.roofred.parkobj
+share/openrct2/object/rct1/terrain_surface/rct1.ll.surface.roofgrey.parkobj
+share/openrct2/object/rct1/terrain_surface/rct1.ll.surface.rust.parkobj
+share/openrct2/object/rct1/terrain_surface/rct1.ll.surface.wood.parkobj
share/openrct2/object/rct2/
share/openrct2/object/rct2/footpath/
share/openrct2/object/rct2/footpath/rct2.pathash.json
@@ -128,6 +136,39 @@ share/openrct2/object/rct2/footpath_item
share/openrct2/object/rct2/footpath_item/rct2.littersp.json
share/openrct2/object/rct2/footpath_item/rct2.litterww.json
share/openrct2/object/rct2/footpath_item/rct2.qtv1.json
+share/openrct2/object/rct2/music/
+share/openrct2/object/rct2/music/rct2.music.candy.json
+share/openrct2/object/rct2/music/rct2.music.custom1.json
+share/openrct2/object/rct2/music/rct2.music.custom2.json
+share/openrct2/object/rct2/music/rct2.music.dodgems.json
+share/openrct2/object/rct2/music/rct2.music.egyptian.json
+share/openrct2/object/rct2/music/rct2.music.fairground.json
+share/openrct2/object/rct2/music/rct2.music.fantasy.json
+share/openrct2/object/rct2/music/rct2.music.gentle.json
+share/openrct2/object/rct2/music/rct2.music.horror.json
+share/openrct2/object/rct2/music/rct2.music.ice.json
+share/openrct2/object/rct2/music/rct2.music.jungle.json
+share/openrct2/object/rct2/music/rct2.music.jurassic.json
+share/openrct2/object/rct2/music/rct2.music.martian.json
+share/openrct2/object/rct2/music/rct2.music.mechanical.json
+share/openrct2/object/rct2/music/rct2.music.medieval.json
+share/openrct2/object/rct2/music/rct2.music.modern.json
+share/openrct2/object/rct2/music/rct2.music.organ.json
+share/openrct2/object/rct2/music/rct2.music.oriental.json
+share/openrct2/object/rct2/music/rct2.music.pirate.json
+share/openrct2/object/rct2/music/rct2.music.ragtime.json
+share/openrct2/object/rct2/music/rct2.music.rock1.json
+share/openrct2/object/rct2/music/rct2.music.rock2.json
+share/openrct2/object/rct2/music/rct2.music.rock3.json
+share/openrct2/object/rct2/music/rct2.music.roman.json
+share/openrct2/object/rct2/music/rct2.music.snow.json
+share/openrct2/object/rct2/music/rct2.music.space.json
+share/openrct2/object/rct2/music/rct2.music.summer.json
+share/openrct2/object/rct2/music/rct2.music.techno.json
+share/openrct2/object/rct2/music/rct2.music.toyland.json
+share/openrct2/object/rct2/music/rct2.music.urban.json
+share/openrct2/object/rct2/music/rct2.music.water.json
+share/openrct2/object/rct2/music/rct2.music.wildwest.json
share/openrct2/object/rct2/park_entrance/
share/openrct2/object/rct2/park_entrance/rct2.pkemm.json
share/openrct2/object/rct2/park_entrance/rct2.pkent1.json
