<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8b27e40c0bdf221b15b4a5e245ae7751f08ef8cd">https://github.com/macports/macports-ports/commit/8b27e40c0bdf221b15b4a5e245ae7751f08ef8cd</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 8b27e40c0bd darktable: enable curve and noise tools across-the-board - Now possible, thanks to OpenMP-related patch See: https://trac.macports.org/ticket/65474 Fixes: https://trac.macports.org/ticket/65683
</span>8b27e40c0bd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8b27e40c0bdf221b15b4a5e245ae7751f08ef8cd
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Aug 18 22:13:07 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    darktable: enable curve and noise tools across-the-board
</span><span style='display:block; white-space:pre;color:#404040;'>    - Now possible, thanks to OpenMP-related patch
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/65474
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/65683
</span>---
 graphics/darktable/Portfile                        | 37 ++++++++--------------
 .../darktable/files/patch-curvetool-openmp.diff    | 14 ++++++++
 2 files changed, 28 insertions(+), 23 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/Portfile b/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ef564d7f47..7d7387aeb3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ github.setup            darktable-org darktable 4.0.0 release-
</span> name                    darktable
 conflicts               darktable-devel
 set my_name             darktable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                6
</span> 
 categories              graphics
 license                 GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,12 +55,18 @@ perl5.branches          5.34
</span> # Clang 9, among others. Ease the compiler restrictions for OpenMP.
 patchfiles-append       patch-openmp-compiler-versions.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ensure the curve-tool build respects global flag USE_OPENMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-curvetool-openmp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Disable signal handler registration by GraphicsMagick
 # See: https://trac.macports.org/ticket/64252
 patchfiles-append       patch-graphicsmagick-disable-signal-handlers.diff
 
 # darktable sets its own optimization flags
 configure.optflags
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable deprecation warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -Wno-deprecated-declarations
</span> 
 depends_build-append    \
                         port:cctools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,6 +123,8 @@ depends_run             port:adwaita-icon-theme \
</span> configure.args-append   -DBINARY_PACKAGE_BUILD=ON
 
 configure.args-append   -DBUILD_CMSTEST=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DBUILD_CURVE_TOOLS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DBUILD_NOISE_TOOLS=ON \
</span>                         -DTESTBUILD_OPENCL_PROGRAMS=OFF \
                         -DUSE_COLORD=OFF \
                         -DUSE_KWALLET=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,21 +133,6 @@ configure.args-append   -DBUILD_CMSTEST=OFF \
</span>                         -DDONT_USE_INTERNAL_LUA=OFF \
                         -Dperl_BIN=${perl5.bin}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Feature-wise, the curve and noise tools cause build failures for 10.14 and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/65474
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set features_curve_noise ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set features_curve_noise OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_debug "Features: curve and noise tools: ${features_curve_noise}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DBUILD_CURVE_TOOLS=${features_curve_noise} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DBUILD_NOISE_TOOLS=${features_curve_noise}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # For ARM build, we must disable Intel instruction set use.
 if {${configure.build_arch} eq "arm64"} {
     configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,13 +153,11 @@ post-destroot {
</span>     # need to determine why lib is not going where expected, until then...
     move ${destroot}${prefix}/lib/darktable/libdarktable.dylib ${destroot}${prefix}/lib/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # create symlinks for tools, if enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${features_curve_noise}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set port_tools_dir ${prefix}/libexec/darktable/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach f [glob ${destroot}${port_tools_dir}/darktable-*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set fn [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ln -s ${port_tools_dir}/${fn} ${destroot}${prefix}/bin/${fn}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # create symlinks for tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set port_tools_dir ${prefix}/libexec/darktable/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach f [glob ${destroot}${port_tools_dir}/darktable-*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set fn [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ln -s ${port_tools_dir}/${fn} ${destroot}${prefix}/bin/${fn}
</span>     }
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/files/patch-curvetool-openmp.diff b/graphics/darktable/files/patch-curvetool-openmp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9db063bb0e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/darktable/files/patch-curvetool-openmp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/basecurve/CMakeLists.txt.orig    2022-08-18 20:10:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/basecurve/CMakeLists.txt 2022-08-18 20:19:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(OpenMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++message("darktable-curve-tool: USE_OPENMP: ${USE_OPENMP}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (USE_OPENMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    find_package(OpenMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(OPENMP_FOUND FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++message("darktable-curve-tool: OPENMP_FOUND: ${OPENMP_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(M_LIBRARY m)
</span></pre><pre style='margin:0'>

</pre>