<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/91814f7787ba5469f58fbfb9739711f1a4cbdbec">https://github.com/macports/macports-ports/commit/91814f7787ba5469f58fbfb9739711f1a4cbdbec</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 91814f7787b darktable-devel: update to 4.6.1
</span>91814f7787b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 91814f7787ba5469f58fbfb9739711f1a4cbdbec
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Apr 12 13:56:16 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> darktable-devel: update to 4.6.1
</span>---
graphics/darktable-devel/Portfile | 25 +++++++++++++++-------
.../files/patch-cmake-cxx-2011-compat.diff | 24 +++++++++++++++++++++
.../files/patch-cmake-opt-flags.diff | 24 +++++++++++++++++++++
3 files changed, 65 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable-devel/Portfile b/graphics/darktable-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1814335c2f..3c0bddc6548 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/darktable-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/darktable-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,11 +10,11 @@ PortGroup perl5 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup darktable-org darktable 4.4.1 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup darktable-org darktable 4.6.1 release-
</span> name darktable-devel
conflicts darktable
set my_name darktable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</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;'>@@ -34,9 +34,9 @@ github.tarball_from releases
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 333a470af1a86a1035f40366188c2573e6cbc418 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e043d38d2e8adb67af7690b12b535a40e8ec7bea05cfa8684db8b21a626e0f0d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5956860
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e45bd69300537e6d261140abc1628f9c4ddb6cfe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 16edc0a070293e2d3cda4ea10e49bda9bde932e23f9e62e2fa2e7ac74acf7afd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6240188
</span>
# If lua installed, those headers are found first, rather than lua54
conflicts_build-append lua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,10 +132,19 @@ depends_lib-append \
</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:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:adwaita-icon-theme \
</span> port:tango-icon-theme \
port:exiftool
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Reduce optimizations, which cause some versions of MacPorts Clang to crash during compilation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-opt-flags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable Cxx 2011 deprecated features, like std::auto_ptr, necessary for dep 'exiv2' v0.27.x.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove once 'exiv2' has been updated to 0.28.x or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-cxx-2011-compat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DENABLE_CXX11_COMPAT=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # sets march optimization to generic
configure.args-append -DBINARY_PACKAGE_BUILD=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,7 +201,7 @@ app.icon packaging/macosx/Icons.icns
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2020
</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:#e0e0e0;'>@@ -206,7 +215,7 @@ compiler.blacklist-append {clang < 1200}
</span> # Blacklist MacPorts Clang 14 and newer (up to 19) for now, due to compilation crashes.
# See: https://trac.macports.org/ticket/65246
#--------------------------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {macports-clang-1[4-9]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#compiler.blacklist-append {macports-clang-1[4-9]}
</span>
variant x11 conflicts quartz {
require_active_variants gtk3 x11 quartz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable-devel/files/patch-cmake-cxx-2011-compat.diff b/graphics/darktable-devel/files/patch-cmake-cxx-2011-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c34657d6871
</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-devel/files/patch-cmake-cxx-2011-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-04-11 16:30:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-04-11 16:40:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DARKTABLE_DATADIR "${DARKTABLE_BINDIR}/${REL_BIN_TO_DATADIR}") # DATAROOTDIR == DATADIR # darktablerc, themes, icons, ... Cannot use ${CMAKE_BINDIR}/data because not everything resides there. Like icons (pixmaps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DARKTABLE_LOCALEDIR "${DARKTABLE_BINDIR}/${REL_BIN_TO_LOCALEDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (ENABLE_CXX11_COMPAT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(NOTICE "Enabling Cxx 2011 backward-compatibility, for dependencies")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_compile_options(-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
</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;'>+ # https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${FORCE_COLORED_OUTPUT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DefineOptions.cmake.orig 2024-04-11 16:31:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DefineOptions.cmake 2024-04-11 16:34:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(USE_GAME "Build 1st April easter egg game" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(USE_SDL2 "Enable SDL2 support" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option(ENABLE_CXX11_COMPAT "Enable use of deprecated Cxx 2011 features, like std::auto_ptr, for outdated deps" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (USE_OPENCL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(TESTBUILD_OPENCL_PROGRAMS "Test-compile OpenCL programs (needs LLVM and Clang 7+)" ON)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable-devel/files/patch-cmake-opt-flags.diff b/graphics/darktable-devel/files/patch-cmake-opt-flags.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2368aa72b93
</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-devel/files/patch-cmake-opt-flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2024-04-11 16:58:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2024-04-11 17:01:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -643,8 +643,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-g MUST be set for ALL builds, or there will be no support for them when bugs happen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -ftree-vectorize")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O1 -ftree-vectorize")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O1 -ffast-math -fno-finite-math-only")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_COMPILER_IS_GNUCC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(BUILD_SSE2_CODEPATHS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -657,8 +657,8 @@
</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;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -ftree-vectorize")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O1 -ftree-vectorize")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O1 -ffast-math -fno-finite-math-only")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(BUILD_SSE2_CODEPATHS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
</span></pre><pre style='margin:0'>
</pre>