<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/66df8b7f3713f61acb491f2f77b713497993f104">https://github.com/macports/macports-ports/commit/66df8b7f3713f61acb491f2f77b713497993f104</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 66df8b7f371 darktable: update to 4.4.0; add lua54, portmidi; simplify patches - Upgrade pg app to 1.1 - Disable mime db update; now handled automatically by shared-mime-info
</span>66df8b7f371 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 66df8b7f3713f61acb491f2f77b713497993f104
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Jun 24 09:55:31 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> darktable: update to 4.4.0; add lua54, portmidi; simplify patches
</span><span style='display:block; white-space:pre;color:#404040;'> - Upgrade pg app to 1.1
</span><span style='display:block; white-space:pre;color:#404040;'> - Disable mime db update; now handled automatically by shared-mime-info
</span>---
graphics/darktable/Portfile | 56 ++++++++++++++--------
.../darktable/files/cmake-compiler-versions.cmake | 4 ++
.../darktable/files/patch-darktable-no-quartz.diff | 12 -----
.../files/patch-openmp-compiler-versions.diff | 31 ------------
4 files changed, 40 insertions(+), 63 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 a1014686c66..ad66d5528bc 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;'>@@ -4,16 +4,17 @@ PortSystem 1.0
</span> PortGroup legacysupport 1.1
PortGroup github 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.1
</span> PortGroup cmake 1.1
PortGroup perl5 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup darktable-org darktable 4.2.1 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup darktable-org darktable 4.4.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 0
</span>
categories graphics
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,15 +34,37 @@ github.tarball_from releases
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 58f1a912830289691a4f9f3cea42427d305f3269 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 603a39c6074291a601f7feb16ebb453fd0c5b02a6f5d3c7ab6db612eadc97bac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6112480
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dda8eb1e27a571cb5f1547cf97faa52af0abf1a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8887fc34abd97c4998b0888c3197e0c509d63bdeab2238906915319811f3b080 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5794168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# If lua installed, those headers are found first, rather than lua54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build-append lua
</span>
# Enable use of 'macports-libcxx' for macOS 10.12 and earlier, as port uses
# libcxx features normally only available on 10.13 and later.
legacysupport.use_mp_libcxx \
yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream includes stricter compiler restrictions than are necessary, vis-a-vis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts toolchain components. So replace stock versions, with our own dummy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# empty cmake file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmake_compiler_versions_targets \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/compiler-versions.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/external/rawspeed/cmake/compiler-versions.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${cmake_compiler_versions_targets} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ftgt ${worksrcpath}/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Overlaying stock compiler-versions.cmake: ${f}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${ftgt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/cmake-compiler-versions.cmake ${ftgt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Supported build types: Debug:RelWithDebInfo;Release;Coverage;Sanitize;Tsan;Fuzz
if {[variant_isset debug]} {
cmake.build_type RelWithDebInfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,16 +74,6 @@ if {[variant_isset debug]} {
</span>
perl5.branches 5.34
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenMP-related patch: By default, CMake script excludes the use of MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Clang 9, among others. Ease the compiler restrictions for OpenMP.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-openmp-compiler-versions.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Despite disabling external Lua use, upstream cmake script still finds/uses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Lua 5.4 if present. So delete the find script for it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/cmake/modules/FindLua54.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # darktable sets its own optimization flags
configure.optflags
# disable deprecation warnings
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,9 +84,9 @@ depends_build-append \
</span> port:cctools \
port:gettext \
port:intltool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl5.major} \
</span> port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:po4a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl5.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:po4a
</span>
depends_lib-append \
port:atk \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +107,7 @@ depends_lib-append \
</span> port:libavif \
port:libheif \
port:libjxl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lua54 \
</span> port:imath \
port:iso-codes \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,6 +125,7 @@ depends_lib-append \
</span> port:openjpeg \
port:osm-gps-map \
path:lib/pkgconfig/pango.pc:pango \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:portmidi \
</span> port:pugixml \
port:sqlite3 \
port:webp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,7 +181,9 @@ post-destroot {
</span> post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "env XDG_DATA_DIRS=${prefix}/share ${prefix}/bin/update-mime-database -V ${prefix}/share/mime"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: mime db update now handled automatically by shared-mime-info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system "env XDG_DATA_DIRS=${prefix}/share ${prefix}/bin/update-mime-database -V ${prefix}/share/mime"
</span> }
app.name ${my_name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,7 +209,6 @@ compiler.blacklist-append {clang < 1200}
</span> compiler.blacklist-append {macports-clang-1[4-9]}
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-darktable-no-quartz.diff
</span> require_active_variants gtk3 x11 quartz
configure.args-append -DUSE_MAC_INTEGRATION=OFF
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/files/cmake-compiler-versions.cmake b/graphics/darktable/files/cmake-compiler-versions.cmake
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e5a416a6adf
</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/cmake-compiler-versions.cmake
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Dummy cmake file, replacing upstream's various 'compiler-versions.cmake' files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The stock versions implement compiler/platform restrictions far stricter than
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# necessary, for the MacPorts environment.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/files/patch-darktable-no-quartz.diff b/graphics/darktable/files/patch-darktable-no-quartz.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5805575d1cc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/darktable/files/patch-darktable-no-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osx/osx.mm.orig 2023-02-15 11:52:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osx/osx.mm 2023-04-19 08:26:46.080825763 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gtk/gtk.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_INTEGRATION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gdk/gdkquartz.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gio/gio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b2cfdc8f9ed..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/darktable/files/patch-openmp-compiler-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/compiler-versions.cmake.orig 2021-11-06 17:31:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/compiler-versions.cmake 2021-11-06 17:33:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,24 +45,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ((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:#ffe0e0;'>- (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:#ffe0e0;'>-- 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:#ffe0e0;'>-+ 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:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ((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:#ffe0e0;'>- (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:#ffe0e0;'>-- 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:#ffe0e0;'>-+ 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:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ((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:#ffe0e0;'>- (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:#ffe0e0;'>-- 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:#ffe0e0;'>-+ 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:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ((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:#ffe0e0;'>- (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:#ffe0e0;'>-- 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:#ffe0e0;'>-+ 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:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>