[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
commit: eba68f56ba8542eff2e545451a3285f44f8546ce
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Thu Jan 13 14:19:31 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Thu Jan 13 14:19:31 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=eba68f56
sci-mathematics/netgen: cleanup old
Closes: https://bugs.gentoo.org/670050
Closes: https://bugs.gentoo.org/502962
Bug: https://bugs.gentoo.org/688120
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../netgen-5.x-compile-against-occ-6.5.x.patch | 28 --
.../netgen/files/netgen-5.x-fedora-fixes.patch | 223 ---
.../netgen/files/netgen-5.x-includes-fixes.patch | 29 --
.../netgen/files/netgen-5.x-makefiles-fixes.patch | 412 -
.../netgen/files/netgen-5.x-metis-fixes.patch | 102 -
.../netgen/files/netgen-5.x-missing-define.patch | 38 --
.../files/netgen-5.x-occ-stl-api-change.patch | 94 -
.../files/netgen-5.x-parallelmetis4-fix.patch | 36 --
sci-mathematics/netgen/netgen-5.3.1.ebuild | 121 --
sci-mathematics/netgen/netgen-6.0_beta.ebuild | 121 --
10 files changed, 1204 deletions(-)
diff --git
a/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch
b/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch
deleted file mode 100644
index ce581cee3..0
--- a/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch
+++ /dev/null
@@ -1,28 +0,0 @@
libsrc/occ/Partition_Spliter.cxx.old 2012-11-14 16:14:39.440625195
+0100
-+++ libsrc/occ/Partition_Spliter.cxx 2012-11-14 16:15:20.035646075 +0100
-@@ -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
- }
- }
- }
libsrc/occ/Partition_Inter3d.cxx.old 2012-11-14 16:13:11.149581085
+0100
-+++ libsrc/occ/Partition_Inter3d.cxx 2012-11-14 16:14:20.017615214 +0100
-@@ -243,9 +243,9 @@
- 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 --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
b/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
deleted file mode 100644
index 5cb399edb..0
--- a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.cpp
netgen/libsrc/meshing/meshtype.cpp
netgen-5.3.1/libsrc/meshing/meshtype.cpp 2016-02-20 21:55:59.226450843
+0100
-+++ netgen/libsrc/meshing/meshtype.cpp 2016-02-20 23:54:12.293646166 +0100
-@@ -1,4 +1,5 @@
- #include
-+#include // to get DBL_MIN defined
-
- #include "meshing.hpp"
-
-@@ -666,7 +667,8 @@
-
- double det = trans.Det();
-
--if (det <= 0)
-+// if (det <= 0)
-+if (det <= DBL_MIN) // avoid FPE
- err += 1e12;
- else
- err += frob * frob / det;
-@@ -722,7 +724,8 @@
-
- double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1);
-
--if (det <= 0)
-+// if (det <= 0)
-+if (det <= DBL_MIN) // avoid FPE
- {
- dd = 0;
- return 1e12;
-@@ -806,7 +809,8 @@
- = dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0)
- + trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0);
-
--if (det <= 0)
-+// if (det <= 0)
-+if (det <= DBL_MIN) // avoid FPE
- err += 1e12;
- else
- {
-@@ -856,7 +860,8 @@
- frob /= 2;
-
- double det = trans.Det();
--if (det <= 0)
-+//if (det <= 0)
-+if (det <= DBL_MIN) // avoid FPE
- err += 1e12;
- else
- err += frob * frob / det;
-@@ -1864,7 +1869,8 @@
- case PYRAMID:
- {
- double noz = 1-p(2);
-- if (noz == 0.0) noz = 1e-10;
-+ //if (noz == 0.0) noz = 1e-10;
-+ if (noz <= DBL_MIN) noz = 1e-10; // avoid FPE
-
- double xi = p(0) / noz;
- double eta = p(1) / noz;
-@@ -2513,10 +2519,10 @@
-
- MeshingParameters :: MeshingParameters ()
- {
--optimize3d = "cmdmustm";
-+optimize3d = (char*)"cmdmustm"; // optimize3d =
[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
commit: 3addb11abe96717bdd72e01ee5dff2a47aa3f9e7
Author: Grégory Salvan gmail com>
AuthorDate: Sat Feb 13 11:40:48 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3addb11a
patch netgen for occ to integrate version 5.3.1 see #436
.../files/netgen-5.x-occ-stl-api-change.patch | 94 ++
sci-mathematics/netgen/netgen-5.3.1.ebuild | 16 +++-
2 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
new file mode 100644
index 000..05f3a54
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
@@ -0,0 +1,94 @@
+--- libsrc/occ/occgeom.cpp 2014-08-29 11:54:03.0 +0200
libsrc/occ/occgeom.cpp 2016-02-12 21:14:49.258982206 +0100
+@@ -149,7 +149,7 @@
+
+ for (exp0.Init (shape, TopAbs_FACE); exp0.More(); exp0.Next())
+ {
+-// Variable to hold the colour (if there exists one) of
++// Variable to hold the colour (if there exists one) of
+ // the current face being processed
+ Quantity_Color face_colour;
+
+@@ -190,7 +190,7 @@
+rebuild->Replace(face, newface, Standard_False);
+ }
+
+-// Set the original colour of the face to the newly created
++// Set the original colour of the face to the newly created
+ // face (after the healing process)
+ face = TopoDS::Face (exp0.Current());
+ face_colours->SetColor(face,face_colour,XCAFDoc_ColorSurf);
+@@ -815,11 +815,11 @@
+ face_maxh.SetSize (fmap.Extent());
+ face_maxh = mparam.maxh;
+
+- // Philippose - 15/01/2010
+- face_maxh_modified.DeleteAll();
+- face_maxh_modified.SetSize(fmap.Extent());
++ // Philippose - 15/01/2010
++ face_maxh_modified.DeleteAll();
++ face_maxh_modified.SetSize(fmap.Extent());
+ face_maxh_modified = 0;
+-
++
+
+ // Philippose - 17/01/2009
+ face_sel_status.DeleteAll();
+@@ -845,7 +845,7 @@
+ cout << "Trying to sew faces ..." << flush;
+
+ BRepOffsetAPI_Sewing sewedObj(1);
+-
++
+ for (int i = 1; i <= fmap.Extent(); i++)
+ {
+ TopoDS_Face face = TopoDS::Face (fmap(i));
+@@ -1038,9 +1038,6 @@
+{
+ cout << "writing stl..."; cout.flush();
+ StlAPI_Writer writer;
+- writer.RelativeMode() = Standard_False;
+-
+- writer.SetDeflection(0.02);
+ writer.Write(shape,filename);
+
+ cout << "done" << endl;
+@@ -1109,7 +1106,7 @@
+ }
+
+
+- // For the IGES Reader, all the shapes can be exported as one compund
shape
++ // For the IGES Reader, all the shapes can be exported as one compund
shape
+ // using the "OneShape" member
+ occgeo->shape = reader.OneShape();
+ occgeo->face_colours = iges_colour_contents;
+@@ -1187,7 +1184,7 @@
+ }
+
+
+- // For the STEP File Reader in OCC, the 1st Shape contains the entire
++ // For the STEP File Reader in OCC, the 1st Shape contains the entire
+ // compound geometry as one shape
+ occgeo->shape = step_shape_contents->GetShape(step_shapes.Value(1));
+ occgeo->face_colours = step_colour_contents;
+@@ -1218,7 +1215,7 @@
+ }
+
+ // Philippose - 23/02/2009
+- // Fixed a bug in the OpenCascade XDE Colour handling when
++ // Fixed a bug in the OpenCascade XDE Colour handling when
+ // opening BREP Files, since BREP Files have no colour data.
+ // Hence, the face_colours Handle needs to be created as a NULL handle.
+ occgeo->face_colours = Handle_XCAFDoc_ColorTool();
+@@ -1236,9 +1233,9 @@
+ void OCCGeometry :: Save (string sfilename) const
+ {
+ const char * filename = sfilename.c_str();
+-if (strlen(filename) < 4)
++if (strlen(filename) < 4)
+ throw NgException ("illegal filename");
+-
++
+ if (strcmp ([strlen(filename)-3], "igs") == 0)
+ {
+ IGESControl_Writer writer("millimeters", 1);
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 8a2f60b..16441ff 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg:0= )
- mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
+ mpi? ( virtual/mpi ( || ( sci-libs/parmetis http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
+ epatch
[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
commit: 7a9027cbd4c3510b8e5010422505a70e1420b7a4
Author: Grégory Salvan gmail com>
AuthorDate: Sun Feb 21 23:58:20 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7a9027cb
fix parallelmetis for metis version 4
.../files/netgen-5.x-parallelmetis4-fix.patch | 36 ++
sci-mathematics/netgen/netgen-5.3.1.ebuild | 1 +
2 files changed, 37 insertions(+)
diff --git a/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch
b/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch
new file mode 100644
index 000..0170fb8
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch
@@ -0,0 +1,36 @@
+diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp
netgen/libsrc/meshing/parallelmesh.cpp
+--- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-22
00:22:28.885598956 +0100
netgen/libsrc/meshing/parallelmesh.cpp 2016-02-22 00:46:17.030638283
+0100
+@@ -962,10 +962,15 @@
+ }
+
+
+-#ifdef METIS5
++#ifdef METIS
+ void Mesh :: ParallelMetis (Array & volume_weights , Array &
surface_weights, Array & segment_weights)
+ {
++
++ #ifdef METIS5
+ PrintMessage (3, "call metis 5 with weights ...");
++#else
++PrintMessage (3, "call metis 4 with weights ...");
++#endif
+
+ // cout << "segment_weights " << segment_weights << endl;
+ // cout << "surface_weights " << surface_weights << endl;
+@@ -1034,9 +1039,15 @@
+
+
+ metis::idx_t ncommon = 3;
++#ifdef METIS5
+ METIS_PartMeshDual (, , [0], [0], [0], NULL,
, ,
+ NULL, NULL,
+ , [0], [0]);
++#else
++int numflag = 0;
++METIS_PartMeshDual (, , [0], [0], , ,
++ , [0], [0]);
++#endif
+ /*
+ METIS_PartMeshNodal (, , [0], [0], NULL, NULL, ,
+NULL, NULL,
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index d39d45c..9aac92d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -44,6 +44,7 @@ src_prepare() {
# Adapted from
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"
+ epatch "${FILESDIR}/${PN}-5.x-parallelmetis4-fix.patch"
if use mpi; then
export CC=mpicc
export CXX=mpic++
[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
commit: 903b613b84b3e2622dd16d94dbee41d368ba8fe3
Author: Grégory Salvan gmail com>
AuthorDate: Sun Feb 21 00:52:54 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=903b613b
Added fedora fixes patch
.../netgen/files/netgen-5.x-fedora-fixes.patch | 223 +
sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 +
2 files changed, 225 insertions(+)
diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
b/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
new file mode 100644
index 000..5cb399e
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
@@ -0,0 +1,223 @@
+diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.cpp
netgen/libsrc/meshing/meshtype.cpp
+--- netgen-5.3.1/libsrc/meshing/meshtype.cpp 2016-02-20 21:55:59.226450843
+0100
netgen/libsrc/meshing/meshtype.cpp 2016-02-20 23:54:12.293646166 +0100
+@@ -1,4 +1,5 @@
+ #include
++#include // to get DBL_MIN defined
+
+ #include "meshing.hpp"
+
+@@ -666,7 +667,8 @@
+
+ double det = trans.Det();
+
+-if (det <= 0)
++// if (det <= 0)
++if (det <= DBL_MIN) // avoid FPE
+ err += 1e12;
+ else
+ err += frob * frob / det;
+@@ -722,7 +724,8 @@
+
+ double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1);
+
+-if (det <= 0)
++// if (det <= 0)
++if (det <= DBL_MIN) // avoid FPE
+ {
+ dd = 0;
+ return 1e12;
+@@ -806,7 +809,8 @@
+ = dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0)
+ + trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0);
+
+-if (det <= 0)
++// if (det <= 0)
++if (det <= DBL_MIN) // avoid FPE
+ err += 1e12;
+ else
+ {
+@@ -856,7 +860,8 @@
+ frob /= 2;
+
+ double det = trans.Det();
+-if (det <= 0)
++//if (det <= 0)
++if (det <= DBL_MIN) // avoid FPE
+ err += 1e12;
+ else
+ err += frob * frob / det;
+@@ -1864,7 +1869,8 @@
+ case PYRAMID:
+ {
+ double noz = 1-p(2);
+- if (noz == 0.0) noz = 1e-10;
++ //if (noz == 0.0) noz = 1e-10;
++ if (noz <= DBL_MIN) noz = 1e-10; // avoid FPE
+
+ double xi = p(0) / noz;
+ double eta = p(1) / noz;
+@@ -2513,10 +2519,10 @@
+
+ MeshingParameters :: MeshingParameters ()
+ {
+-optimize3d = "cmdmustm";
++optimize3d = (char*)"cmdmustm"; // optimize3d = "cmdmustm";
+ //optimize3d = "cmdmstm";
+ optsteps3d = 3;
+-optimize2d = "smsmsmSmSmSm";
++optimize2d = (char*)"smsmsmSmSmSm"; // optimize2d = "smsmsmSmSmSm";
+ optsteps2d = 3;
+ opterrpow = 2;
+ blockfill = 1;
+diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.hpp
netgen/libsrc/meshing/meshtype.hpp
+--- netgen-5.3.1/libsrc/meshing/meshtype.hpp 2016-02-20 21:55:59.226450843
+0100
netgen/libsrc/meshing/meshtype.hpp 2016-02-20 23:54:12.295646166 +0100
+@@ -15,6 +15,7 @@
+ Classes for NETGEN
+ */
+
++class Mesh; // added due to compilation errors on some platforms
+
+
+ enum ELEMENT_TYPE {
+diff -uwrN netgen-5.3.1/libsrc/meshing/smoothing2.cpp
netgen/libsrc/meshing/smoothing2.cpp
+--- netgen-5.3.1/libsrc/meshing/smoothing2.cpp 2016-02-20 21:55:59.228450843
+0100
netgen/libsrc/meshing/smoothing2.cpp 2016-02-20 23:54:12.298646166
+0100
+@@ -361,7 +361,8 @@
+ vgrad = 0;
+ double badness = 0;
+
+-ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n);
++//normal already computed: ld.meshthis -> GetNormalVector (ld.surfi,
ld.sp1, ld.gi1, n);
++n = ld.normal;
+ pp1 = ld.sp1 + x(0) * ld.t1 + x(1) * ld.t2;
+
+ // meshthis -> ProjectPoint (surfi, pp1);
+@@ -577,7 +578,8 @@
+ vgrad = 0;
+ badness = 0;
+
+-ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n);
++//normal already computed: ld.meshthis -> GetNormalVector (ld.surfi,
ld.sp1, ld.gi1, n);
++n = ld.normal;
+
+ pp1 = ld.sp1 + x(0) * ld.t1 + x(1) * ld.t2;
+
+@@ -649,7 +651,8 @@
+ vgrad = 0;
+ badness = 0;
+
+-ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n);
++//normal already computed: ld.meshthis -> GetNormalVector (ld.surfi,
ld.sp1, ld.gi1, n);
++n = ld.normal;
+
+ // pp1 = sp1;
+ //pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
+diff -uwrN netgen-5.3.1/libsrc/occ/occconstruction.cpp
netgen/libsrc/occ/occconstruction.cpp
+--- netgen-5.3.1/libsrc/occ/occconstruction.cpp2016-02-20
21:53:44.420447131 +0100
netgen/libsrc/occ/occconstruction.cpp 2016-02-20 23:54:12.299646166
+0100
+@@ -28,7 +28,7 @@
+ #include
+ #include
+ #include
+-#include
++//#include
+ //#include
+ #include
+ #include
+diff -uwrN netgen-5.3.1/libsrc/occ/occmeshsurf.cpp
[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
commit: 77890639257266037035bd07c0edebd3a7e6b26d
Author: Grégory Salvan gmail com>
AuthorDate: Sun Feb 21 20:38:46 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=77890639
Added includes fixes patch
.../netgen/files/netgen-5.x-includes-fixes.patch | 29 ++
sci-mathematics/netgen/netgen-5.3.1.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch
b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch
new file mode 100644
index 000..650b575
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch
@@ -0,0 +1,29 @@
+diff -uwrN -x.git netgen-5.3.1/libsrc/include/meshing.hpp
netgen/libsrc/include/meshing.hpp
+--- netgen-5.3.1/libsrc/include/meshing.hpp2016-02-21 20:12:55.885186643
+0100
netgen/libsrc/include/meshing.hpp 2016-02-21 20:09:26.275180871 +0100
+@@ -1 +1 @@
+-#include <../meshing/meshing.hpp>
++#include "../meshing/meshing.hpp"
+diff -uwrN -x.git netgen-5.3.1/libsrc/include/myadt.hpp
netgen/libsrc/include/myadt.hpp
+--- netgen-5.3.1/libsrc/include/myadt.hpp 2016-02-21 20:12:55.886186643
+0100
netgen/libsrc/include/myadt.hpp2016-02-21 20:09:26.275180871 +0100
+@@ -1 +1 @@
+-#include <../general/myadt.hpp>
++#include "../general/myadt.hpp"
+diff -uwrN -x.git netgen-5.3.1/libsrc/include/stlgeom.hpp
netgen/libsrc/include/stlgeom.hpp
+--- netgen-5.3.1/libsrc/include/stlgeom.hpp2016-02-21 20:12:55.886186643
+0100
netgen/libsrc/include/stlgeom.hpp 2016-02-21 20:09:26.275180871 +0100
+@@ -1 +1 @@
+-#include <../stlgeom/stlgeom.hpp>
++#include "../stlgeom/stlgeom.hpp"
+diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp
netgen/libsrc/meshing/parallelmesh.cpp
+--- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-21
20:12:55.888186643 +0100
netgen/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:09:26.276180871
+0100
+@@ -1,6 +1,6 @@
+ #ifdef PARALLEL
+
+-#include
++#include "meshing.hpp"
+ #include "paralleltop.hpp"
+
+ // #define METIS4
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 4cc2cd9..d3cf9f9 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -43,6 +43,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-5.3.1_build.patch"
# Adapted from
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
+ epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"
if use mpi; then
export CC=mpicc
export CXX=mpic++
[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
commit: 7882cf4cfd2995f94b03c608ceb7090b97258cf2 Author: Grégory Salvan gmail com> AuthorDate: Sat Feb 20 22:42:39 2016 + Commit: Justin Lecher gentoo org> CommitDate: Mon Feb 22 08:36:31 2016 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7882cf4c Added build patch from fedora (fix Mesh :: ParallelMetis linking error...) .../netgen/files/netgen-5.3.1_build.patch | 372 + sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 + 2 files changed, 374 insertions(+) diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch new file mode 100644 index 000..dd8d395 --- /dev/null +++ b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch @@ -0,0 +1,372 @@ +diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac +--- netgen-5.3.1/configure.ac 2014-10-07 21:38:21.990021106 +0200 netgen-5.3.1-new/configure.ac 2014-10-07 21:39:14.530034275 +0200 +@@ -35,15 +35,15 @@ AC_ARG_WITH([occ], + [AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in directory dir])], + [occdir=$withval] + [occon=true], +- [occdir=/opt/OpenCASCADE] ++ [occdir=/usr] + ) + + + + if test a$occon = atrue ; then + +- AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"]) +- AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) ++ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I/usr/include/oce"]) ++ AC_SUBST([OCCLIBS], ["-lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) + + # -lTKDCAF + +@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui], + [AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])], + [if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi]) + +-metisdir=/usr/local ++metisdir=/usr + AC_ARG_WITH([metis], + [AC_HELP_STRING([--with-metis=dir],[path to metis 5.x])], + [metisdir=$withval], +-[metisdir=/usr/local] ++[metisdir=/usr] + ) + + AC_ARG_ENABLE([parallel], + [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], +- [AC_SUBST([MPI_INCLUDES], "-I$metisdir/include -DMETIS")] ++ [AC_SUBST([MPI_INCLUDES], "-DMETIS")] + [CXXFLAGS="$CXXFLAGS -DPARALLEL"] +- [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")] ++ [AC_SUBST([MPI_LIBS], "-lmetis")] + ) + # -DVTRACE + # -lvt-hyb +diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makefile.am +--- netgen-5.3.1/libsrc/csg/Makefile.am2014-10-07 21:38:21.787017193 +0200 netgen-5.3.1-new/libsrc/csg/Makefile.am2014-10-07 21:39:14.530034275 +0200 +@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) + METASOURCES = AUTO + +-lib_LTLIBRARIES = libcsg.la ++lib_LTLIBRARIES = libngcsg.la + + +-libcsg_la_SOURCES = algprim.cpp brick.cpp \ ++libngcsg_la_SOURCES = algprim.cpp brick.cpp \ + bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp \ + explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp \ + manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \ + solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp + +-libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la ++libngcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la + + + + if NGGUI +-lib_LTLIBRARIES += libcsgvis.la ++lib_LTLIBRARIES += libngcsgvis.la + +-libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp +-libcsgvis_la_LIBADD = libcsg.la ++libngcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp ++libngcsgvis_la_LIBADD = libngcsg.la + endif + + # $(top_builddir)/libsrc/geom2d/libgeom2d.la +diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/general/Makefile.am +--- netgen-5.3.1/libsrc/general/Makefile.am2014-10-07 21:38:21.638014320 +0200 netgen-5.3.1-new/libsrc/general/Makefile.am2014-10-07 21:39:14.531034296 +0200 +@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp + + AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include + METASOURCES = AUTO +-noinst_LTLIBRARIES = libgen.la +-libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ ++noinst_LTLIBRARIES = libnggen.la ++libnggen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ + hashtabl.cpp
[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
commit: ff32a770a509011f0f527f2972e7f4825d3f6281
Author: Grégory Salvan gmail com>
AuthorDate: Sat Feb 20 21:18:33 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ff32a770
added fedora metis patch
.../netgen/files/netgen-5.x-fedora-metis.patch | 93 ++
sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 +
2 files changed, 95 insertions(+)
diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
b/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
new file mode 100644
index 000..68b3396
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
@@ -0,0 +1,93 @@
+--- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-20
21:55:59.227450843 +0100
./netgen/libsrc/meshing/parallelmesh.cpp 2016-02-20 21:46:32.331435233
+0100
+@@ -14,7 +14,7 @@
+
+ #if METIS_VER_MAJOR >= 5
+ #define METIS5
+-typedef idx_t idxtype;
++typedef metis::idx_t idxtype;
+ #else
+ #define METIS4
+ typedef idxtype idx_t;
+@@ -794,10 +794,10 @@
+ eptr.Append (eind.Size());
+ Array epart(ne), npart(nn);
+
+-int nparts = ntasks-1;
+-int edgecut;
++metis::idx_t nparts = ntasks-1;
++metis::idx_t edgecut;
+
+-int ncommon = 3;
++metis::idx_t ncommon = 3;
+ METIS_PartMeshDual (, , [0], [0], NULL, NULL, ,
,
+ NULL, NULL,
+ , [0], [0]);
+@@ -1029,11 +1029,11 @@
+ eptr.Append (eind.Size());
+ Array epart(ne), npart(nn);
+
+-int nparts = ntasks-1;
+-int edgecut;
++metis::idx_t nparts = ntasks-1;
++metis::idx_t edgecut;
+
+
+-int ncommon = 3;
++metis::idx_t ncommon = 3;
+ METIS_PartMeshDual (, , [0], [0], [0], NULL,
, ,
+ NULL, NULL,
+ , [0], [0]);
+@@ -1266,7 +1266,7 @@
+
+ for ( int vert = 0; vert < nn; vert++ )
+ {
+- FlatArray array ( cnt[vert], [ xadj[vert] ] );
++ FlatArray array ( cnt[vert], [ xadj[vert] ] );
+ BubbleSort(array);
+ }
+
+@@ -1377,7 +1377,7 @@
+
+ for ( int el = 0; el < ne; el++ )
+ {
+- FlatArray array ( cnt[el], [ xadj[el] ] );
++ FlatArray array ( cnt[el], [ xadj[el] ] );
+ BubbleSort(array);
+ }
+
+@@ -1428,8 +1428,8 @@
+ void Mesh :: PartDualHybridMesh2D ( )
+ {
+ #ifdef METIS
+-int ne = GetNSE();
+-int nv = GetNV();
++metis::idx_t ne = GetNSE();
++metis::idx_t nv = GetNV();
+
+ Array xadj(ne+1);
+ Array adjacency(ne*4);
+@@ -1484,18 +1484,18 @@
+
+ idxtype *v_weights = NULL, *e_weights = NULL;
+
+-int weightflag = 0;
+-int numflag = 0;
+-int nparts = ntasks - 1;
++metis::idx_t weightflag = 0;
++metis::idx_t numflag = 0;
++metis::idx_t nparts = ntasks - 1;
+
+-int edgecut;
++metis::idx_t edgecut;
+ Array part(ne);
+
+ for ( int el = 0; el < ne; el++ )
+ BubbleSort (adjacency.Range (xadj[el], xadj[el+1]));
+
+ #ifdef METIS4
+-int options[5];
++metis::idx_t options[5];
+ options[0] = 0;
+ METIS_PartGraphKway ( , [0], [0], v_weights, e_weights,
,
+ , , options, , [0] );
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 9a1f35c..cf09c82 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -36,6 +36,8 @@ src_prepare() {
# Adapted from
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
+ # Taken from
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
+ epatch "${FILESDIR}/${PN}-5.x-fedora-metis.patch"
epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
if use mpi; then
export CC=mpicc
