2026-06-26T15:44:35+0000 Johannes Thyssen Tishman <jtt@openbsd.org>: > 2026-06-23T18:20:54-0700 Andrew Hewus Fresh <andrew@afresh1.com>: > > This brings OpenSCAD up to a recent nightly. I was running one from > > April for quite a while, but have tested this one lightly and haven't > > noticed any fallout. > > > > https://github.com/openscad/openscad/commits/master/ > > > > Comments, tests, OK? > > The following is printed on 'make plist': > LIB_DEPENDS graphics/glew not needed for cad/openscad ? > > I took a closer look and found the following comment and options in > CMakeLists.txt: > > # For now, we'll default to whatever OpenCSG uses (>=1.6 -> GLAD, <1.6 -> GLEW) > option(USE_GLAD "Use GLAD. Mutually exclusive from USE_GLEW" OFF) > option(USE_GLEW "Use GLEW. Mutually exclusive from USE_GLAD" OFF) > > Since I built with your OpenCSG update (1.8.2), the following is printed > during configuration time: > > -- USE_GLAD/USE_GLEW not specified: Defaulting to GLAD > > However I do not have glad installed on the machine I tested on. Perhaps > the library is bundled? Could you please take a look at this? > > Regardless, OpenSCAD builds and starts fine. I loaded a couple of the > built-in examples and saw no issues. With the above nit clarified, ok > jtt@. > > Note, that I did not test if this update builds without updating OpenCSG > and manifold or viceversa, so these should probably go in together. Forgot to mention that I wasn't able to run the tests as I build-tested in a chroot and couldn't yet figure out how to make the display work. Are they passing for you? > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/cad/openscad/Makefile,v > > diff -u -p -r1.61 Makefile > > --- Makefile 23 Apr 2026 07:51:18 -0000 1.61 > > +++ Makefile 24 Jun 2026 01:19:29 -0000 > > @@ -1,8 +1,7 @@ > > COMMENT = programmers solid 3D CAD modeller > > > > -V = 2026.02.24 > > +V = 2026.06.21 > > DISTNAME = openscad-${V} > > -REVISION = 0 > > > > CATEGORIES = cad > > > > @@ -13,7 +12,7 @@ PERMIT_PACKAGE = Yes > > > > GH_ACCOUNT = openscad > > GH_PROJECT = openscad > > -GH_COMMIT = 665ba242e8b61aee10a4b09af94c094e1eb354f8 > > +GH_COMMIT = fb3d125fc17debb48080cd3551e944fcb8d97701 > > > > MCAD_COMMIT = 1ea402208c3127ffb443931e9bb1681c191dacca > > SITES.mcad = https://github.com/${GH_ACCOUNT}/MCAD/archive/ > > @@ -24,13 +23,14 @@ MODULES = devel/cmake \ > > lang/python \ > > x11/qt6 > > > > -WANTLIB += ${COMPILER_LIBCXX} 3mf Clipper2 EGL GL GLEW GLU Qt6Concurrent > > +WANTLIB += ${COMPILER_LIBCXX} 3mf Clipper2 EGL GL GLU Qt6Concurrent > > WANTLIB += Qt6Core Qt6Core5Compat Qt6DBus Qt6Gui Qt6Multimedia > > WANTLIB += Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6Svg Qt6Widgets > > -WANTLIB += boost_atomic-mt boost_filesystem-mt boost_program_options-mt > > -WANTLIB += boost_regex-mt c cairo double-conversion > > -WANTLIB += fontconfig freetype glib-2.0 gmp gmpxx harfbuzz intl > > -WANTLIB += m manifold mpfr opencsg qscintilla2_qt6 tbb xml2 zip > > +WANTLIB += X11 boost_atomic-mt boost_container-mt boost_filesystem-mt > > +WANTLIB += boost_program_options-mt boost_regex-mt c cairo crypto > > +WANTLIB += double-conversion fontconfig freetype glib-2.0 gmp > > +WANTLIB += gmpxx harfbuzz intl m manifold mpfr opencsg qscintilla2_qt6 > > +WANTLIB += ssl tbb xml2 zip > > > > # Match devel/boost > > COMPILER = base-clang ports-gcc > > Index: distinfo > > =================================================================== > > RCS file: /cvs/ports/cad/openscad/distinfo,v > > diff -u -p -r1.9 distinfo > > --- distinfo 6 Apr 2026 02:28:34 -0000 1.9 > > +++ distinfo 24 Jun 2026 01:19:29 -0000 > > @@ -1,4 +1,4 @@ > > SHA256 (MCAD-1ea40220.tar.gz) = PQQHfTaYFGOMPwGP7MOUOQEaR/VFAm9DwaRlvOF3P1c= > > -SHA256 (openscad-2026.02.24-665ba242.tar.gz) = zRqlHFp/2Puc15m+Hvuv3kZKIzqJliUUU6L9nmlfq30= > > +SHA256 (openscad-2026.06.21-fb3d125f.tar.gz) = I6qVF/HgTFC6GL+odttHnAtiwI8CJIAF9N1lmk/zwm4= > > SIZE (MCAD-1ea40220.tar.gz) = 56943 > > -SIZE (openscad-2026.02.24-665ba242.tar.gz) = 25351660 > > +SIZE (openscad-2026.06.21-fb3d125f.tar.gz) = 25409018 > > Index: patches/patch-CMakeLists_txt > > =================================================================== > > RCS file: /cvs/ports/cad/openscad/patches/patch-CMakeLists_txt,v > > diff -u -p -r1.2 patch-CMakeLists_txt > > --- patches/patch-CMakeLists_txt 6 Apr 2026 02:28:34 -0000 1.2 > > +++ patches/patch-CMakeLists_txt 24 Jun 2026 01:19:29 -0000 > > @@ -1,7 +1,15 @@ > > Index: CMakeLists.txt > > --- CMakeLists.txt.orig > > +++ CMakeLists.txt > > -@@ -527,10 +527,10 @@ else() > > +@@ -461,6 +461,7 @@ macro(find_graphics) > > + set(GLEW_SOURCES src/glview/glew-utils.cc) > > + endif() > > + > > ++ set(OPENGL_glx_LIBRARY /usr/X11R6/lib/modules/extensions/libglx.so) > > + find_package(OpenGL REQUIRED QUIET) > > + target_link_libraries(OpenSCADLibInternal PUBLIC ${OPENGL_LIBRARIES}) > > + message(STATUS "OpenGL: ${OPENGL_LIBRARIES}") > > +@@ -528,10 +529,10 @@ else() > > target_link_libraries(svg PUBLIC Eigen3::Eigen) > > message(STATUS "Eigen: ${Eigen3_VERSION}") > > > > @@ -14,7 +22,7 @@ Index: CMakeLists.txt > > target_link_libraries(svg PUBLIC Boost::headers) > > > > find_package(HarfBuzz 0.9.19 REQUIRED QUIET) > > -@@ -693,7 +693,7 @@ if(ENABLE_CAIRO STREQUAL "AUTO") > > +@@ -694,7 +695,7 @@ if(ENABLE_CAIRO STREQUAL "AUTO") > > if(CAIRO_VERSION OR CAIRO_FOUND) > > message(STATUS "Cairo: ${CAIRO_VERSION}") > > target_include_directories(OpenSCADLibInternal SYSTEM PUBLIC ${CAIRO_INCLUDE_DIRS}) > > @@ -23,7 +31,7 @@ Index: CMakeLists.txt > > target_compile_definitions(OpenSCADLibInternal PUBLIC ENABLE_CAIRO) > > else() > > message(STATUS "Cairo: disabled (not found)") > > -@@ -957,7 +957,7 @@ elseif(UNIX) > > +@@ -958,7 +959,7 @@ elseif(UNIX) > > if (NOT USE_GLAD) > > target_compile_definitions(OpenSCADLibInternal PUBLIC GLEW_EGL) > > endif() > > @@ -32,8 +40,8 @@ Index: CMakeLists.txt > > endif() > > if(ENABLE_GLX AND OpenGL_GLX_FOUND) > > target_compile_definitions(OpenSCADLibInternal PUBLIC ENABLE_GLX) > > -@@ -1260,11 +1260,6 @@ else() > > - ${GLEW_SOURCES}) > > +@@ -1267,11 +1268,6 @@ else() > > + endif() > > endif() > > > > - > > >
Friday, June 26, 2026
Re: [update] games/openrct2 to 0.5.0
On Wed, Jun 10, 2026 at 03:12:06AM +0000, Lucas Raab wrote: > On Thu, Apr 16, 2026 at 06:25:15AM +0100, David Goudou wrote: > > After the recent openrct2 update in ports I noticed 0.5.0 released > > > > Have been testing the past few days > > > > ok? > > Here's a further update to 0.5.2 if that still works for you? I took > your diff and overlaid the changes atop of that. Hi David, just curious if you tried the 0.5.2 update? No worries if not :) Diff reattached
diff refs/heads/master refs/heads/rct2 commit - 9c3733b1b8316c2df22c4dba268969e45c12ccad commit + 544d03b25579415f5804e3878c968f903c6549d2 blob - 8c8b7f6e6e2f92c9dcd4c7d7bb326b04d39ff1e7 blob + 7a1886f9aeb7e626a771c5c027e3282659a681eb --- 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.32 +V = 0.5.2 TITLE_V = 0.4.26 -OBJECTS_V = 1.7.6 +OBJECTS_V = 1.7.9 OPENSFX_V = 1.0.6 OPENMSX_V = 1.6.1 -REPLAYS_V = 0.0.92 +REPLAYS_V = 0.0.93 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/ @@ -69,7 +68,7 @@ CONFIGURE_ARGS = -DDOWNLOAD_OBJECTS=OFF \ -DDOWNLOAD_TITLE_SEQUENCES=OFF \ -DDISABLE_DISCORD_RPC=ON \ -DOPENRCT2_BRANCH=master \ - -DOPENRCT2_COMMIT_SHA1_SHORT="25c7379" \ + -DOPENRCT2_COMMIT_SHA1_SHORT="7d2958e" \ -DOPENRCT2_USE_CCACHE=OFF # Downloads things. See: https://github.com/OpenRCT2/OpenRCT2/issues/5710 blob - 2c0744935f19f85fa731431282314fb99d754fbb blob + 5bb0517a51595bc87d9f29fa17da6a1db49c3387 --- games/openrct2/distinfo +++ games/openrct2/distinfo @@ -1,12 +1,12 @@ -SHA256 (openrct2/objects-1.7.6.zip) = asoutEH76MAi/4TVn7Ue1+pXd1ZkCXDcmJ6raF/0VpY= +SHA256 (openrct2/objects-1.7.9.zip) = VUYe0gxugvFOmiec2ERlSwJkmZu5QDTVj6kS/e4m6tY= SHA256 (openrct2/openmsx-1.6.1.zip) = mUs1DTsYDuHLlhn+J/frrjoaUjKEDEvUeonzP6id4aE= -SHA256 (openrct2/openrct2-0.4.32.tar.gz) = AoZ4XQtPmEpuMSbkIV3V7MMdudNt9YUmlmuWQSN06Aw= +SHA256 (openrct2/openrct2-0.5.2.tar.gz) = As/R7oPgL+gpPhfCSOzT9JRd64e3S0QYaZCbQ/CGVkg= SHA256 (openrct2/opensfx-1.0.6.zip) = BrkPPhnCFnUt9EHVUbJqnj4bp3Vb3SECUEtzv5k2CL4= -SHA256 (openrct2/replays-0.0.92.zip) = RVoZFyqN+BuTWpQru9ogFntHQLNGU/23QSd0Boa/TL4= +SHA256 (openrct2/replays-0.0.93.zip) = UpXxFQRetpRbNrSMohBccFnn9s+KiIMpl9bPh4gX4bU= SHA256 (openrct2/title-sequences-0.4.26.zip) = 2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg= -SIZE (openrct2/objects-1.7.6.zip) = 11027399 +SIZE (openrct2/objects-1.7.9.zip) = 11062251 SIZE (openrct2/openmsx-1.6.1.zip) = 42921420 -SIZE (openrct2/openrct2-0.4.32.tar.gz) = 24694264 +SIZE (openrct2/openrct2-0.5.2.tar.gz) = 24662671 SIZE (openrct2/opensfx-1.0.6.zip) = 4273495 -SIZE (openrct2/replays-0.0.92.zip) = 1356796 +SIZE (openrct2/replays-0.0.93.zip) = 1356076 SIZE (openrct2/title-sequences-0.4.26.zip) = 8751039 blob - dfe16d31e7f34ef5926ca53b823ce16d1d0fccd8 blob + 170e331dc130ea29eb86cf274e355629c6357373 --- games/openrct2/patches/patch-CMakeLists_txt +++ games/openrct2/patches/patch-CMakeLists_txt @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -343,7 +343,7 @@ else () +@@ -344,7 +344,7 @@ else () # Compiler flags set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.") blob - e29b76ad7f5def7441cfb38ca0d6ed3ea6cf62d1 blob + 0bb86639e3a7812d3a3992d5883af61283cda02f --- games/openrct2/pkg/PLIST +++ games/openrct2/pkg/PLIST @@ -170,8 +170,8 @@ share/openrct2/object/official/scenery_wall/official.s share/openrct2/object/official/scenery_wall/official.scenery_wall.support_structure_full.parkobj share/openrct2/object/official/scenery_wall/official.scenery_wall.support_structure_half.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/station/openrct2.station.noentrance.parkobj +share/openrct2/object/official/station/openrct2.station.noplatformnoentrance.parkobj share/openrct2/object/official/terrain_edge/ share/openrct2/object/official/terrain_edge/official.terrain_edge.void.parkobj share/openrct2/object/official/terrain_edge/rct1beta.terrain_edge.brick.parkobj @@ -230,6 +230,7 @@ share/openrct2/object/rct1/ride/rct1.ride.river_rapids share/openrct2/object/rct1/ride/rct1.ride.rocket_cars.parkobj share/openrct2/object/rct1/ride/rct1.ride.single_person_swinging_cars.parkobj share/openrct2/object/rct1/ride/rct1.ride.small_monorail_cars.parkobj +share/openrct2/object/rct1/ride/rct1.ride.spinning_cars.parkobj share/openrct2/object/rct1/ride/rct1.ride.sports_cars.parkobj share/openrct2/object/rct1/ride/rct1.ride.stand_up_trains.parkobj share/openrct2/object/rct1/ride/rct1.ride.steam_trains.parkobj @@ -1228,18 +1229,18 @@ share/openrct2/object/rct2/scenery_wall/rct2.scenery_w share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wwtw.json share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wwtwa.json share/openrct2/object/rct2/station/ -share/openrct2/object/rct2/station/rct2.station.abstract.json -share/openrct2/object/rct2/station/rct2.station.canvas_tent.json -share/openrct2/object/rct2/station/rct2.station.castle_brown.json -share/openrct2/object/rct2/station/rct2.station.castle_grey.json -share/openrct2/object/rct2/station/rct2.station.classical.json -share/openrct2/object/rct2/station/rct2.station.jungle.json -share/openrct2/object/rct2/station/rct2.station.log.json -share/openrct2/object/rct2/station/rct2.station.pagoda.json -share/openrct2/object/rct2/station/rct2.station.plain.json -share/openrct2/object/rct2/station/rct2.station.snow.json -share/openrct2/object/rct2/station/rct2.station.space.json -share/openrct2/object/rct2/station/rct2.station.wooden.json +share/openrct2/object/rct2/station/rct2.station.abstract.parkobj +share/openrct2/object/rct2/station/rct2.station.canvas_tent.parkobj +share/openrct2/object/rct2/station/rct2.station.castle_brown.parkobj +share/openrct2/object/rct2/station/rct2.station.castle_grey.parkobj +share/openrct2/object/rct2/station/rct2.station.classical.parkobj +share/openrct2/object/rct2/station/rct2.station.jungle.parkobj +share/openrct2/object/rct2/station/rct2.station.log.parkobj +share/openrct2/object/rct2/station/rct2.station.pagoda.parkobj +share/openrct2/object/rct2/station/rct2.station.plain.parkobj +share/openrct2/object/rct2/station/rct2.station.snow.parkobj +share/openrct2/object/rct2/station/rct2.station.space.parkobj +share/openrct2/object/rct2/station/rct2.station.wooden.parkobj share/openrct2/object/rct2/terrain_edge/ share/openrct2/object/rct2/terrain_edge/rct2.terrain_edge.ice.parkobj share/openrct2/object/rct2/terrain_edge/rct2.terrain_edge.rock.parkobj @@ -2646,6 +2647,7 @@ share/openrct2/object/rct2ww/scenery_wall/rct2ww.scene share/openrct2/object/rct2ww/scenery_wall/rct2ww.scenery_wall.wwind06.json share/openrct2/palettes.dat share/openrct2/scenario_patches/ +share/openrct2/scenario_patches/0129e96.parkpatch share/openrct2/scenario_patches/0153987.parkpatch share/openrct2/scenario_patches/020ed74.parkpatch share/openrct2/scenario_patches/081feb1.parkpatch @@ -2680,6 +2682,7 @@ share/openrct2/scenario_patches/3767ef3.parkpatch share/openrct2/scenario_patches/3781719.parkpatch share/openrct2/scenario_patches/37d31a4.parkpatch share/openrct2/scenario_patches/3a2ca59.parkpatch +share/openrct2/scenario_patches/3c799b8.parkpatch share/openrct2/scenario_patches/3ff5604.parkpatch share/openrct2/scenario_patches/41c7297.parkpatch share/openrct2/scenario_patches/43b5d61.parkpatch