Re: [update] math/cgal + cad/openscad revision
10/29/23 20:02, Renato Aguiar пишет: > The math/cgal update is indeed required for updating > cad/prusaslicer. I managed to get a working port for > cad/prusaslicer 2.6.1 by using this diff. > > However, I haven't yet tried to build cad/prusaslicer 2.5.2 > (currently in ports tree) with updated math/cgal. Curret 2.5.2 fails with new cgal, so your pru1saslicer update should follow the cgal one. Can you send a diff?
Re: [update] math/cgal + cad/openscad revision
On Sun, Oct 29 2023, Klemens Nanni wrote: If cad/openscad (and cad/prusaslicer most likely as well) require new version to build in the future, I'd add a version spec to the dependency: BUILD_DEPENDS +=math/cgal>=5.6v0 Have you looked into enabling tests for cgal? Would be nice to hear from Ian (imported prusaslicer) or its maintainer Renato about this. The math/cgal update is indeed required for updating cad/prusaslicer. I managed to get a working port for cad/prusaslicer 2.6.1 by using this diff. However, I haven't yet tried to build cad/prusaslicer 2.5.2 (currently in ports tree) with updated math/cgal. Regards, -- Renato Aguiar
Re: [update] math/cgal + cad/openscad revision
Your diffs apply now, but cad/prusaslicer still has CGAL in WANTLIB. Diff below configures, but fails to build, so you need to handle that before updating math/cgal. If cad/openscad (and cad/prusaslicer most likely as well) require new version to build in the future, I'd add a version spec to the dependency: BUILD_DEPENDS +=math/cgal>=5.6v0 Have you looked into enabling tests for cgal? Would be nice to hear from Ian (imported prusaslicer) or its maintainer Renato about this. Index: Makefile === RCS file: /cvs/ports/cad/prusaslicer/Makefile,v diff -u -p -r1.3 Makefile --- Makefile21 Oct 2023 13:49:26 - 1.3 +++ Makefile29 Oct 2023 14:40:44 - @@ -1,7 +1,7 @@ COMMENT = g-code generator for 3D printers V =2.5.2 -REVISION = 1 +REVISION = 2 PKGNAME = prusaslicer-${V} GH_ACCOUNT = prusa3d @@ -17,7 +17,7 @@ MAINTAINER = Renato Aguiar
Re: [update] math/cgal + cad/openscad revision
Oct 23, 2023 07:57:35 Johannes Thyssen Tishman : > Oct 15, 2023 00:10:08 Johannes Thyssen Tishman : > >> Hi Klemens. Thanks for the feedback. >> >>> The existing CMakeLists.txt no longer applies, but it looks like >>> you no longer needed it, perhaps forgot to 'cvs rm -f' it? >> >> Yup, thanks. >> -MASTER_SITES = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/ +SITES = https://github.com/CGAL/cgal/releases/download/v${V}/ >>> >>> This SITES change is committed, is your tree up to date? >> >> I believe it was when I first submitted the patches. I then blindly >> forwarded the exact same patches a few weeks later to ian@, which >> of course where out of date. Sorry about that. Please find updated >> diffs for both ports attached. >> >> Kind regards, >> Johannes > *ping* *ping*
Re: [update] math/cgal + cad/openscad revision
Oct 15, 2023 00:10:08 Johannes Thyssen Tishman : > Hi Klemens. Thanks for the feedback. > >> The existing CMakeLists.txt no longer applies, but it looks like >> you no longer needed it, perhaps forgot to 'cvs rm -f' it? > > Yup, thanks. > >>> -MASTER_SITES = >>> https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/ >>> +SITES = https://github.com/CGAL/cgal/releases/download/v${V}/ >> >> This SITES change is committed, is your tree up to date? > > I believe it was when I first submitted the patches. I then blindly > forwarded the exact same patches a few weeks later to ian@, which > of course where out of date. Sorry about that. Please find updated > diffs for both ports attached. > > Kind regards, > Johannes *ping*
Re: [update] math/cgal + cad/openscad revision
Hi Klemens. Thanks for the feedback. > The existing CMakeLists.txt no longer applies, but it looks like > you no longer needed it, perhaps forgot to 'cvs rm -f' it? Yup, thanks. > > -MASTER_SITES = > > https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/ > > +SITES = > > https://github.com/CGAL/cgal/releases/download/v${V}/ > > This SITES change is committed, is your tree up to date? I believe it was when I first submitted the patches. I then blindly forwarded the exact same patches a few weeks later to ian@, which of course where out of date. Sorry about that. Please find updated diffs for both ports attached. Kind regards, Johannes Index: Makefile === RCS file: /cvs/ports/math/cgal/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- Makefile27 Sep 2023 09:27:53 - 1.27 +++ Makefile14 Oct 2023 21:42:14 - @@ -1,45 +1,32 @@ -BROKEN-mips64 =ICE on Interval_nt.h:98 - COMMENT = Computational Geometry Algorithms Library -DISTNAME = CGAL-4.14.2 +V =5.6 +DISTNAME = CGAL-${V} PKGNAME = ${DISTNAME:L} EPOCH =0 -SHARED_LIBS += CGAL2.0 # 13.0.3 -SHARED_LIBS += CGAL_Core 2.0 # 14.0.3 -SHARED_LIBS += CGAL_ImageIO2.0 # 14.0.0 -SHARED_LIBS += CGAL_Qt52.0 # 14.0.0 - CATEGORIES = math HOMEPAGE = https://www.cgal.org/ -# mix of LGPLv2.1 and QPL; see https://www.cgal.org/license.html +# LGPLv3+ and GPLv3+; see https://www.cgal.org/license.html PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Svg -WANTLIB += Qt5Widgets Qt5Xml gmp m mpfr z - -SITES = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/ +SITES = https://github.com/CGAL/cgal/releases/download/v${V}/ EXTRACT_SUFX = .tar.xz MODULES = devel/cmake \ - x11/qt5 - -BUILD_DEPENDS =math/eigen3 \ - devel/boost + lang/python -LIB_DEPENDS = devel/gmp \ - devel/mpfr \ - x11/qt5/qtsvg - -CXXFLAGS +=-I${X11BASE}/include - -CONFIGURE_ARGS += -DCGAL_INSTALL_MAN_DIR="man/man1" \ - -DCGAL_INSTALL_DOC_DIR="share/doc/cgal" -CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib" +RUN_DEPEPNDS = devel/boost \ + devel/gmp \ + devel/mpfr +NO_BUILD = Yes NO_TEST = Yes + +post-install: + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ + ${PREFIX}/lib/cmake/CGAL/Help .include Index: distinfo === RCS file: /cvs/ports/math/cgal/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo4 Feb 2020 06:09:02 - 1.5 +++ distinfo14 Oct 2023 21:42:14 - @@ -1,2 +1,2 @@ -SHA256 (CGAL-4.14.2.tar.xz) = gZtoY2FO5lqw7cmL9wMhtstl4LQLjUD+e9c37uC4mSI= -SIZE (CGAL-4.14.2.tar.xz) = 15617164 +SHA256 (CGAL-5.6.tar.xz) = 3KubCKUKBqfMLMaaihIgD42PORubgBOuR2llwQtFFh8= +SIZE (CGAL-5.6.tar.xz) = 24874364 Index: patches/patch-CMakeLists_txt === RCS file: patches/patch-CMakeLists_txt diff -N patches/patch-CMakeLists_txt --- patches/patch-CMakeLists_txt11 Mar 2022 19:36:13 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,31 +0,0 @@ -- add workaround from https://bugs.kde.org/show_bug.cgi?id=304111 -- Disable some dependencies - -Index: CMakeLists.txt CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -391,6 +391,8 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake) - include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake) - cgal_setup_module_path() - -+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED ) -+ - message( STATUS "CGAL_REFERENCE_CACHE_DIR=${CGAL_REFERENCE_CACHE_DIR}" ) - - if ( RUNNING_CGAL_AUTO_TEST ) -@@ -1073,15 +1075,9 @@ if ( CGAL_BRANCH_BUILD ) - - message( "== Setting header checking ==" ) - find_package(GMP REQUIRED) --find_package(Doxygen REQUIRED) - find_package(Eigen3 REQUIRED) - find_package(Qt5 COMPONENTS Core Widgets Xml OpenGL Gui REQUIRED) - find_package(VTK COMPONENTS vtkImagingGeneral vtkIOImage NO_MODULE) --find_package(IPE) --find_package(RS3) --find_package(LEDA) --find_package(OpenMesh) --find_package(OpenCV QUIET) - - set(compile_options "\ - ${CMAKE_CXX_FLAGS} -DCGAL_EIGEN3_ENABLED -DCGAL_PROFILE \ Index: pkg/PLIST === RCS file: /cvs/ports/math/cgal/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 11 Mar
Re: [update] math/cgal + cad/openscad revision
This does not apply, feedback inline, new diff with that at the end. I don't use cgal or openscad, though, and this needs another look. The existing CMakeLists.txt no longer applies, but it looks like you no longer needed it, perhaps forgot to 'cvs rm -f' it? Otherwise, looks like the first first hunk could be a simple CXXFLAGS addition (makes little sense in a NO_BUILD=Yes) port; the second hunk, if needed, can be a bunch of CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxgygen=ON ...OpenMesh=ON. On Wed, Oct 11, 2023 at 05:17:17PM +0200, Johannes Thyssen Tishman wrote: > Index: Makefile > === > RCS file: /cvs/ports/math/cgal/Makefile,v > retrieving revision 1.26 > diff -u -p -r1.26 Makefile > --- Makefile 11 Mar 2022 19:36:13 - 1.26 > +++ Makefile 17 Sep 2023 19:48:08 - > @@ -1,45 +1,33 @@ > -BROKEN-mips64 = ICE on Interval_nt.h:98 > - > COMMENT =Computational Geometry Algorithms Library > > -DISTNAME = CGAL-4.14.2 > +V = 5.6 > +DISTNAME = CGAL-${V} > PKGNAME =${DISTNAME:L} > -EPOCH = 0 EPOCH must not be removed or decremented. > - > -SHARED_LIBS += CGAL2.0 # 13.0.3 > -SHARED_LIBS += CGAL_Core 2.0 # 14.0.3 > -SHARED_LIBS += CGAL_ImageIO2.0 # 14.0.0 > -SHARED_LIBS += CGAL_Qt52.0 # 14.0.0 > > CATEGORIES = math > > HOMEPAGE = https://www.cgal.org/ > > -# mix of LGPLv2.1 and QPL; see https://www.cgal.org/license.html > +# LGPLv3+ and GPLv3+; see https://www.cgal.org/license.html > PERMIT_PACKAGE = Yes > > -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Svg > -WANTLIB += Qt5Widgets Qt5Xml gmp m mpfr z > - > -MASTER_SITES = > https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/ > +SITES = > https://github.com/CGAL/cgal/releases/download/v${V}/ This SITES change is committed, is your tree up to date? > EXTRACT_SUFX = .tar.xz > > MODULES =devel/cmake \ > - x11/qt5 > - > -BUILD_DEPENDS = math/eigen3 \ > - devel/boost > + lang/python > > LIB_DEPENDS =devel/gmp \ > devel/mpfr \ > - x11/qt5/qtsvg > - > -CXXFLAGS += -I${X11BASE}/include > - > -CONFIGURE_ARGS +=-DCGAL_INSTALL_MAN_DIR="man/man1" \ > - -DCGAL_INSTALL_DOC_DIR="share/doc/cgal" > -CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib" > + devel/boost > > +NO_BUILD = Yes That and empty WANTLIB means no libraries this port links against, so LIB_ should be BUILD_ + RUN_DEPENDS really (what mix, I don't know). > NO_TEST =Yes > + > +post-install: > + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ > + ${PREFIX}/lib/cmake/CGAL/Help/cmake.py > + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ > + ${PREFIX}/lib/cmake/CGAL/Help/conf.py Index: Makefile === RCS file: /cvs/ports/math/cgal/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- Makefile27 Sep 2023 09:27:53 - 1.27 +++ Makefile13 Oct 2023 16:40:40 - @@ -1,45 +1,38 @@ -BROKEN-mips64 =ICE on Interval_nt.h:98 - COMMENT = Computational Geometry Algorithms Library -DISTNAME = CGAL-4.14.2 +V =5.6 +DISTNAME = CGAL-${V} PKGNAME = ${DISTNAME:L} EPOCH =0 -SHARED_LIBS += CGAL2.0 # 13.0.3 -SHARED_LIBS += CGAL_Core 2.0 # 14.0.3 -SHARED_LIBS += CGAL_ImageIO2.0 # 14.0.0 -SHARED_LIBS += CGAL_Qt52.0 # 14.0.0 - CATEGORIES = math HOMEPAGE = https://www.cgal.org/ -# mix of LGPLv2.1 and QPL; see https://www.cgal.org/license.html +# LGPLv3+ and GPLv3+; see https://www.cgal.org/license.html PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Svg -WANTLIB += Qt5Widgets Qt5Xml gmp m mpfr z - -SITES = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/ +SITES = https://github.com/CGAL/cgal/releases/download/v${V}/ EXTRACT_SUFX = .tar.xz MODULES = devel/cmake \ - x11/qt5 - -BUILD_DEPENDS =math/eigen3 \ - devel/boost + lang/python -LIB_DEPENDS = devel/gmp \ - devel/mpfr \ - x11/qt5/qtsvg - -CXXFLAGS +=-I${X11BASE}/include - -CONFIGURE_ARGS += -DCGAL_INSTALL_MAN_DIR="man/man1" \ - -DCGAL_INSTALL_DOC_DIR="share/doc/cgal" -CONFIGURE_ENV +=
Re: [update] math/cgal + cad/openscad revision
Oct 11, 2023 17:01:11 Ian Darwin : > Sorry I missed that - could you please re-send me the patch? Hi Ian. All good. Please find both diffs attached. Thanks Johannes > Thanks > Ian > > On Wed, Oct 11, 2023 at 04:27:04PM +0200, Johannes Thyssen Tishman wrote: >> *ping* >> >> Johannes Thyssen Tishman wrote: >>> *ping* >>> >>> Sep 17, 2023 22:08:53 Johannes Thyssen Tishman : >>> Apologies for the poor formatting. I had 'textwidth' set to 80 characters. Fixed below. Johannes Thyssen Tishman wrote: > Hello everyone, > > attached is both an update for CGAL from version 4.14.2 to the latest > 5.6 and a revision to OpenSCAD to work with the CGAL update. Note that > these are to be imported together to keep OpenSCAD from breaking. > > Despite being actively developed, OpenSCAD hasn't seen a release since > 2021. Until now, OpenSCAD is CGAL's only consumer, which has allowed > CGAL to become outdated without causing any issues. However the latest > version of the recently imported PrusaSlicer also requires CGAL, but > will not work with the old version we have in ports. > > Regarding the OpenSCAD revision, the master branch already depends on > newer versions of CGAL which means that we can simply backport some > commits to update CGAL. That is basically all what the attached diff > does. Most if not all new patches should be fine to drop once OpenSCAD > makes a release. > > Now for the CGAL update, since version 5.0 CGAL is a header-only > library which can be installed without compiling. I've included only > the essential dependencies[1] and left all other optional dependencies > up to the software using CGAL that depends on them. Besides building a > couple of the examples provided in CGAL's source, I'm not sure how to > judge the quality of the port. I also blindly assumed that the > 'BROKEN-mips64' line could be removed as there is no compilation > needed anymore. I'd be interested to know if this update unbreaks > OpenSCAD in sparc64. > > Any feedback or OK's would be very appreciated. Both 'portcheck' and > 'make port-lib-depends-check' are happy with the new changes in both > ports (the latter has some complains about OpenSCAD's port, but I > assumed it could be ignored since it's from a previous update). I > tested some examples from OpenSCAD and they seem to work just fine, > but I'd appreciate some testing from someone who actually uses it. > > Thanks! > > Kind regards, > Johannes > > [1] https://doc.cgal.org/latest/Manual/thirdparty.html >> Index: Makefile === RCS file: /cvs/ports/math/cgal/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile11 Mar 2022 19:36:13 - 1.26 +++ Makefile17 Sep 2023 19:48:08 - @@ -1,45 +1,33 @@ -BROKEN-mips64 =ICE on Interval_nt.h:98 - COMMENT = Computational Geometry Algorithms Library -DISTNAME = CGAL-4.14.2 +V =5.6 +DISTNAME = CGAL-${V} PKGNAME = ${DISTNAME:L} -EPOCH =0 - -SHARED_LIBS += CGAL2.0 # 13.0.3 -SHARED_LIBS += CGAL_Core 2.0 # 14.0.3 -SHARED_LIBS += CGAL_ImageIO2.0 # 14.0.0 -SHARED_LIBS += CGAL_Qt52.0 # 14.0.0 CATEGORIES = math HOMEPAGE = https://www.cgal.org/ -# mix of LGPLv2.1 and QPL; see https://www.cgal.org/license.html +# LGPLv3+ and GPLv3+; see https://www.cgal.org/license.html PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Svg -WANTLIB += Qt5Widgets Qt5Xml gmp m mpfr z - -MASTER_SITES = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/ +SITES = https://github.com/CGAL/cgal/releases/download/v${V}/ EXTRACT_SUFX = .tar.xz MODULES = devel/cmake \ - x11/qt5 - -BUILD_DEPENDS =math/eigen3 \ - devel/boost + lang/python LIB_DEPENDS = devel/gmp \ devel/mpfr \ - x11/qt5/qtsvg - -CXXFLAGS +=-I${X11BASE}/include - -CONFIGURE_ARGS += -DCGAL_INSTALL_MAN_DIR="man/man1" \ - -DCGAL_INSTALL_DOC_DIR="share/doc/cgal" -CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib" + devel/boost +NO_BUILD = Yes NO_TEST = Yes + +post-install: + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ + ${PREFIX}/lib/cmake/CGAL/Help/cmake.py + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ + ${PREFIX}/lib/cmake/CGAL/Help/conf.py .include Index: distinfo
Re: [update] math/cgal + cad/openscad revision
*ping* Johannes Thyssen Tishman wrote: > *ping* > > Sep 17, 2023 22:08:53 Johannes Thyssen Tishman : > > > Apologies for the poor formatting. I had 'textwidth' set to 80 > > characters. Fixed below. > > > > Johannes Thyssen Tishman wrote: > >> Hello everyone, > >> > >> attached is both an update for CGAL from version 4.14.2 to the latest > >> 5.6 and a revision to OpenSCAD to work with the CGAL update. Note that > >> these are to be imported together to keep OpenSCAD from breaking. > >> > >> Despite being actively developed, OpenSCAD hasn't seen a release since > >> 2021. Until now, OpenSCAD is CGAL's only consumer, which has allowed > >> CGAL to become outdated without causing any issues. However the latest > >> version of the recently imported PrusaSlicer also requires CGAL, but > >> will not work with the old version we have in ports. > >> > >> Regarding the OpenSCAD revision, the master branch already depends on > >> newer versions of CGAL which means that we can simply backport some > >> commits to update CGAL. That is basically all what the attached diff > >> does. Most if not all new patches should be fine to drop once OpenSCAD > >> makes a release. > >> > >> Now for the CGAL update, since version 5.0 CGAL is a header-only > >> library which can be installed without compiling. I've included only > >> the essential dependencies[1] and left all other optional dependencies > >> up to the software using CGAL that depends on them. Besides building a > >> couple of the examples provided in CGAL's source, I'm not sure how to > >> judge the quality of the port. I also blindly assumed that the > >> 'BROKEN-mips64' line could be removed as there is no compilation > >> needed anymore. I'd be interested to know if this update unbreaks > >> OpenSCAD in sparc64. > >> > >> Any feedback or OK's would be very appreciated. Both 'portcheck' and > >> 'make port-lib-depends-check' are happy with the new changes in both > >> ports (the latter has some complains about OpenSCAD's port, but I > >> assumed it could be ignored since it's from a previous update). I > >> tested some examples from OpenSCAD and they seem to work just fine, > >> but I'd appreciate some testing from someone who actually uses it. > >> > >> Thanks! > >> > >> Kind regards, > >> Johannes > >> > >> [1] https://doc.cgal.org/latest/Manual/thirdparty.html
Re: [update] math/cgal + cad/openscad revision
*ping* Sep 17, 2023 22:08:53 Johannes Thyssen Tishman : > Apologies for the poor formatting. I had 'textwidth' set to 80 > characters. Fixed below. > > Johannes Thyssen Tishman wrote: >> Hello everyone, >> >> attached is both an update for CGAL from version 4.14.2 to the latest >> 5.6 and a revision to OpenSCAD to work with the CGAL update. Note that >> these are to be imported together to keep OpenSCAD from breaking. >> >> Despite being actively developed, OpenSCAD hasn't seen a release since >> 2021. Until now, OpenSCAD is CGAL's only consumer, which has allowed >> CGAL to become outdated without causing any issues. However the latest >> version of the recently imported PrusaSlicer also requires CGAL, but >> will not work with the old version we have in ports. >> >> Regarding the OpenSCAD revision, the master branch already depends on >> newer versions of CGAL which means that we can simply backport some >> commits to update CGAL. That is basically all what the attached diff >> does. Most if not all new patches should be fine to drop once OpenSCAD >> makes a release. >> >> Now for the CGAL update, since version 5.0 CGAL is a header-only >> library which can be installed without compiling. I've included only >> the essential dependencies[1] and left all other optional dependencies >> up to the software using CGAL that depends on them. Besides building a >> couple of the examples provided in CGAL's source, I'm not sure how to >> judge the quality of the port. I also blindly assumed that the >> 'BROKEN-mips64' line could be removed as there is no compilation >> needed anymore. I'd be interested to know if this update unbreaks >> OpenSCAD in sparc64. >> >> Any feedback or OK's would be very appreciated. Both 'portcheck' and >> 'make port-lib-depends-check' are happy with the new changes in both >> ports (the latter has some complains about OpenSCAD's port, but I >> assumed it could be ignored since it's from a previous update). I >> tested some examples from OpenSCAD and they seem to work just fine, >> but I'd appreciate some testing from someone who actually uses it. >> >> Thanks! >> >> Kind regards, >> Johannes >> >> [1] https://doc.cgal.org/latest/Manual/thirdparty.html
Re: [update] math/cgal + cad/openscad revision
Apologies for the poor formatting. I had 'textwidth' set to 80 characters. Fixed below. Johannes Thyssen Tishman wrote: > Hello everyone, > > attached is both an update for CGAL from version 4.14.2 to the latest > 5.6 and a revision to OpenSCAD to work with the CGAL update. Note that > these are to be imported together to keep OpenSCAD from breaking. > > Despite being actively developed, OpenSCAD hasn't seen a release since > 2021. Until now, OpenSCAD is CGAL's only consumer, which has allowed > CGAL to become outdated without causing any issues. However the latest > version of the recently imported PrusaSlicer also requires CGAL, but > will not work with the old version we have in ports. > > Regarding the OpenSCAD revision, the master branch already depends on > newer versions of CGAL which means that we can simply backport some > commits to update CGAL. That is basically all what the attached diff > does. Most if not all new patches should be fine to drop once OpenSCAD > makes a release. > > Now for the CGAL update, since version 5.0 CGAL is a header-only > library which can be installed without compiling. I've included only > the essential dependencies[1] and left all other optional dependencies > up to the software using CGAL that depends on them. Besides building a > couple of the examples provided in CGAL's source, I'm not sure how to > judge the quality of the port. I also blindly assumed that the > 'BROKEN-mips64' line could be removed as there is no compilation > needed anymore. I'd be interested to know if this update unbreaks > OpenSCAD in sparc64. > > Any feedback or OK's would be very appreciated. Both 'portcheck' and > 'make port-lib-depends-check' are happy with the new changes in both > ports (the latter has some complains about OpenSCAD's port, but I > assumed it could be ignored since it's from a previous update). I > tested some examples from OpenSCAD and they seem to work just fine, > but I'd appreciate some testing from someone who actually uses it. > > Thanks! > > Kind regards, > Johannes > > [1] https://doc.cgal.org/latest/Manual/thirdparty.html