Date: Sun, 12 May 2013 19:32:26 +0200 (CEST) From: Thierry Thomas <thierry@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: stephen@FreeBSD.org Subject: ports/178538: cad/netgen: chase OpenCascade's upgrade and unbreak. Message-ID: <20130512173226.BED2742D19AC@graf.pompo.net> Resent-Message-ID: <201305121740.r4CHe1Rb050230@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178538
>Category: ports
>Synopsis: cad/netgen: chase OpenCascade's upgrade and unbreak.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun May 12 17:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 9.1-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r248682: Sun Mar 24 18:59:01 CET 2013 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF130324 i386
>Description:
Attached is a patch to chase OpenCascade's upgrade to 6.6.0.
>How-To-Repeat:
N/A
>Fix:
Please apply the following patch.
--- netgen.diff begins here ---
diff -urN cad/netgen.orig/Makefile cad/netgen/Makefile
--- cad/netgen.orig/Makefile 2013-03-01 17:55:49.000000000 +0100
+++ cad/netgen/Makefile 2013-05-12 11:57:07.000000000 +0200
@@ -3,6 +3,7 @@
PORTNAME= netgen
PORTVERSION= 5.0.0
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:S|.0$||}/
@@ -29,14 +30,13 @@
OPTIONS_DEFINE= OCC FFMPEG
OCC_DESC= Compile with OpenCascade geometry kernel
FFMPEG_DESC= video recording with FFmpeg
-OPTIONS_DEFAULT= # OCC Switch it back on when opencascade is updated.
+OPTIONS_DEFAULT= OCC
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MOCC}
-BROKEN= The opencascade port needs to be updated before OCC will work
LIB_DEPENDS+= TKernel.0:${PORTSDIR}/cad/opencascade
-CXXFLAGS+= -DOCCGEOMETRY -DOCC63 -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/OpenCAS/ros/inc
+CXXFLAGS+= -DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE
CONFIGURE_ARGS+= --enable-occ
.endif
diff -urN cad/netgen.orig/files/patch-libsrc_occ_Partition_Inter3d.cxx cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx
--- cad/netgen.orig/files/patch-libsrc_occ_Partition_Inter3d.cxx 1970-01-01 01:00:00.000000000 +0100
+++ cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx 2013-05-12 11:32:23.000000000 +0200
@@ -0,0 +1,13 @@
+--- libsrc/occ/Partition_Inter3d.cxx.orig 2012-11-09 16:15:02.000000000 +0100
++++ libsrc/occ/Partition_Inter3d.cxx 2013-05-12 11:31:45.000000000 +0200
+@@ -243,8 +243,8 @@
+ Standard_Integer i, nbExt = anExtPS.NbExt();
+ Extrema_POnSurf aPOnSurf;
+ for (i = 1; i <= nbExt; ++i )
+- if (anExtPS.Value( i ) <= TolE) // V6.3
+- // if (anExtPS.SquareDistance( i ) <= TolE) // V6.5
++ // if (anExtPS.Value( i ) <= TolE) // V6.3
++ if (anExtPS.SquareDistance( i ) <= TolE) // V6.5
+ {
+ aPOnSurf = anExtPS.Point( i );
+ break;
diff -urN cad/netgen.orig/files/patch-libsrc_occ_Partition_Loop2d.cxx cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx
--- cad/netgen.orig/files/patch-libsrc_occ_Partition_Loop2d.cxx 1970-01-01 01:00:00.000000000 +0100
+++ cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx 2013-05-12 11:41:36.000000000 +0200
@@ -0,0 +1,13 @@
+--- libsrc/occ/Partition_Loop2d.cxx.orig 2012-11-09 16:15:02.000000000 +0100
++++ libsrc/occ/Partition_Loop2d.cxx 2013-05-12 11:41:09.000000000 +0200
+@@ -52,6 +52,10 @@
+ #include <gp_Pnt.hxx>
+ #include <gp_Pnt2d.hxx>
+
++#ifndef PI
++#define PI 3.14159265358979323846
++#endif
++
+ //=======================================================================
+ //function : Partition_Loop2d
+ //purpose :
diff -urN cad/netgen.orig/files/patch-libsrc_occ_Partition_Spliter.cxx cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx
--- cad/netgen.orig/files/patch-libsrc_occ_Partition_Spliter.cxx 1970-01-01 01:00:00.000000000 +0100
+++ cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx 2013-05-12 11:36:04.000000000 +0200
@@ -0,0 +1,13 @@
+--- libsrc/occ/Partition_Spliter.cxx.orig 2012-11-09 16:15:02.000000000 +0100
++++ libsrc/occ/Partition_Spliter.cxx 2013-05-12 11:35:38.000000000 +0200
+@@ -1169,8 +1169,8 @@
+ for (; j<=nbj && ok; ++j) {
+ if (Extrema.IsMin(j)) {
+ hasMin = Standard_True;
+- ok = Extrema.Value(j) <= tol; // V6.3
+- // ok = Extrema.SquareDistance(j) <= tol; // V6.5
++ // ok = Extrema.Value(j) <= tol; // V6.3
++ ok = Extrema.SquareDistance(j) <= tol; // V6.5
+ }
+ }
+ }
--- netgen.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130512173226.BED2742D19AC>