<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bc00db4aab73394e8571c82bf7cc0c87ae0c7d6e">https://github.com/macports/macports-ports/commit/bc00db4aab73394e8571c82bf7cc0c87ae0c7d6e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bc00db4aab73394e8571c82bf7cc0c87ae0c7d6e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Nov 28 12:31:09 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> darktable: update version 2.6.2->2.6.3
</span>---
graphics/darktable/Portfile | 13 ++++----
graphics/darktable/files/patch-openmp.diff | 48 ++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 5 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 85b7782..90e2f57 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;'>@@ -6,8 +6,8 @@ PortGroup active_variants 1.1
</span> PortGroup app 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup darktable-org darktable 2.6.2 release-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup darktable-org darktable 2.6.3 release-
</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;'>@@ -27,9 +27,9 @@ homepage https://www.darktable.org/
</span> github.tarball_from releases
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 aa53751d60e7ada728651eb2bc56e0f90a898ccf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9cb9efbb09a40375ff05cef89343235a621c58339539e44985470a029a7ffb45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3512572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cc2c8abb049ab924c9ea9ce8a097339be110ec19 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3522292
</span>
# avoid
# Unknown build type: MACPORTS. Please specify one of:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +128,9 @@ compiler.cxx_standard 2014
</span> # compiling src/osx/osx.mm with GCC results in a cascade of errors
compiler.blacklist *gcc*
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# source files in src/external also require OpenMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-openmp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant openmp description {enable support for OpenMP} {
configure.args-replace -DUSE_OPENMP=OFF -DUSE_OPENMP=ON
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/files/patch-openmp.diff b/graphics/darktable/files/patch-openmp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c02b9da
</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.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-10-20 05:39:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-11-28 10:41:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,20 @@
</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;'>+ find_package(OpenMP 4.0 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(OpenMP_C_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
</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(OpenMP_CXX_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
</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;'>++ list(APPEND LIBS ${OpenMP_C_LIBRARIES} ${OpenMP_CXX_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND LIBS gomp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif(WIN32)
</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(ConfigureChecks.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2019-10-20 05:39:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2019-11-28 10:41:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,22 +226,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Need to explicitly link against math library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND LIBS "-lm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(USE_OPENMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(OpenMP_C_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
</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(OpenMP_CXX_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
</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;'>+- list(APPEND LIBS ${OpenMP_C_LIBRARIES} ${OpenMP_CXX_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND LIBS gomp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(USE_OPENMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(USE_DARKTABLE_PROFILING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DUSE_DARKTABLE_PROFILING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(SOURCES ${SOURCES} "common/profiling.c")
</span></pre><pre style='margin:0'>
</pre>