2026-04-04T14:31:04+0000 Johannes Thyssen Tishman <jtt@openbsd.org>:
> Please find below an update for cad/netgen-mesher to version 6.2.2602.
>
> Changelog: https://github.com/NGSolve/netgen/compare/v6.2.2505...v6.2.2602
>
> Notes about this update:
> 1. 100% tests passed, 0 tests failed out of 8
> 2. This update should be committed together with cad/freecad's upcoming
> update.
Here another diff for the same update that also backports a commit[1] to
fix building netgen-mesher with newer versions of devel/py-pybind11. The
above notes still apply.
[1] https://github.com/NGSolve/netgen/commit/ceacae3844ed2f0c48c8b6a3a82904b16c594f41
diff /usr/ports
path + /usr/ports
commit - 79fc395aa2acb103d73cbe433d3dbaf1b65d46a8
blob - d7f134ac7d0d6043e1d3fb7f73fee7bfe1a1d351
file + cad/netgen-mesher/Makefile
--- cad/netgen-mesher/Makefile
+++ cad/netgen-mesher/Makefile
@@ -1,7 +1,6 @@
COMMENT = automatic 3d tetrahedral mesh generator
-V = 6.2.2505
-REVISION = 0
+V = 6.2.2602
PKGNAME = netgen-mesher-${V}
GH_ACCOUNT = NGSolve
@@ -9,7 +8,7 @@ GH_PROJECT = netgen
GH_TAGNAME = v${V}
# git checkout v${V}; git describe --tags --match "v[0-9]*" --long --dirty
-NETGEN_VERSION_GIT = v6.2.2505-0-g41893720
+NETGEN_VERSION_GIT = v6.2.2602-0-g9f916098
CATEGORIES = cad
HOMEPAGE = https://ngsolve.org/
commit - 79fc395aa2acb103d73cbe433d3dbaf1b65d46a8
blob - c60b64e93c4d173473d89ab78d6828484d27ffd7
file + cad/netgen-mesher/distinfo
--- cad/netgen-mesher/distinfo
+++ cad/netgen-mesher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netgen-6.2.2505.tar.gz) = ybpLvG+NuPv9n8ZMQAR1VYp/K/WszfzwIuXtAd/EAhk=
-SIZE (netgen-6.2.2505.tar.gz) = 3332150
+SHA256 (netgen-6.2.2602.tar.gz) = 1U3ewpzowuQ8fxJcmnfySf3wyIAMOQ2NJJmgFl5K0vM=
+SIZE (netgen-6.2.2602.tar.gz) = 3344800
commit - 79fc395aa2acb103d73cbe433d3dbaf1b65d46a8
blob - b82904ae28ef55eb1d41e5eabb5979f7c0bc9d17
file + cad/netgen-mesher/patches/patch-CMakeLists_txt
--- cad/netgen-mesher/patches/patch-CMakeLists_txt
+++ cad/netgen-mesher/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -273,7 +273,6 @@ endif()
+@@ -275,7 +275,6 @@ endif()
if (USE_GUI)
find_package(TCL 8.5 REQUIRED)
@@ -9,7 +9,7 @@ Index: CMakeLists.txt
find_package(Threads REQUIRED)
if(APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AppKit")
-@@ -445,6 +444,7 @@ endif (USE_MPEG)
+@@ -447,6 +446,7 @@ endif (USE_MPEG)
add_custom_target(ng_generate_version_file
${CMAKE_COMMAND}
-DBDIR=${CMAKE_CURRENT_BINARY_DIR}
@@ -17,7 +17,7 @@ Index: CMakeLists.txt
-P ${CMAKE_CURRENT_LIST_DIR}/cmake/generate_version_file.cmake
)
#######################################################################
-@@ -486,7 +486,7 @@ enable_testing()
+@@ -488,7 +488,7 @@ enable_testing()
include(CTest)
if(ENABLE_UNIT_TESTS)
commit - 79fc395aa2acb103d73cbe433d3dbaf1b65d46a8
blob - bec172e01078354bc525105cbfa5d336b1f671e4
file + cad/netgen-mesher/patches/patch-libsrc_core_CMakeLists_txt
--- cad/netgen-mesher/patches/patch-libsrc_core_CMakeLists_txt
+++ cad/netgen-mesher/patches/patch-libsrc_core_CMakeLists_txt
@@ -1,7 +1,7 @@
Index: libsrc/core/CMakeLists.txt
--- libsrc/core/CMakeLists.txt.orig
+++ libsrc/core/CMakeLists.txt
-@@ -57,8 +57,6 @@ if(WIN32)
+@@ -58,8 +58,6 @@ if(WIN32)
get_WIN32_WINNT(ver)
target_compile_definitions(ngcore PUBLIC _WIN32_WINNT=${ver} WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32)
target_link_options(ngcore PUBLIC /ignore:4273 /ignore:4217 /ignore:4049)
@@ -10,7 +10,7 @@ Index: libsrc/core/CMakeLists.txt
endif(WIN32)
target_compile_definitions(ngcore PRIVATE NGCORE_EXPORTS)
-@@ -84,7 +82,8 @@ endif(USE_NUMA)
+@@ -85,7 +83,8 @@ endif(USE_NUMA)
install(TARGETS ngcore DESTINATION ${NG_INSTALL_DIR} COMPONENT netgen)
commit - 79fc395aa2acb103d73cbe433d3dbaf1b65d46a8
blob - /dev/null
file + cad/netgen-mesher/patches/patch-libsrc_meshing_python_mesh_cpp (mode 644)
--- /dev/null
+++ cad/netgen-mesher/patches/patch-libsrc_meshing_python_mesh_cpp
@@ -0,0 +1,26 @@
+This patch has been merged upstream. Drop next update.
+Commit: ceacae3844ed2f0c48c8b6a3a82904b16c594f41
+
+Index: libsrc/meshing/python_mesh.cpp
+--- libsrc/meshing/python_mesh.cpp.orig
++++ libsrc/meshing/python_mesh.cpp
+@@ -970,15 +970,12 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
+ { sizeof(self.Points()[PointIndex::BASE]), sizeof(double) } )
+ );
+ })
+- .def_property_readonly("parentelements", [](Mesh & self) {
+- // return FlatArray<int>(self.mlparentelement.Size(), &self.mlparentelement[0]);
++ .def_property_readonly("parentelements", py::cpp_function([](Mesh & self) {
+ return FlatArray(self.mlparentelement);
+- }, py::keep_alive<0,1>())
+- .def_property_readonly("parentsurfaceelements", [](Mesh & self) {
+- // return FlatArray<int>(self.mlparentsurfaceelement.Size(),
+- // &self.mlparentsurfaceelement[0]);
++ }, py::keep_alive<0,1>()))
++ .def_property_readonly("parentsurfaceelements", py::cpp_function([](Mesh & self) {
+ return FlatArray(self.mlparentsurfaceelement);
+- }, py::keep_alive<0,1>())
++ }, py::keep_alive<0,1>()))
+ .def_property_readonly("macromesh", [](Mesh & self) {
+ auto coarsemesh = make_shared<Mesh>();
+ *coarsemesh = *self.coarsemesh;
commit - 79fc395aa2acb103d73cbe433d3dbaf1b65d46a8
blob - 924d455751ba50c5d5e3b094be8f6dc2060e6575
file + /dev/null
--- cad/netgen-mesher/patches/patch-nglib_CMakeLists_txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: nglib/CMakeLists.txt
---- nglib/CMakeLists.txt.orig
-+++ nglib/CMakeLists.txt
-@@ -11,7 +11,7 @@ if(EMSCRIPTEN)
- target_include_directories(nglib PRIVATE $<TARGET_PROPERTY:occ_libs,INTERFACE_INCLUDE_DIRECTORIES>)
- target_link_libraries(nglib PRIVATE $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>)
- else(EMSCRIPTEN)
-- target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} occ_libs netgen_cgns )
-+ target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns)
- endif(EMSCRIPTEN)
-
- install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})
commit - 79fc395aa2acb103d73cbe433d3dbaf1b65d46a8
blob - 78fce88ce8c0259d437614b9169e29726607b08e
file + cad/netgen-mesher/pkg/PLIST
--- cad/netgen-mesher/pkg/PLIST
+++ cad/netgen-mesher/pkg/PLIST
@@ -32,7 +32,9 @@ include/netgen/core/simd_arm64.hpp
include/netgen/core/simd_avx.hpp
include/netgen/core/simd_avx512.hpp
include/netgen/core/simd_generic.hpp
+include/netgen/core/simd_math.hpp
include/netgen/core/simd_sse.hpp
+include/netgen/core/statushandler.hpp
include/netgen/core/symboltable.hpp
include/netgen/core/table.hpp
include/netgen/core/taskmanager.hpp
No comments:
Post a Comment