<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f432221bb22e518b7a62a3ce3e9dfb21eadb6bc">https://github.com/macports/macports-ports/commit/9f432221bb22e518b7a62a3ce3e9dfb21eadb6bc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9f432221bb22e518b7a62a3ce3e9dfb21eadb6bc
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Jan 4 00:05:10 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> netgen: update to 6.2.2307
</span>---
math/netgen/Portfile | 37 ++++++++++++++++++----
math/netgen/files/patch-CMakeLists.txt.diff | 6 ++--
math/netgen/files/patch-encoding.diff | 16 ++++++++++
math/netgen/files/patch-link-agains-ffmpeg.diff | 13 --------
math/netgen/files/patch-link-against-ffmpeg.diff | 13 ++++++++
math/netgen/files/patch-no-external.diff | 11 +++----
math/netgen/files/patch-opengl.diff | 32 +++++++++++++++++++
math/netgen/files/patch-propagate_c_compiler.diff | 6 ++--
.../netgen/files/patch-unbreak-netgen-targets.diff | 22 +++++++++++++
math/netgen/files/patch-use-right-python.diff | 18 +++++++++++
math/netgen/files/patch-utils.hpp.diff | 22 +++++++++++++
math/netgen/files/patch-x11-gl.diff | 21 ++++++++++++
12 files changed, 185 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/Portfile b/math/netgen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1e0ae7896d..53233c2b629 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup NGSolve netgen 6.2.2301 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup NGSolve netgen 6.2.2307 v
</span> revision 0
categories math
license LGPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,10 @@ long_description ${description}. It accepts input from constructive \
</span> refinement.
homepage https://ngsolve.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 61be71c280de0c0eb4b9adead1146f79a92f6ee4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8cee188e23b68a8c7104a5bf9a497c80a3df085885635a92f0fd9e15bf33b6a8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3394730
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1a37d234b5081600b572f1e0a86c97c0e233ebf6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e62a9cca2e727797dddadf04de308594f46863f2cac47adb5f51bd8b8c7884aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3427060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,17 +41,22 @@ legacysupport.use_mp_libcxx \
</span> yes
legacysupport.newest_darwin_requires_legacy \
18
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Netgen(55088) malloc: *** error for object 0x1587968: Non-aligned pointer being freed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.redirect_bins netgen
</span>
patchfiles-append patch-no-external.diff \
patch-no-pybind.diff \
patch-CMakeLists.txt.diff \
patch-no-console.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-link-agains-ffmpeg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-link-against-ffmpeg.diff \
</span> patch-cmake-version.diff \
patch-MacPorts-rpath.diff \
patch-MacPorts-togl.diff \
patch-ensure_gui_defines.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-propagate_c_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-propagate_c_compiler.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-utils.hpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-encoding.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-unbreak-netgen-targets.diff
</span>
depends_lib-append port:zlib \
port:tcl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +75,7 @@ configure.args-append -DUSE_NATIVE_ARCH=OFF \
</span> -DNETGEN_VERSION_GIT="v${version}" \
-DUSE_JPEG=ON \
-DUSE_MPEG=ON \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_OCC=OFF \
</span> -DUSE_SUPERBUILD=OFF
set pythonversions {3.7 3.8 3.9 3.10 3.11}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,8 +109,16 @@ foreach pdv ${pythonversions} {
</span> configure.args-replace -DUSE_PYTHON=OFF \
-DUSE_PYTHON=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Choosing Python version does not work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gitlab.kitware.com/cmake/cmake/-/issues/23139
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/NGSolve/netgen/issues/174
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use-right-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PV@|${pdv}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append -DPYBIND_INCLUDE_DIR=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/${pdv}/bin/python${pdv}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON3_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/${pdv}/bin/python${pdv}
</span>
destroot.args-append DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
PYTHONPATH=${destroot}${prefix}/lib/python${pdv}/site-packages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,6 +137,10 @@ variant quartz conflicts x11 {
</span> require_active_variants tk quartz
require_active_variants tkdnd quartz
require_active_variants Togl quartz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenGL/gl3.h does not exist prior to 10.7.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/NGSolve/netgen/issues/173
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-opengl.diff
</span> post-patch {
reinplace "s|MACPORTS_NO_X11|TRUE|g" \
${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,6 +155,10 @@ variant x11 conflicts quartz {
</span> port:xorg-libXmu \
port:mesa
depends_build-append port:libGLU
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use appropriate headers:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-x11-gl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-CMakeLists.txt.diff b/math/netgen/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2652cbe5fd7..7232694d726 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ index 0a05ebb1..677d586b 100644
</span>
set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)")
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(APPLE AND NOT EMSCRIPTEN)
</span> +if(APPLE AND FALSE)
set(NG_INSTALL_DIR_BIN_DEFAULT Contents/MacOS)
set(NG_INSTALL_DIR_LIB_DEFAULT Contents/MacOS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ index 0a05ebb1..677d586b 100644
</span> set(NG_INSTALL_DIR_INCLUDE_DEFAULT Contents/Resources/include)
set(NG_RPATH_TOKEN "@loader_path")
<span style='display:block; white-space:pre;background:#ffe0e0;'>--else(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else(APPLE AND NOT EMSCRIPTEN)
</span> +else(APPLE AND FALSE)
set(NG_INSTALL_DIR_BIN_DEFAULT bin)
set(NG_INSTALL_DIR_LIB_DEFAULT lib)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ index 0a05ebb1..677d586b 100644
</span> set(NG_INSTALL_DIR_INCLUDE_DEFAULT include)
set(NG_RPATH_TOKEN "\$ORIGIN")
<span style='display:block; white-space:pre;background:#ffe0e0;'>--endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(APPLE AND NOT EMSCRIPTEN)
</span> +endif(APPLE AND FALSE)
set(NG_INSTALL_DIR_PYTHON ${NG_INSTALL_DIR_PYTHON_DEFAULT} CACHE STRING "Install directory for Python files")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-encoding.diff b/math/netgen/files/patch-encoding.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bf3543bd2c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-encoding.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/NGSolve/netgen/pull/172
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ng/encoding.hpp 2023-12-23 05:42:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ng/encoding.hpp 2024-01-04 00:39:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef FFMPEG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cinttypes>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavutil/avassert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavcodec/avcodec.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-link-agains-ffmpeg.diff b/math/netgen/files/patch-link-agains-ffmpeg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e02a7ec1a44..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-link-agains-ffmpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git nglib/CMakeLists.txt nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 370b670b..5fc61ecf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@ endif(USE_OCC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(nglib PUBLIC ngcore)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} netgen_cgns )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} netgen_cgns )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES nglib.h DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-link-against-ffmpeg.diff b/math/netgen/files/patch-link-against-ffmpeg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1608fc35610
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-link-against-ffmpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git nglib/CMakeLists.txt nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 370b670b..5fc61ecf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(nglib PUBLIC $<TARGET_PROPERTY:ngcore,INTERFACE_INCLUDE_DIRECTORIES>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(EMSCRIPTEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(nglib PUBLIC ngcore)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(EMSCRIPTEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-no-external.diff b/math/netgen/files/patch-no-external.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 51175d9cfea..c8e0abbd6f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-no-external.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-no-external.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ diff --git cmake/external_projects/tcltk.cmake cmake/external_projects/tcltk.cma
</span> index 637c1899..1dd10dd2 100644
--- cmake/external_projects/tcltk.cmake
+++ cmake/external_projects/tcltk.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,117 +64,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,116 +64,8 @@
</span>
else(SKBUILD)
if(APPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ index 637c1899..1dd10dd2 100644
</span> - )
-
- ExternalProject_Add(project_tkdnd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- URL "http://sourceforge.net/projects/tkdnd/files/TkDND/TkDND%202.8/tkdnd2.8-src.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL "https://src.fedoraproject.org/repo/pkgs/tkdnd/tkdnd2.8-src.tar.gz/a6d47a996ea957416469b12965d4db91/tkdnd2.8-src.tar.gz"
</span> - URL_MD5 a6d47a996ea957416469b12965d4db91
- DEPENDS project_tcl project_tk
- DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ index 637c1899..1dd10dd2 100644
</span> - -DTK_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework/Headers
- ${SUBPROJECT_ARGS}
- )
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - list(APPEND NETGEN_DEPENDENCIES project_tcl project_tk project_tkdnd)
- list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks)
- set(TCL_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework/Headers)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,8 +118,7 @@ index 637c1899..1dd10dd2 100644
</span> -# else()
-# find_package(TCL 8.5 REQUIRED)
-# endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(TCL 8.5 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(TCL 8.5 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> elseif(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ExternalProject_Add(project_win_tcltk
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-opengl.diff b/math/netgen/files/patch-opengl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03ec5180fb4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/NGSolve/netgen/issues/173
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libsrc/include/incopengl.hpp 2023-12-23 05:42:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libsrc/include/incopengl.hpp 2024-01-04 00:51:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,16 +5,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mystdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mydefs.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GL_SILENCE_DEPRECATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define GL_SILENCE_DEPRECATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED > 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <OpenGL/gl3.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <GL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <GL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TOGL_X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // parallel
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-propagate_c_compiler.diff b/math/netgen/files/patch-propagate_c_compiler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c5dfc6cf340..7ef6d03caab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-propagate_c_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-propagate_c_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,11 @@ diff --git cmake/SuperBuild.cmake cmake/SuperBuild.cmake
</span> index 13d6915a..5f924c81 100644
--- cmake/SuperBuild.cmake
+++ cmake/SuperBuild.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,6 +210,7 @@ endif(USE_MPI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,6 +231,7 @@
</span> #######################################################################
# propagate cmake variables to Netgen subproject
set_vars( NETGEN_CMAKE_ARGS
+ CMAKE_C_COMPILER
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_MODULE_LINKER_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_MODULE_LINKER_FLAGS_RELEASE
</span> CMAKE_SHARED_LINKER_FLAGS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_SHARED_LINKER_FLAGS_RELEASE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_CXX_FLAGS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-unbreak-netgen-targets.diff b/math/netgen/files/patch-unbreak-netgen-targets.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1feea160f56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-unbreak-netgen-targets.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Exporting these produces a broken config, since Macports moves these libs into a dedicated Python prefix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ng/CMakeLists.txt 2023-12-23 05:42:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ng/CMakeLists.txt 2024-01-04 04:28:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties( ngpy PROPERTIES OUTPUT_NAME "libngpy")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(ngpy PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/../${NETGEN_PYTHON_RPATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS ngpy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} COMPONENT netgen EXPORT netgen-targets)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(TARGETS ngpy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} COMPONENT netgen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(USE_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(ngguipy SHARED ngguipy.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties( ngguipy PROPERTIES OUTPUT_NAME "libngguipy")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(ngguipy PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/../${NETGEN_PYTHON_RPATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS ngguipy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} COMPONENT netgen EXPORT netgen-targets)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(TARGETS ngguipy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} COMPONENT netgen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(USE_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(USE_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-use-right-python.diff b/math/netgen/files/patch-use-right-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f98695d3ba3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-use-right-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/NGSolve/netgen/issues/174
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2023-12-23 05:42:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-01-04 02:02:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,10 +86,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(USE_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.18)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python3 REQUIRED COMPONENTS Development.Module)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python3 COMPONENTS Interpreter Development.Embed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python3 @PV@ REQUIRED EXACT COMPONENTS Development.Module)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python3 @PV@ EXACT COMPONENTS Interpreter Development.Embed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python3 @PV@ REQUIRED EXACT COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT CMAKE_CROSSCOMPILING)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-utils.hpp.diff b/math/netgen/files/patch-utils.hpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3613c28d26f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-utils.hpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/NGSolve/netgen/pull/171
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libsrc/core/utils.hpp 2023-12-23 05:42:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libsrc/core/utils.hpp 2024-01-03 23:58:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ngcore_api.hpp" // for NGCORE_API and CPU arch macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && defined(NETGEN_ARCH_ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && !defined(NETGEN_ARCH_AMD64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/mach_time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline TTimePoint GetTimeCounter() noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && defined(NETGEN_ARCH_ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && !defined(NETGEN_ARCH_AMD64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return mach_absolute_time();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(NETGEN_ARCH_AMD64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return __rdtsc();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-x11-gl.diff b/math/netgen/files/patch-x11-gl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..822883cd7be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-x11-gl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libsrc/include/incopengl.hpp 2023-12-23 05:42:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libsrc/include/incopengl.hpp 2024-01-04 00:55:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,16 +5,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mystdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mydefs.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GL_SILENCE_DEPRECATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <OpenGL/gl3.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <GL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <GL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TOGL_X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // parallel
</span></pre><pre style='margin:0'>
</pre>