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
[update] math/cgal + cad/openscad revision
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/cad/openscad/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile24 Apr 2023 11:40:35 - 1.47
+++ Makefile17 Sep 2023 19:46:22 -
@@ -1,9 +1,9 @@
-COMMENT = the programmer's solid 3D CAD modeller#'
+COMMENT = the programmer's solid 3D CAD modeller
BROKEN-sparc64=SIGILL on src/cgalutils.cc with CGAL-4.6.3
V =2021.01
DISTNAME = openscad-${V}
-REVISION = 5
+REVISION = 6
CATEGORIES = cad
@@ -20,7 +20,7 @@ WANTLIB += boost_thread-mt c cairo doubl
WANTLIB += freetype glib-2.0 gmp harfbuzz intl m mpfr opencsg
WANTLIB += qscintilla2_qt5 xml2 zip
-MASTER_SITES = https://files.openscad.org/
+SITES =https://files.openscad.org/
EXTRACT_SUFX = .src.tar.gz
MODULES = devel/qmake \
Index: patches/patch-src_cgalutils-polyhedron_cc
===
RCS file: patches/patch-src_cgalutils-polyhedron_cc
diff -N patches/patch-src_cgalutils-polyhedron_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_cgalutils-polyhedron_cc 17 Sep 2023 19:46:22 -
@@ -0,0 +1,26 @@
+Backport from upstream
+Commit: cc49ad8dac24309f5452d5dea9abd406615a52d9
+
+Index: src/cgalutils-polyhedron.cc
+--- src/cgalutils-polyhedron.cc.orig
src/cgalutils-polyhedron.cc
+@@ -337,19 +337,6 @@ namespace CGALUtils {
+ }
+ };
+
+- template
+- std::string printPolyhedron(const Polyhedron ) {
+- std::ostringstream sstream;
+- sstream.precision(20);
+-
+-Polyhedron_writer writer;
+-generic_print_polyhedron(sstream, p, writer);
+-
+- return sstream.str();
+- }
+-
+- template std::string printPolyhedron(const CGAL_Polyhedron );
+-
+ }; // namespace CGALUtils
+
+ #endif /* ENABLE_CGAL */
Index: patches/patch-src_cgalutils-tess_cc
===
RCS file: patches/patch-src_cgalutils-tess_cc
diff -N patches/patch-src_cgalutils-tess_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_cgalutils-tess_cc 17 Sep 2023 19:46:22 -
@@ -0,0 +1,29 @@
+Backport from upstream
+Commit: d559fa838ea919e664661bfcf1d3274c83743d61
+
+Index: src/cgalutils-tess.cc
+--- src/cgalutils-tess.cc.orig
src/cgalutils-tess.cc
+@@ -6,10 +6,12 @@
+ #pragma push_macro("NDEBUG")
+ #undef NDEBUG
+ #include
+-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
++#if CGAL_VERSION_NR < 1050401000
+ #include
++ typedef CGAL::Triangulation_2_filtered_projection_traits_3 Projection;
+ #else
+- #include
++ #include
++ typedef CGAL::Filtered_projection_traits_3 Projection;
+ #endif
+ #include
+ #pragma pop_macro("NDEBUG")
+@@ -19,7 +21,6 @@ struct FaceInfo {
+ bool in_domain() { return nesting_level%2 == 1; }
+ };
+
+-typedef
Re: [update] math/cgal 3.8 - 4.4
On Fri, Aug 15, 2014 at 11:09 AM, Aaron def...@gmail.com wrote:
On Fri, Aug 15, 2014 at 9:28 AM, Aaron def...@gmail.com wrote:
On Fri, Aug 15, 2014 at 9:19 AM, David Coppa dco...@gmail.com wrote:
Il giorno 15/ago/2014 15.57, Aaron Bieber def...@gmail.com ha
scritto:
Hola,
This diff brings CGAL to the latest version which is requried for a
cad/openscad update I will send in another email.
No major changes in the port, mostly regen'd WANTLIB and new plist
entries.
OK?
Index: Makefile
===
RCS file: /cvs/ports/math/cgal/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile13 Mar 2014 21:05:38 - 1.10
+++ Makefile15 Aug 2014 13:42:23 -
@@ -10,8 +10,8 @@ COMMENT = Computational Geometry Algori
# when updating this port, don't just change the version number here.
# MASTER_SITES needs to be adapted for every new tarball.
# See https://gforge.inria.fr/frs/?group_id=52 for files index.
-DISTNAME = CGAL-3.8
-MASTER_SITES =
https://gforge.inria.fr/frs/download.php/28500/
+DISTNAME = CGAL-4.4
+MASTER_SITES =
https://gforge.inria.fr/frs/download.php/33525/
PKGNAME = ${DISTNAME:L}
EPOCH =0
@@ -29,8 +29,8 @@ HOMEPAGE =http://www.cgal.org/
PERMIT_PACKAGE_CDROM = Yes
# m=5.3 for fenv.h support
-WANTLIB = GL GLU ICE SM X11 Xext boost_thread-mt gmp
gmpxx \
- lib/qt4/QtGui lib/qt4/QtOpenGL m=5.3 mpfr
stdc++ z
+WANTLIB += GL GLU ICE QtGui QtOpenGL SM X11 Xext boost_system-mt
Leave qt4 libraries as they were before: lib/qt4/QtGui, not QtGui.
Apart from this, the diff is good.
http://sprunge.us/CFLi -- updated diff with lib/qt4 - also re-added the
m=5.3
OK?
Just realized I didn't bump the shared libs. Retesting.
Here is a link to the updated version.. includes no more 4.4 in the PLIST,
bumped shlibs,
and updates the license info.
OK?
Ciao,
David
+WANTLIB += boost_thread-mt gmp m mpfr stdc++ z
MODULES = devel/cmake \
x11/qt4
@@ -45,10 +45,8 @@ CONFIGURE_ENV = LDFLAGS=-L${X11BASE}/l
post-patch:
rm ${WRKSRC}/cmake/modules/FindBLAS.cmake \
- ${WRKSRC}/cmake/modules/FindBoost.cmake \
${WRKSRC}/cmake/modules/FindLAPACK.cmake \
${WRKSRC}/cmake/modules/FindOpenGL.cmake \
- ${WRKSRC}/cmake/modules/FindPackageMessage.cmake \
${WRKSRC}/scripts/cgal_make_macosx_app
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/math/cgal/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo13 Mar 2014 20:50:22 - 1.3
+++ distinfo15 Aug 2014 13:42:23 -
@@ -1,2 +1,2 @@
-SHA256 (CGAL-3.8.tar.gz) =
se3VGIYTTPCG0XmCxQ9xAleBFWHSiLQ5rzprxjI4ntQ=
-SIZE (CGAL-3.8.tar.gz) = 14112547
+SHA256 (CGAL-4.4.tar.gz) =
1+vG0ZQuPYPh9StuYOuTkPe7f4fmyLDS/hiLtZLOiuM=
+SIZE (CGAL-4.4.tar.gz) = 15281016
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/cgal/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Jan 2012 14:48:50 - 1.3
+++ pkg/PLIST 15 Aug 2014 13:42:23 -
@@ -1,9 +1,14 @@
@comment $OpenBSD: PLIST,v 1.3 2012/01/20 14:48:50 dcoppa Exp $
+bin/cgal_create_CMakeLists
bin/cgal_create_cmake_script
include/CGAL/
+include/CGAL/AABB_face_graph_triangle_primitive.h
+include/CGAL/AABB_halfedge_graph_segment_primitive.h
include/CGAL/AABB_intersections.h
+include/CGAL/AABB_polyhedral_oracle.h
include/CGAL/AABB_polyhedron_segment_primitive.h
include/CGAL/AABB_polyhedron_triangle_primitive.h
+include/CGAL/AABB_primitive.h
include/CGAL/AABB_segment_primitive.h
include/CGAL/AABB_traits.h
include/CGAL/AABB_tree.h
@@ -86,18 +91,6 @@ include/CGAL/Apollonius_graph_2/Compare_
include/CGAL/Apollonius_graph_2/Constructions_C2.h
include/CGAL/Apollonius_graph_2/Constructions_ftC2.h
include/CGAL/Apollonius_graph_2/Constructions_rtH2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
Re: [update] math/cgal 3.8 - 4.4
On 15/08/14 11:28 AM, Aaron wrote: http://sprunge.us/CFLi -- updated diff with lib/qt4 - also re-added the m=5.3 There is no point in re-adding the m=5.3 bit. Once a release has gone by stuff like that can be garbage collected. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: [update] math/cgal 3.8 - 4.4
On Thu, Sep 11, 2014 at 3:59 PM, Brad Smith b...@comstyle.com wrote: On 15/08/14 11:28 AM, Aaron wrote: http://sprunge.us/CFLi -- updated diff with lib/qt4 - also re-added the m=5.3 There is no point in re-adding the m=5.3 bit. Once a release has gone by stuff like that can be garbage collected. http://sprunge.us/cdTc removed =5.3 OK? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
[update] math/cgal 3.8 - 4.4
Hola,
This diff brings CGAL to the latest version which is requried for a
cad/openscad update I will send in another email.
No major changes in the port, mostly regen'd WANTLIB and new plist
entries.
OK?
Index: Makefile
===
RCS file: /cvs/ports/math/cgal/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile13 Mar 2014 21:05:38 - 1.10
+++ Makefile15 Aug 2014 13:42:23 -
@@ -10,8 +10,8 @@ COMMENT = Computational Geometry Algori
# when updating this port, don't just change the version number here.
# MASTER_SITES needs to be adapted for every new tarball.
# See https://gforge.inria.fr/frs/?group_id=52 for files index.
-DISTNAME = CGAL-3.8
-MASTER_SITES = https://gforge.inria.fr/frs/download.php/28500/
+DISTNAME = CGAL-4.4
+MASTER_SITES = https://gforge.inria.fr/frs/download.php/33525/
PKGNAME = ${DISTNAME:L}
EPOCH =0
@@ -29,8 +29,8 @@ HOMEPAGE =http://www.cgal.org/
PERMIT_PACKAGE_CDROM = Yes
# m=5.3 for fenv.h support
-WANTLIB = GL GLU ICE SM X11 Xext boost_thread-mt gmp gmpxx \
- lib/qt4/QtGui lib/qt4/QtOpenGL m=5.3 mpfr stdc++ z
+WANTLIB += GL GLU ICE QtGui QtOpenGL SM X11 Xext boost_system-mt
+WANTLIB += boost_thread-mt gmp m mpfr stdc++ z
MODULES = devel/cmake \
x11/qt4
@@ -45,10 +45,8 @@ CONFIGURE_ENV = LDFLAGS=-L${X11BASE}/l
post-patch:
rm ${WRKSRC}/cmake/modules/FindBLAS.cmake \
- ${WRKSRC}/cmake/modules/FindBoost.cmake \
${WRKSRC}/cmake/modules/FindLAPACK.cmake \
${WRKSRC}/cmake/modules/FindOpenGL.cmake \
- ${WRKSRC}/cmake/modules/FindPackageMessage.cmake \
${WRKSRC}/scripts/cgal_make_macosx_app
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/math/cgal/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo13 Mar 2014 20:50:22 - 1.3
+++ distinfo15 Aug 2014 13:42:23 -
@@ -1,2 +1,2 @@
-SHA256 (CGAL-3.8.tar.gz) = se3VGIYTTPCG0XmCxQ9xAleBFWHSiLQ5rzprxjI4ntQ=
-SIZE (CGAL-3.8.tar.gz) = 14112547
+SHA256 (CGAL-4.4.tar.gz) = 1+vG0ZQuPYPh9StuYOuTkPe7f4fmyLDS/hiLtZLOiuM=
+SIZE (CGAL-4.4.tar.gz) = 15281016
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/cgal/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Jan 2012 14:48:50 - 1.3
+++ pkg/PLIST 15 Aug 2014 13:42:23 -
@@ -1,9 +1,14 @@
@comment $OpenBSD: PLIST,v 1.3 2012/01/20 14:48:50 dcoppa Exp $
+bin/cgal_create_CMakeLists
bin/cgal_create_cmake_script
include/CGAL/
+include/CGAL/AABB_face_graph_triangle_primitive.h
+include/CGAL/AABB_halfedge_graph_segment_primitive.h
include/CGAL/AABB_intersections.h
+include/CGAL/AABB_polyhedral_oracle.h
include/CGAL/AABB_polyhedron_segment_primitive.h
include/CGAL/AABB_polyhedron_triangle_primitive.h
+include/CGAL/AABB_primitive.h
include/CGAL/AABB_segment_primitive.h
include/CGAL/AABB_traits.h
include/CGAL/AABB_tree.h
@@ -86,18 +91,6 @@ include/CGAL/Apollonius_graph_2/Compare_
include/CGAL/Apollonius_graph_2/Constructions_C2.h
include/CGAL/Apollonius_graph_2/Constructions_ftC2.h
include/CGAL/Apollonius_graph_2/Constructions_rtH2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h
include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h
include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h
include/CGAL/Apollonius_graph_2/Incircle8_C2.h
@@ -181,12 +174,10 @@ include/CGAL/Arr_geometry_traits/Conic_x
include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h
include/CGAL/Arr_geometry_traits/Curve_data_aux.h
include/CGAL/Arr_geometry_traits/Hyperbolic_arc_2.h
-include/CGAL/Arr_geometry_traits/One_root_number.h
include/CGAL/Arr_geometry_traits/Polyline_2.h
include/CGAL/Arr_geometry_traits/Rational_arc_2.h
include/CGAL/Arr_geometry_traits/Segment_assertions.h
include/CGAL/Arr_geometry_traits/de_Casteljau_2.h
Re: [update] math/cgal 3.8 - 4.4
Il giorno 15/ago/2014 15.57, Aaron Bieber def...@gmail.com ha scritto:
Hola,
This diff brings CGAL to the latest version which is requried for a
cad/openscad update I will send in another email.
No major changes in the port, mostly regen'd WANTLIB and new plist
entries.
OK?
Index: Makefile
===
RCS file: /cvs/ports/math/cgal/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile13 Mar 2014 21:05:38 - 1.10
+++ Makefile15 Aug 2014 13:42:23 -
@@ -10,8 +10,8 @@ COMMENT = Computational Geometry Algori
# when updating this port, don't just change the version number here.
# MASTER_SITES needs to be adapted for every new tarball.
# See https://gforge.inria.fr/frs/?group_id=52 for files index.
-DISTNAME = CGAL-3.8
-MASTER_SITES = https://gforge.inria.fr/frs/download.php/28500/
+DISTNAME = CGAL-4.4
+MASTER_SITES = https://gforge.inria.fr/frs/download.php/33525/
PKGNAME = ${DISTNAME:L}
EPOCH =0
@@ -29,8 +29,8 @@ HOMEPAGE =http://www.cgal.org/
PERMIT_PACKAGE_CDROM = Yes
# m=5.3 for fenv.h support
-WANTLIB = GL GLU ICE SM X11 Xext boost_thread-mt gmp gmpxx \
- lib/qt4/QtGui lib/qt4/QtOpenGL m=5.3 mpfr stdc++
z
+WANTLIB += GL GLU ICE QtGui QtOpenGL SM X11 Xext boost_system-mt
Leave qt4 libraries as they were before: lib/qt4/QtGui, not QtGui.
Apart from this, the diff is good.
Ciao,
David
+WANTLIB += boost_thread-mt gmp m mpfr stdc++ z
MODULES = devel/cmake \
x11/qt4
@@ -45,10 +45,8 @@ CONFIGURE_ENV = LDFLAGS=-L${X11BASE}/l
post-patch:
rm ${WRKSRC}/cmake/modules/FindBLAS.cmake \
- ${WRKSRC}/cmake/modules/FindBoost.cmake \
${WRKSRC}/cmake/modules/FindLAPACK.cmake \
${WRKSRC}/cmake/modules/FindOpenGL.cmake \
- ${WRKSRC}/cmake/modules/FindPackageMessage.cmake \
${WRKSRC}/scripts/cgal_make_macosx_app
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/math/cgal/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo13 Mar 2014 20:50:22 - 1.3
+++ distinfo15 Aug 2014 13:42:23 -
@@ -1,2 +1,2 @@
-SHA256 (CGAL-3.8.tar.gz) = se3VGIYTTPCG0XmCxQ9xAleBFWHSiLQ5rzprxjI4ntQ=
-SIZE (CGAL-3.8.tar.gz) = 14112547
+SHA256 (CGAL-4.4.tar.gz) = 1+vG0ZQuPYPh9StuYOuTkPe7f4fmyLDS/hiLtZLOiuM=
+SIZE (CGAL-4.4.tar.gz) = 15281016
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/cgal/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Jan 2012 14:48:50 - 1.3
+++ pkg/PLIST 15 Aug 2014 13:42:23 -
@@ -1,9 +1,14 @@
@comment $OpenBSD: PLIST,v 1.3 2012/01/20 14:48:50 dcoppa Exp $
+bin/cgal_create_CMakeLists
bin/cgal_create_cmake_script
include/CGAL/
+include/CGAL/AABB_face_graph_triangle_primitive.h
+include/CGAL/AABB_halfedge_graph_segment_primitive.h
include/CGAL/AABB_intersections.h
+include/CGAL/AABB_polyhedral_oracle.h
include/CGAL/AABB_polyhedron_segment_primitive.h
include/CGAL/AABB_polyhedron_triangle_primitive.h
+include/CGAL/AABB_primitive.h
include/CGAL/AABB_segment_primitive.h
include/CGAL/AABB_traits.h
include/CGAL/AABB_tree.h
@@ -86,18 +91,6 @@ include/CGAL/Apollonius_graph_2/Compare_
include/CGAL/Apollonius_graph_2/Constructions_C2.h
include/CGAL/Apollonius_graph_2/Constructions_ftC2.h
include/CGAL/Apollonius_graph_2/Constructions_rtH2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h
include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h
include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h
include/CGAL/Apollonius_graph_2/Incircle8_C2.h
@@ -181,12 +174,10 @@ include/CGAL/Arr_geometry_traits/Conic_x
include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h
include/CGAL/Arr_geometry_traits/Curve_data_aux.h
Re: [update] math/cgal 3.8 - 4.4
On Fri, Aug 15, 2014 at 9:19 AM, David Coppa dco...@gmail.com wrote:
Il giorno 15/ago/2014 15.57, Aaron Bieber def...@gmail.com ha scritto:
Hola,
This diff brings CGAL to the latest version which is requried for a
cad/openscad update I will send in another email.
No major changes in the port, mostly regen'd WANTLIB and new plist
entries.
OK?
Index: Makefile
===
RCS file: /cvs/ports/math/cgal/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile13 Mar 2014 21:05:38 - 1.10
+++ Makefile15 Aug 2014 13:42:23 -
@@ -10,8 +10,8 @@ COMMENT = Computational Geometry Algori
# when updating this port, don't just change the version number here.
# MASTER_SITES needs to be adapted for every new tarball.
# See https://gforge.inria.fr/frs/?group_id=52 for files index.
-DISTNAME = CGAL-3.8
-MASTER_SITES = https://gforge.inria.fr/frs/download.php/28500/
+DISTNAME = CGAL-4.4
+MASTER_SITES = https://gforge.inria.fr/frs/download.php/33525/
PKGNAME = ${DISTNAME:L}
EPOCH =0
@@ -29,8 +29,8 @@ HOMEPAGE =http://www.cgal.org/
PERMIT_PACKAGE_CDROM = Yes
# m=5.3 for fenv.h support
-WANTLIB = GL GLU ICE SM X11 Xext boost_thread-mt gmp gmpxx
\
- lib/qt4/QtGui lib/qt4/QtOpenGL m=5.3 mpfr
stdc++ z
+WANTLIB += GL GLU ICE QtGui QtOpenGL SM X11 Xext boost_system-mt
Leave qt4 libraries as they were before: lib/qt4/QtGui, not QtGui.
Apart from this, the diff is good.
http://sprunge.us/CFLi -- updated diff with lib/qt4 - also re-added the
m=5.3
OK?
Ciao,
David
+WANTLIB += boost_thread-mt gmp m mpfr stdc++ z
MODULES = devel/cmake \
x11/qt4
@@ -45,10 +45,8 @@ CONFIGURE_ENV = LDFLAGS=-L${X11BASE}/l
post-patch:
rm ${WRKSRC}/cmake/modules/FindBLAS.cmake \
- ${WRKSRC}/cmake/modules/FindBoost.cmake \
${WRKSRC}/cmake/modules/FindLAPACK.cmake \
${WRKSRC}/cmake/modules/FindOpenGL.cmake \
- ${WRKSRC}/cmake/modules/FindPackageMessage.cmake \
${WRKSRC}/scripts/cgal_make_macosx_app
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/math/cgal/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo13 Mar 2014 20:50:22 - 1.3
+++ distinfo15 Aug 2014 13:42:23 -
@@ -1,2 +1,2 @@
-SHA256 (CGAL-3.8.tar.gz) = se3VGIYTTPCG0XmCxQ9xAleBFWHSiLQ5rzprxjI4ntQ=
-SIZE (CGAL-3.8.tar.gz) = 14112547
+SHA256 (CGAL-4.4.tar.gz) = 1+vG0ZQuPYPh9StuYOuTkPe7f4fmyLDS/hiLtZLOiuM=
+SIZE (CGAL-4.4.tar.gz) = 15281016
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/cgal/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Jan 2012 14:48:50 - 1.3
+++ pkg/PLIST 15 Aug 2014 13:42:23 -
@@ -1,9 +1,14 @@
@comment $OpenBSD: PLIST,v 1.3 2012/01/20 14:48:50 dcoppa Exp $
+bin/cgal_create_CMakeLists
bin/cgal_create_cmake_script
include/CGAL/
+include/CGAL/AABB_face_graph_triangle_primitive.h
+include/CGAL/AABB_halfedge_graph_segment_primitive.h
include/CGAL/AABB_intersections.h
+include/CGAL/AABB_polyhedral_oracle.h
include/CGAL/AABB_polyhedron_segment_primitive.h
include/CGAL/AABB_polyhedron_triangle_primitive.h
+include/CGAL/AABB_primitive.h
include/CGAL/AABB_segment_primitive.h
include/CGAL/AABB_traits.h
include/CGAL/AABB_tree.h
@@ -86,18 +91,6 @@ include/CGAL/Apollonius_graph_2/Compare_
include/CGAL/Apollonius_graph_2/Constructions_C2.h
include/CGAL/Apollonius_graph_2/Constructions_ftC2.h
include/CGAL/Apollonius_graph_2/Constructions_rtH2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h
include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h
include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h
Re: [update] math/cgal 3.8 - 4.4
On Fri, Aug 15, 2014 at 9:28 AM, Aaron def...@gmail.com wrote:
On Fri, Aug 15, 2014 at 9:19 AM, David Coppa dco...@gmail.com wrote:
Il giorno 15/ago/2014 15.57, Aaron Bieber def...@gmail.com ha
scritto:
Hola,
This diff brings CGAL to the latest version which is requried for a
cad/openscad update I will send in another email.
No major changes in the port, mostly regen'd WANTLIB and new plist
entries.
OK?
Index: Makefile
===
RCS file: /cvs/ports/math/cgal/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile13 Mar 2014 21:05:38 - 1.10
+++ Makefile15 Aug 2014 13:42:23 -
@@ -10,8 +10,8 @@ COMMENT = Computational Geometry Algori
# when updating this port, don't just change the version number here.
# MASTER_SITES needs to be adapted for every new tarball.
# See https://gforge.inria.fr/frs/?group_id=52 for files index.
-DISTNAME = CGAL-3.8
-MASTER_SITES = https://gforge.inria.fr/frs/download.php/28500/
+DISTNAME = CGAL-4.4
+MASTER_SITES = https://gforge.inria.fr/frs/download.php/33525/
PKGNAME = ${DISTNAME:L}
EPOCH =0
@@ -29,8 +29,8 @@ HOMEPAGE =http://www.cgal.org/
PERMIT_PACKAGE_CDROM = Yes
# m=5.3 for fenv.h support
-WANTLIB = GL GLU ICE SM X11 Xext boost_thread-mt gmp
gmpxx \
- lib/qt4/QtGui lib/qt4/QtOpenGL m=5.3 mpfr
stdc++ z
+WANTLIB += GL GLU ICE QtGui QtOpenGL SM X11 Xext boost_system-mt
Leave qt4 libraries as they were before: lib/qt4/QtGui, not QtGui.
Apart from this, the diff is good.
http://sprunge.us/CFLi -- updated diff with lib/qt4 - also re-added the
m=5.3
OK?
Just realized I didn't bump the shared libs. Retesting.
Ciao,
David
+WANTLIB += boost_thread-mt gmp m mpfr stdc++ z
MODULES = devel/cmake \
x11/qt4
@@ -45,10 +45,8 @@ CONFIGURE_ENV = LDFLAGS=-L${X11BASE}/l
post-patch:
rm ${WRKSRC}/cmake/modules/FindBLAS.cmake \
- ${WRKSRC}/cmake/modules/FindBoost.cmake \
${WRKSRC}/cmake/modules/FindLAPACK.cmake \
${WRKSRC}/cmake/modules/FindOpenGL.cmake \
- ${WRKSRC}/cmake/modules/FindPackageMessage.cmake \
${WRKSRC}/scripts/cgal_make_macosx_app
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/math/cgal/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo13 Mar 2014 20:50:22 - 1.3
+++ distinfo15 Aug 2014 13:42:23 -
@@ -1,2 +1,2 @@
-SHA256 (CGAL-3.8.tar.gz) = se3VGIYTTPCG0XmCxQ9xAleBFWHSiLQ5rzprxjI4ntQ=
-SIZE (CGAL-3.8.tar.gz) = 14112547
+SHA256 (CGAL-4.4.tar.gz) = 1+vG0ZQuPYPh9StuYOuTkPe7f4fmyLDS/hiLtZLOiuM=
+SIZE (CGAL-4.4.tar.gz) = 15281016
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/cgal/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Jan 2012 14:48:50 - 1.3
+++ pkg/PLIST 15 Aug 2014 13:42:23 -
@@ -1,9 +1,14 @@
@comment $OpenBSD: PLIST,v 1.3 2012/01/20 14:48:50 dcoppa Exp $
+bin/cgal_create_CMakeLists
bin/cgal_create_cmake_script
include/CGAL/
+include/CGAL/AABB_face_graph_triangle_primitive.h
+include/CGAL/AABB_halfedge_graph_segment_primitive.h
include/CGAL/AABB_intersections.h
+include/CGAL/AABB_polyhedral_oracle.h
include/CGAL/AABB_polyhedron_segment_primitive.h
include/CGAL/AABB_polyhedron_triangle_primitive.h
+include/CGAL/AABB_primitive.h
include/CGAL/AABB_segment_primitive.h
include/CGAL/AABB_traits.h
include/CGAL/AABB_tree.h
@@ -86,18 +91,6 @@ include/CGAL/Apollonius_graph_2/Compare_
include/CGAL/Apollonius_graph_2/Constructions_C2.h
include/CGAL/Apollonius_graph_2/Constructions_ftC2.h
include/CGAL/Apollonius_graph_2/Constructions_rtH2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h
-include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
UPDATE: math/cgal
Diff below updates CGAL from 3.8 to 3.9. A few remarks:
* cgal-3.8 has to be uninstalled before cgal-3.9 can be built. The
package tries to include older installed headers from
/usr/local/include before the newer packaged headers, so many
prototypes are missing or wrong. (I spent a little while
investigating if this could be resolved somehow, but I'm pretty
clueless with CMake and failed to figure it out.)
* I renamed /usr/local/share/doc/CGAL-3.9 to /usr/local/share/doc/CGAL.
* I bumped all the shared library versions; not sure if major bumps
are really necessary, but it didn't seem worth looking into more
closely.
* Switched to .tar.xz since CGAL doesn't build on VAX anyway (due to
IEEE floating point hardware dependencies for fenv.h).
Quickly tested that OpenSCAD still compiles and runs on amd64.
Index: Makefile
===
RCS file: /home/mdempsky/anoncvs/cvs/ports/math/cgal/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile16 Sep 2011 10:31:22 - 1.4
+++ Makefile29 Nov 2011 22:09:18 -
@@ -5,15 +5,14 @@ NOT_FOR_ARCHS = vax
COMMENT = Computational Geometry Algorithms Library
-DISTNAME = CGAL-3.8
+DISTNAME = CGAL-3.9
PKGNAME = ${DISTNAME:L}
-REVISION = 1
SHARED_ONLY = Yes
-SHARED_LIBS = CGAL0.0 \
- CGAL_Core 0.0 \
- CGAL_ImageIO0.0 \
- CGAL_Qt40.0
+SHARED_LIBS = CGAL1.0 \
+ CGAL_Core 1.0 \
+ CGAL_ImageIO1.0 \
+ CGAL_Qt41.0
CATEGORIES = math
@@ -29,8 +28,10 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL GLU ICE SM X11 Xext boost_thread-mt gmp gmpxx \
lib/qt4/QtGui lib/qt4/QtOpenGL m=5.3 mpfr stdc++ z
+EXTRACT_SUFX = .tar.xz
+
# Awkward hosting site; see https://gforge.inria.fr/frs/?group_id=52 for files
index.
-MASTER_SITES = https://gforge.inria.fr/frs/download.php/28500/
+MASTER_SITES = https://gforge.inria.fr/frs/download.php/29122/
MODULES = devel/cmake \
x11/qt4
@@ -45,5 +46,8 @@ CONFIGURE_ENV = CFLAGS=${CFLAGS
post-patch:
rm ${WRKSRC}/scripts/cgal_make_macosx_app
+
+post-install:
+ cd ${PREFIX}/share/doc mv CGAL-3.9 CGAL
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/mdempsky/anoncvs/cvs/ports/math/cgal/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo29 Apr 2011 17:47:50 - 1.1.1.1
+++ distinfo29 Nov 2011 21:33:52 -
@@ -1,5 +1,5 @@
-MD5 (CGAL-3.8.tar.gz) = uKeeYuTYuotknYFa670cCg==
-RMD160 (CGAL-3.8.tar.gz) = Xl4TI65FPZKOhbT2p2R/nW0pc9A=
-SHA1 (CGAL-3.8.tar.gz) = I3SN8eYNYtoWbS45VzKuL+J0MX0=
-SHA256 (CGAL-3.8.tar.gz) = se3VGIYTTPCG0XmCxQ9xAleBFWHSiLQ5rzprxjI4ntQ=
-SIZE (CGAL-3.8.tar.gz) = 14112547
+MD5 (CGAL-3.9.tar.xz) = VCSQ4j0R211BmkNnkBaQCA==
+RMD160 (CGAL-3.9.tar.xz) = A0CDe7V4JNvwg2HiW/u5G9AaFmg=
+SHA1 (CGAL-3.9.tar.xz) = SL/4erJuATtYPuNPAhpgJcS4HN8=
+SHA256 (CGAL-3.9.tar.xz) = pdUPN4ixrNNKIO+EwHH462burMXhJ2ApLW98D/BBAiw=
+SIZE (CGAL-3.9.tar.xz) = 9853500
Index: pkg/PLIST
===
RCS file: /home/mdempsky/anoncvs/cvs/ports/math/cgal/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 25 Jun 2011 19:12:36 - 1.2
+++ pkg/PLIST 29 Nov 2011 21:59:53 -
@@ -162,6 +162,7 @@ include/CGAL/Arr_default_dcel.h
include/CGAL/Arr_default_overlay_traits.h
include/CGAL/Arr_enums.h
include/CGAL/Arr_extended_dcel.h
+include/CGAL/Arr_extended_rational_arc_traits_d_1.h
include/CGAL/Arr_face_index_map.h
include/CGAL/Arr_face_map.h
include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h
@@ -181,7 +182,6 @@ include/CGAL/Arr_geometry_traits/Conic_x
include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h
include/CGAL/Arr_geometry_traits/Curve_data_aux.h
include/CGAL/Arr_geometry_traits/Hyperbolic_arc_2.h
-include/CGAL/Arr_geometry_traits/One_root_number.h
include/CGAL/Arr_geometry_traits/Polyline_2.h
include/CGAL/Arr_geometry_traits/Rational_arc_2.h
include/CGAL/Arr_geometry_traits/Segment_assertions.h
@@ -223,7 +223,19 @@ include/CGAL/Arr_point_location/Trapezoi
include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_iostream.h
include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h
include/CGAL/Arr_polyline_traits_2.h
+include/CGAL/Arr_rat_arc/
+include/CGAL/Arr_rat_arc/Algebraic_point_2.h
+include/CGAL/Arr_rat_arc/Base_rational_arc_ds_1.h
+include/CGAL/Arr_rat_arc/Cache.h
+include/CGAL/Arr_rat_arc/Rational_arc_d_1.h
+include/CGAL/Arr_rat_arc/Rational_function.h
