<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/3fba86a9b1ca7c1aabf4fca0572a91c7e4ea9ef2">https://github.com/macports/macports-ports/commit/3fba86a9b1ca7c1aabf4fca0572a91c7e4ea9ef2</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 3fba86a9b1c darktable: update to 3.6.1 - Variant openmp: ease compiler restrictions; update required openmp version to 4.5 - Enable use of 'macports-libcxx', via pg 'legacysupport', for macOS 10.12 and earlier - Set macOS app name - See: https://trac.macports.org/ticket/63634
</span>3fba86a9b1c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3fba86a9b1ca7c1aabf4fca0572a91c7e4ea9ef2
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Nov 6 15:26:24 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> darktable: update to 3.6.1
</span><span style='display:block; white-space:pre;color:#404040;'> - Variant openmp: ease compiler restrictions; update required openmp version to 4.5
</span><span style='display:block; white-space:pre;color:#404040;'> - Enable use of 'macports-libcxx', via pg 'legacysupport', for macOS 10.12 and earlier
</span><span style='display:block; white-space:pre;color:#404040;'> - Set macOS app name
</span><span style='display:block; white-space:pre;color:#404040;'> - See: https://trac.macports.org/ticket/63634
</span>---
graphics/darktable/Portfile | 49 +++++++++++------
.../files/patch-openmp-compiler-versions.diff | 62 ++++++++++++++++++++++
2 files changed, 96 insertions(+), 15 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 a0c356cf1bd..7b7cc61c012 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;'>@@ -1,17 +1,19 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span> PortGroup github 1.0
PortGroup active_variants 1.1
PortGroup app 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup perl5 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup darktable-org darktable 3.2.1 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup darktable-org darktable 3.6.1 release-
</span> name darktable
conflicts darktable-devel
set my_name darktable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +34,14 @@ github.tarball_from releases
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 865b0810a3f9e86aa223121cb7074aeeeaab784f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6e3683ea88dc0a0271be7eca4fd594b9e46b1b7194847825a8d0a0c12bdeb90c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3920728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6636046ef165cf8f673974aa29121e89c05aafad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a2bfc7c103b824945457a9bfed9e52f007fa1d030f9dbcb3ff0327851be42d14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4685928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable use of 'macports-libcxx' for macOS 10.12 and earlier, as port uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libcxx features normally only available on 10.13 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.use_mp_libcxx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span>
# avoid
# Unknown build type: MACPORTS. Please specify one of:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,17 +52,27 @@ if {[variant_isset debug]} {
</span> cmake.build_type Release
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OpenMP-related patch: By default, CMake script excludes the use of MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clang 9, among others. Ease the compiler restrictions for OpenMP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-openmp-compiler-versions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # darktable sets its own optimization flags
configure.optflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:intltool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cctools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool \
</span> port:pkgconfig \
port:po4a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl5.major}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:atk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:atk \
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:curl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils \
</span> port:exiv2 \
port:flickcurl \
port:GraphicsMagick \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +81,7 @@ depends_lib-append port:atk \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gmic \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span> port:ilmbase \
port:iso-codes \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,8 +106,7 @@ depends_lib-append port:atk \
</span> port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:desktop-file-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:adwaita-icon-theme
</span>
# sets march optimization to generic
configure.args-append -DBINARY_PACKAGE_BUILD=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +117,7 @@ configure.args-append -DBUILD_CMSTEST=OFF \
</span> -DUSE_KWALLET=OFF \
-DUSE_OPENMP=OFF \
-DUSE_UNITY=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dperl_BIN=${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dperl_BIN=${perl5.bin}
</span>
post-build {
set wrap [open "${workpath}/darktable-app" w 0755]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,18 +140,20 @@ post-activate {
</span> system "env XDG_DATA_DIRS=${prefix}/share ${prefix}/bin/update-mime-database -V ${prefix}/share/mime"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+app.name ${my_name}
</span> app.executable ${workpath}/darktable-app
app.icon packaging/macosx/Icons.icns
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span>
# compiling src/osx/osx.mm with GCC results in a cascade of errors
compiler.blacklist-append *gcc*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#Point.h:80:23: error: no member named 'abs' in namespace 'std'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 900}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Point.h:80:23: error: no member named 'abs' in namespace 'std'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: Now requires a minimum of Xcode Clang 10.0.1, as of v3.6.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 1001}
</span>
variant x11 conflicts quartz {
patchfiles-append patch-darktable-no-quartz.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +174,7 @@ variant openmp description {enable support for OpenMP} {
</span> configure.args-replace -DUSE_OPENMP=OFF -DUSE_OPENMP=ON
}
if {[variant_isset openmp]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.openmp_version 4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version 4.5
</span> if {[info exists compiler.log_verbose_output]} {
compiler.log_verbose_output no
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/files/patch-openmp-compiler-versions.diff b/graphics/darktable/files/patch-openmp-compiler-versions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9c0a664da5f
</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-openmp-compiler-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compiler-versions.cmake.orig 2021-11-06 17:31:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compiler-versions.cmake 2021-11-06 17:33:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,24 +45,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 7 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 10)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "LLVM Clang C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "LLVM Clang C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "LLVM Clang C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "LLVM Clang C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</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;'>+ # OpenMP is not supported with XCode 10.2-10.3 (based on LLVM7) / XCode 11.4-11.7 (based on LLVM9).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0.1 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 11.0.0) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0.3 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0.0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "XCode (Apple clang) C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "XCode (Apple clang) C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0.1 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.0) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0.3 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0.0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "XCode (Apple clang) C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "XCode (Apple clang) C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</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;'>+--- src/external/rawspeed/cmake/compiler-versions.cmake.orig 2021-11-06 17:31:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/external/rawspeed/cmake/compiler-versions.cmake 2021-11-06 17:33:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,24 +45,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 7 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 10)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "LLVM Clang C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "LLVM Clang C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "LLVM Clang C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "LLVM Clang C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</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;'>+ # OpenMP is not supported with XCode 10.2-10.3 (based on LLVM7) / XCode 11.4-11.7 (based on LLVM9).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0.1 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 11.0.0) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0.3 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0.0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "XCode (Apple clang) C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "XCode (Apple clang) C compiler version ${CMAKE_C_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0.1 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.0) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0.3 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0.0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "XCode (Apple clang) C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "XCode (Apple clang) C++ compiler version ${CMAKE_CXX_COMPILER_VERSION} is not supported in with-OpenMP build mode.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>