On Mon, Jul 29, 2024 at 01:51:28AM GMT, Brian Callahan wrote: > Hi Lucas -- > > On 7/28/2024 9:39 PM, Lucas Raab wrote: > > Hello, > > > > Here's an update for OpenRCT2 to 0.4.12 that's worked on amd64/aarch64 > > so far. Other tests? > > > > changelog: https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.12 > > > > Thanks, > > Lucas > > Looks like OBJECTS_V should be updated to 1.4.6: > https://github.com/OpenRCT2/OpenRCT2/blob/v0.4.12/CMakeLists.txt#L67
ah, good catch! My eyes/brain must have mixed up the 0.4.6 on the line above. A couple changes in the PLIST with that update. > > amd64/aarch64 is enough for testing I think. Maybe i386 and/or riscv64? > > OK for me, assuming updating OBJECTS_V to 1.4.6 continues to work OK. So far so good. I've got an i386 machine that I can give it a whirl on as well (when it finishes compiling...). > > Thanks. > > ~Brian
diff refs/heads/master refs/heads/openrct commit - 776d4c09005a00012fddb385579422d478fecedd commit + 7972538670603883879c83838e775e3a4ff074f6 blob - d936ea3c584d23c6ce6174ff5c9890d8bd86555e blob + c7415598b2241b94e356a2ac998adde51b632c20 --- games/openrct2/Makefile +++ games/openrct2/Makefile @@ -1,9 +1,9 @@ # "#error Unknown endianess!" in src/openrct2/common.h NOT_FOR_ARCHS = ${BE_ARCHS} -V = 0.4.11 +V = 0.4.12 TITLE_V = 0.4.6 -OBJECTS_V = 1.4.4 +OBJECTS_V = 1.4.6 OPENSFX_V = 1.0.5 OPENMSX_V = 1.5 REPLAYS_V = 0.0.79 @@ -15,7 +15,6 @@ DISTFILES.c = opensfx-${OPENSFX_V}{opensound}.zip DISTFILES.d = openmsx-${OPENMSX_V}{openmusic}.zip DISTFILES.e = replays-${REPLAYS_V}{replays}.zip PKGNAME = openrct2-${V} -REVISION = 0 CATEGORIES = games x11 HOMEPAGE = https://openrct2.org/ blob - 48913bb60a4a108be8d0c1c026f6f9aecd800dbb blob + 9e18f00fa9e08aa81c6ed7b22b495544393b0803 --- games/openrct2/distinfo +++ games/openrct2/distinfo @@ -1,12 +1,12 @@ -SHA256 (openrct2/objects-1.4.4.zip) = 2gF7kKOHBknLT/IuFO38dGJZrwSJZzEdETPPTINq5aA= +SHA256 (openrct2/objects-1.4.6.zip) = WotU0CHhZ2BAUf1QjaEJ2evGYGOPVyUrunKfdrskY4c= SHA256 (openrct2/openmsx-1.5.zip) = w/rEyqkDmKK0xbsy4N0PRAcwhv4WEh09xJs8oSBHQGg= -SHA256 (openrct2/openrct2-0.4.11.tar.gz) = 1iEdyWUbQzFcXSLjCqQeWCu4YdJUG4K7Zd6PT5Xwze8= +SHA256 (openrct2/openrct2-0.4.12.tar.gz) = dEamSonQXGY8ZI+7NwsWgsOae6NDjGA9s2bfscW8Fuc= SHA256 (openrct2/opensfx-1.0.5.zip) = qVIUi+FkwSjk/TrqloIuXwUe3ZoLHyyE3n92KM47Lhg= SHA256 (openrct2/replays-0.0.79.zip) = BF2h34aX4tM/8zs0AI8i52mCgKpGOa/Rsfw8WQ1emVY= SHA256 (openrct2/title-sequences-0.4.6.zip) = JKGJza8fePttbK7ejxqzzt+KufgZzSJgoJsszkxxDZg= -SIZE (openrct2/objects-1.4.4.zip) = 5392108 +SIZE (openrct2/objects-1.4.6.zip) = 5411575 SIZE (openrct2/openmsx-1.5.zip) = 40548101 -SIZE (openrct2/openrct2-0.4.11.tar.gz) = 21842033 +SIZE (openrct2/openrct2-0.4.12.tar.gz) = 21881586 SIZE (openrct2/opensfx-1.0.5.zip) = 4012384 SIZE (openrct2/replays-0.0.79.zip) = 1934633 SIZE (openrct2/title-sequences-0.4.6.zip) = 2547725 blob - 10f4d18eecb195801be1e8d24f6d15bfea6ce7ff (mode 644) blob + /dev/null --- games/openrct2/patches/patch-src_openrct2_core_String_cpp +++ /dev/null @@ -1,12 +0,0 @@ -Index: src/openrct2/core/String.cpp ---- src/openrct2/core/String.cpp.orig -+++ src/openrct2/core/String.cpp -@@ -14,7 +14,7 @@ - #include <stdexcept> - #include <vector> - #ifndef _WIN32 --# ifndef __FreeBSD__ -+# ifndef __OpenBSD__ - # include <alloca.h> - # endif - # include <unicode/ucnv.h> blob - d91e7979da647075a602f54e05529ad532301324 blob + 22a713140e0ed97cc7e3e71300f1a0321f68b0bd --- games/openrct2/pkg/PLIST +++ games/openrct2/pkg/PLIST @@ -85,7 +85,7 @@ share/openrct2/object/official/footpath_railings/ share/openrct2/object/official/footpath_railings/openrct2.footpath_railings.invisible.json share/openrct2/object/official/footpath_surface/ share/openrct2/object/official/footpath_surface/openrct2.footpath_surface.invisible.json -share/openrct2/object/official/footpath_surface/openrct2.footpath_surface.queue_invisible.json +share/openrct2/object/official/footpath_surface/openrct2.footpath_surface.queue_invisible.parkobj share/openrct2/object/official/ride/ share/openrct2/object/official/ride/openrct2.ride.alpine_coaster.parkobj share/openrct2/object/official/ride/openrct2.ride.hybrid_coaster.parkobj @@ -206,6 +206,7 @@ share/openrct2/object/rct1/ride/rct1aa.ride.flying_sau share/openrct2/object/rct1/ride/rct1aa.ride.ghost_train_cars.parkobj share/openrct2/object/rct1/ride/rct1aa.ride.heartline_twister_cars.parkobj share/openrct2/object/rct1/ride/rct1aa.ride.hyper_twister_trains.parkobj +share/openrct2/object/rct1/ride/rct1aa.ride.lay_down_trains.parkobj share/openrct2/object/rct1/ride/rct1aa.ride.mini_helicopters.parkobj share/openrct2/object/rct1/ride/rct1aa.ride.reverser_cars.parkobj share/openrct2/object/rct1/ride/rct1aa.ride.side_friction_cars.parkobj