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() > > > > - > > >
No comments:
Post a Comment