Re: [PR PATCH] [Updated] darktable: update to 3.2.1.

[lemmi <lemmi@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

There is an updated pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages darktable
https://github.com/void-linux/void-packages/pull/24220

darktable: update to 3.2.1.
If possible I need people to test aarch64.

A patch file from https://github.com/void-linux/void-packages/pull/24220.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-darktable-24220.patch --]
[-- Type: text/x-diff, Size: 5336 bytes --]

From 793e2f0b2e82a06d2237f6b68d622f765d409906 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 11 Aug 2020 15:07:20 +0200
Subject: [PATCH] darktable: update to 3.2.1.

---
 common/options.description                    |  1 +
 .../darktable/patches/find-openexr-2.4.patch  | 23 -------------------
 .../darktable/patches/fix-omp-aarch64.patch   | 18 ---------------
 srcpkgs/darktable/template                    | 14 +++++++----
 4 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/darktable/patches/find-openexr-2.4.patch
 delete mode 100644 srcpkgs/darktable/patches/fix-omp-aarch64.patch

diff --git a/common/options.description b/common/options.description
index 9862f50fb50..360fc21bca2 100644
--- a/common/options.description
+++ b/common/options.description
@@ -26,6 +26,7 @@ desc_option_gir="Enable support for gobject introspection data"
 desc_option_gles2="Enable support for GLES (v2)"
 desc_option_gles="Enable support for GLES (v1)"
 desc_option_gnome="Enable support for GNOME"
+desc_option_gmic="Enable support for image processing with G'MIC"
 desc_option_gnutls="Enable support for SSL with gnutls"
 desc_option_gssapi="Enable support for GSSAPI"
 desc_option_gstreamer="Enable support for GStreamer"
diff --git a/srcpkgs/darktable/patches/find-openexr-2.4.patch b/srcpkgs/darktable/patches/find-openexr-2.4.patch
deleted file mode 100644
index 6faafb96280..00000000000
--- a/srcpkgs/darktable/patches/find-openexr-2.4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- cmake/modules/FindOpenEXR.cmake	2019-12-09 11:18:24.529805119 +0100
-+++ cmake/modules/FindOpenEXR.cmake	2019-12-09 11:19:28.634808426 +0100
-@@ -26,16 +26,16 @@
- set(OPENEXR_LIB_DIR ${_OPENEXR_LIB_DIR})
- mark_as_advanced(OPENEXR_LIB_DIR)
- 
--find_library(_OPENEXR_LIBRARY_IMIMF IlmImf
-+find_library(_OPENEXR_LIBRARY_IMIMF IlmImf-2_4
- 	HINTS ENV OPENEXR_LIB_DIR)
- set (OPENEXR_LIBRARY ${OPENEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMIMF})
--find_library(_OPENEXR_LIBRARY_IMATH Imath 
-+find_library(_OPENEXR_LIBRARY_IMATH Imath-2_4
- 	HINTS ENV OPENEXR_LIB_DIR)
- set (OPENEXR_LIBRARY ${OPENEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMATH})
--find_library(_OPENEXR_LIBRARY_IEX Iex
-+find_library(_OPENEXR_LIBRARY_IEX Iex-2_4
- 	HINTS ENV OPENEXR_LIB_DIR)
- set (OPENEXR_LIBRARY ${OPENEXR_LIBRARY} ${_OPENEXR_LIBRARY_IEX})
--find_library(_OPENEXR_LIBRARY_ILMTHREAD IlmThread
-+find_library(_OPENEXR_LIBRARY_ILMTHREAD IlmThread-2_4
- 	HINTS ENV OPENEXR_LIB_DIR)
- set (OPENEXR_LIBRARY ${OPENEXR_LIBRARY} ${_OPENEXR_LIBRARY_ILMTHREAD})
- 
diff --git a/srcpkgs/darktable/patches/fix-omp-aarch64.patch b/srcpkgs/darktable/patches/fix-omp-aarch64.patch
deleted file mode 100644
index d0ddf78065e..00000000000
--- a/srcpkgs/darktable/patches/fix-omp-aarch64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/iop/highlights.c	2019-10-20 14:39:07.000000000 +0200
-+++ src/iop/highlights.c	2019-12-09 11:09:14.468776742 +0100
-@@ -625,12 +625,14 @@
-                                const dt_iop_roi_t *const roi_out, const float clip)
- {
-   const uint8_t(*const xtrans)[6] = (const uint8_t(*const)[6])piece->pipe->dsc.xtrans;
--
-+/* fails for aarch64 with: highlights.c:700:17: error: '*.LC2' not specified in enclosing 'parallel' */
-+#if !defined(__aarch64__)
- #ifdef _OPENMP
- #pragma omp parallel for default(none) \
-   dt_omp_firstprivate(clip, ivoid, ovoid, roi_in, roi_out, xtrans) \
-   schedule(dynamic)
- #endif
-+#endif
-   for(int j = 0; j < roi_out->height; j++)
-   {
-     float *out = (float *)ovoid + (size_t)roi_out->width * j;
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 97f28355265..20734edd8fc 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=3.0.2
+version=3.2.1
 revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
@@ -8,13 +8,13 @@ build_style=cmake
 # this makes sure to use -march=generic and -msse3
 configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON
  -DRAWSPEED_ENABLE_LTO=ON"
-hostmakedepends="pkg-config intltool libxslt-devel"
+hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
 makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
  dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
  lensfun-devel sqlite-devel librsvg-devel lua53-devel json-glib-devel
  libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
  libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
- desktop-file-utils"
+ $(vopt_if gmic gmic-devel)"
 depends="adwaita-icon-theme"
 short_desc="Virtual lighttable and darkroom for photographers"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -22,7 +22,13 @@ license="GPL-3.0-or-later"
 homepage="http://www.darktable.org/"
 changelog="https://github.com/darktable-org/darktable/releases"
 distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb
+checksum=6e3683ea88dc0a0271be7eca4fd594b9e46b1b7194847825a8d0a0c12bdeb90c
+
+build_options="gmic"
+
+if [ ! "$CROSS_BUILD" ]; then
+	build_options_default+=" gmic"
+fi
 
 # Temporarily disable OpenMP for aarch64:
 #