[update] games/openrct2 to 0.4.32

Hello, Here's an update for openrct2 up to the latest version. Tested by playing a few games, seems to work fine. Doubt it needs to make release, but other tests in the meantime? Thanks, Lucas

diff refs/heads/master refs/heads/rct2 commit - 8e3deea7f1e641e3ef459309a1ef1e34f033f3df commit + 9f8dc00aff2ee9b2a842d2da306243a7fc2c2f54 blob - 17aa44ffe49a1018e1d71f32c466fd2961a363c8 blob + f1b7b9a3d782765c96c2cb4502423264a8434584 --- games/openrct2/Makefile +++ games/openrct2/Makefile @@ -1,12 +1,12 @@ # "#error Unknown endianess!" in src/openrct2/common.h NOT_FOR_ARCHS = ${BE_ARCHS} -V = 0.4.24 -TITLE_V = 0.4.14 -OBJECTS_V = 1.7.1 -OPENSFX_V = 1.0.5 -OPENMSX_V = 1.6 -REPLAYS_V = 0.0.87 +V = 0.4.32 +TITLE_V = 0.4.26 +OBJECTS_V = 1.7.6 +OPENSFX_V = 1.0.6 +OPENMSX_V = 1.6.1 +REPLAYS_V = 0.0.92 COMMENT = open source re-implementation of RollerCoaster Tycoon 2 DISTFILES = openrct2-${V}{v${V}}.tar.gz DISTFILES.a = title-sequences-${TITLE_V}{title-sequences}.zip @@ -16,7 +16,6 @@ DISTFILES.d = openmsx-${OPENMSX_V}{openmusic}.zip DISTFILES.e = replays-${REPLAYS_V}{replays}.zip PKGNAME = openrct2-${V} CATEGORIES = games x11 -REVISION = 1 HOMEPAGE = https://openrct2.org/ @@ -24,8 +23,7 @@ HOMEPAGE = https://openrct2.org/ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} FLAC GL SDL2 c crypto curl fontconfig -WANTLIB += freetype icuuc m ogg png speexdsp ssl vorbisfile z -WANTLIB += zip +WANTLIB += freetype icuuc m ogg png ssl vorbisfile z zip zstd # Upstream does not make proper source releases. # See: https://github.com/OpenRCT2/OpenRCT2/issues/5887 @@ -51,9 +49,9 @@ BUILD_DEPENDS = archivers/unzip \ textproc/nlohmann-json LIB_DEPENDS = archivers/libzip \ + archivers/zstd \ audio/flac \ audio/libvorbis \ - audio/speexdsp \ devel/sdl2 \ graphics/png \ net/curl \ @@ -64,13 +62,13 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+4,-guic CONFIGURE_ARGS = -DDOWNLOAD_OBJECTS=OFF \ - -DDOWNLOAD_OPENMSX=OFF \ + -DDOWNLOAD_OPENMUSIC=OFF \ -DDOWNLOAD_OPENSFX=OFF \ -DDOWNLOAD_REPLAYS=OFF \ -DDOWNLOAD_TITLE_SEQUENCES=OFF \ -DDISABLE_DISCORD_RPC=ON \ -DOPENRCT2_BRANCH=master \ - -DOPENRCT2_COMMIT_SHA1_SHORT="76ca840" + -DOPENRCT2_COMMIT_SHA1_SHORT="25c7379" # Downloads things. See: https://github.com/OpenRCT2/OpenRCT2/issues/5710 NO_TEST = Yes blob - 2579bddde6bcd33cee73b3ea4e994cb99555de99 blob + 2c0744935f19f85fa731431282314fb99d754fbb --- games/openrct2/distinfo +++ games/openrct2/distinfo @@ -1,12 +1,12 @@ -SHA256 (openrct2/objects-1.7.1.zip) = Z5ussyDgEG9MrPxmGaSy4yKTb1W9qMFEdEa8Jtv+oZM= -SHA256 (openrct2/openmsx-1.6.zip) = 8JfTpMzTn3VG+X2z7LG4vnNkj1O3p1lbhszL3Bp1V+Q= -SHA256 (openrct2/openrct2-0.4.24.tar.gz) = 40yOeSuzWlS8TSbEtd09j+m7UALiBlKias2M+XpldEQ= -SHA256 (openrct2/opensfx-1.0.5.zip) = qVIUi+FkwSjk/TrqloIuXwUe3ZoLHyyE3n92KM47Lhg= -SHA256 (openrct2/replays-0.0.87.zip) = TV7Ss/pi4jnAyO0MlrjR9b6NK+akZLM2A6/8daX/UQ8= -SHA256 (openrct2/title-sequences-0.4.14.zip) = FA33FOgG/tQRzEl2Pn8WsPzypIelcAHR5Q/Oj5FIqfM= -SIZE (openrct2/objects-1.7.1.zip) = 10939128 -SIZE (openrct2/openmsx-1.6.zip) = 42921141 -SIZE (openrct2/openrct2-0.4.24.tar.gz) = 23966640 -SIZE (openrct2/opensfx-1.0.5.zip) = 4012384 -SIZE (openrct2/replays-0.0.87.zip) = 1866031 -SIZE (openrct2/title-sequences-0.4.14.zip) = 7791573 +SHA256 (openrct2/objects-1.7.6.zip) = asoutEH76MAi/4TVn7Ue1+pXd1ZkCXDcmJ6raF/0VpY= +SHA256 (openrct2/openmsx-1.6.1.zip) = mUs1DTsYDuHLlhn+J/frrjoaUjKEDEvUeonzP6id4aE= +SHA256 (openrct2/openrct2-0.4.32.tar.gz) = AoZ4XQtPmEpuMSbkIV3V7MMdudNt9YUmlmuWQSN06Aw= +SHA256 (openrct2/opensfx-1.0.6.zip) = BrkPPhnCFnUt9EHVUbJqnj4bp3Vb3SECUEtzv5k2CL4= +SHA256 (openrct2/replays-0.0.92.zip) = RVoZFyqN+BuTWpQru9ogFntHQLNGU/23QSd0Boa/TL4= +SHA256 (openrct2/title-sequences-0.4.26.zip) = 2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg= +SIZE (openrct2/objects-1.7.6.zip) = 11027399 +SIZE (openrct2/openmsx-1.6.1.zip) = 42921420 +SIZE (openrct2/openrct2-0.4.32.tar.gz) = 24694264 +SIZE (openrct2/opensfx-1.0.6.zip) = 4273495 +SIZE (openrct2/replays-0.0.92.zip) = 1356796 +SIZE (openrct2/title-sequences-0.4.26.zip) = 8751039 blob - 4c603cc65e36eec359c5562152a12333b06fb40c blob + dfe16d31e7f34ef5926ca53b823ce16d1d0fccd8 --- games/openrct2/patches/patch-CMakeLists_txt +++ games/openrct2/patches/patch-CMakeLists_txt @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -347,7 +347,7 @@ else () +@@ -343,7 +343,7 @@ else () # Compiler flags set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.") blob - 5dba75a234aaf91b951d7ccfb7346a54a91acd9a blob + e29b76ad7f5def7441cfb38ca0d6ed3ea6cf62d1 --- games/openrct2/pkg/PLIST +++ games/openrct2/pkg/PLIST @@ -3,10 +3,10 @@ @static-lib lib/libopenrct2.a @man man/man6/openrct2-cli.6 @man man/man6/openrct2.6 -share/applications/openrct2-savegame.desktop -share/applications/openrct2-scenario.desktop -share/applications/openrct2-uri.desktop -share/applications/openrct2.desktop +share/applications/io.openrct2.openrct2.desktop +share/applications/io.openrct2.savegame.desktop +share/applications/io.openrct2.scenario.desktop +share/applications/io.openrct2.uri.desktop share/doc/openrct2/ share/doc/openrct2/PRIVACY.md share/doc/openrct2/changelog.txt @@ -26,7 +26,7 @@ share/icons/hicolor/64x64/apps/openrct2.png share/icons/hicolor/96x96/apps/openrct2.png share/icons/hicolor/scalable/apps/openrct2.svg share/metainfo/ -share/metainfo/openrct2.appdata.xml +share/metainfo/io.openrct2.openrct2.appdata.xml share/mime/packages/openrct2.xml share/openrct2/ share/openrct2/fonts.dat @@ -114,6 +114,7 @@ share/openrct2/object/official/scenario_meta/rct1dlc.s share/openrct2/object/official/scenario_meta/rct1dlc.scenario_meta.steel_twister_roller_coaster_competition.parkobj share/openrct2/object/official/scenario_meta/rct1dlc.scenario_meta.suspended_roller_coaster_competition.parkobj share/openrct2/object/official/scenario_meta/rct1dlc.scenario_meta.wooden_roller_coaster_competition.parkobj +share/openrct2/object/official/scenario_meta/rct1tw.scenario_meta.taiwan_park.parkobj share/openrct2/object/official/scenario_meta/rct2dlc.scenario_meta.panda_world.parkobj share/openrct2/object/official/scenario_meta/uces.scenario_meta.beneath_the_christmas_tree.parkobj share/openrct2/object/official/scenario_meta/uces.scenario_meta.bigrock_blast.parkobj @@ -1427,7 +1428,7 @@ share/openrct2/object/rct2tt/scenery_large/rct2tt.scen share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.jailxx17.json share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.jailxx18.json share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.jetplan1.json -share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.jetplan2.json +share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.jetplan2.parkobj share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.jetplan3.json share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.majoroak.json share/openrct2/object/rct2tt/scenery_large/rct2tt.scenery_large.mcastl01.json @@ -2036,11 +2037,11 @@ share/openrct2/object/rct2ww/scenery_large/rct2ww.scen share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.3x3mantr.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.50rocket.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.adultele.json -share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.afrclion.json -share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.afrrhino.json -share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.afrzebra.json +share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.afrclion.parkobj +share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.afrrhino.parkobj +share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.afrzebra.parkobj share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.atomium.json -share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.atractor.json +share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.atractor.parkobj share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.bamborf1.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.bamborf2.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.bamborf3.json @@ -2067,8 +2068,8 @@ share/openrct2/object/rct2ww/scenery_large/rct2ww.scen share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.gwoctur1.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.gwoctur2.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.helipad.json -share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.hippo01.json -share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.hippo02.json +share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.hippo01.parkobj +share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.hippo02.parkobj share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.icefor01.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.icefor02.json share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.indianst.json @@ -2643,6 +2644,7 @@ share/openrct2/object/rct2ww/scenery_wall/rct2ww.scene 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/palettes.dat share/openrct2/scenario_patches/ share/openrct2/scenario_patches/0153987.parkpatch share/openrct2/scenario_patches/020ed74.parkpatch

editors/libreoffice: fix for new poppler

Hi, fix build with poppler-26.04.0. ok? Ciao, Kili Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx =================================================================== RCS file: /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx,v diff -u -p -r1.21 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx --- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 12 Feb 2026 21:25:53 -0000 1.21 +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 6 Apr 2026 20:51:44 -0000 @@ -1,6 +1,6 @@ -Fix build with poppler-26.02.0. +Fix build with poppler-26.02.0 and 26.04.0. -From upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. +First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig @@ -61,7 +61,18 @@ Index: sdext/source/pdfimport/xpdfwrappe printf( "drawChar %f %f %f %f %f %f %f %f %f ", normalize(aPositionX), normalize(aPositionY), -@@ -1348,7 +1364,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st +@@ -1098,7 +1114,9 @@ void PDFOutDev::drawChar(GfxState *state, double x, do + printf( "\n" ); + } + +-#if POPPLER_CHECK_VERSION(0, 64, 0) ++#if POPPLER_CHECK_VERSION(26, 4, 0) ++void PDFOutDev::drawString(GfxState*, const std::string & /*s*/) ++#elif POPPLER_CHECK_VERSION(0, 64, 0) + void PDFOutDev::drawString(GfxState*, const GooString* /*s*/) + #else + void PDFOutDev::drawString(GfxState*, GooString* /*s*/) +@@ -1348,7 +1366,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st const int nDPI = 72; // GfxState seems to have 72.0 as magic for some reason auto pSplashGfxState = new GfxState(nDPI, nDPI, &aBox, 0, false); Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx =================================================================== RCS file: /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx,v diff -u -p -r1.12 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx --- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx 12 Feb 2026 21:25:53 -0000 1.12 +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx 6 Apr 2026 20:51:56 -0000 @@ -1,6 +1,6 @@ -Fix build with poppler-26.02.0. +Fix build with poppler-26.02.0 and 26.04.0. -From upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. +First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig @@ -60,3 +60,14 @@ Index: sdext/source/pdfimport/xpdfwrappe virtual void setDefaultCTM(const double *ctm) override; #else virtual void setDefaultCTM(double *ctm) override; +@@ -241,7 +260,9 @@ namespace pdfi + double originX, double originY, + CharCode code, int nBytes, Unicode *u, int uLen) override; +