From: lemmi <lemmi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] darktable: update to 3.2.1.
Date: Thu, 13 Aug 2020 09:28:20 +0200 [thread overview]
Message-ID: <20200813072820.DfE9NddoFw0GcGRBg3CGEFUo2EeJm9GSO3BoOR2NNKA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24220@inbox.vuxu.org>
[-- 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: 4800 bytes --]
From 1f77fbd8f0cca19e9ffcf02aa0086e36fc80057c 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.
---
.../darktable/patches/find-openexr-2.4.patch | 23 -------------------
.../darktable/patches/fix-omp-aarch64.patch | 18 ---------------
srcpkgs/darktable/template | 12 ++++++----
3 files changed, 7 insertions(+), 46 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/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..896ce52066e 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,12 @@ 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"
+ libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel"
depends="adwaita-icon-theme"
short_desc="Virtual lighttable and darkroom for photographers"
maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -22,13 +21,16 @@ 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
# Temporarily disable OpenMP for aarch64:
#
# see https://github.com/void-linux/void-packages/issues/21105
case $XBPS_TARGET_MACHINE in
+ x86_64*)
+ makedepends+=" gmic-devel"
+ ;;
aarch64*)
configure_args+=" -DUSE_OPENMP=OFF"
;;
next prev parent reply other threads:[~2020-08-13 7:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 13:13 [PR PATCH] " lemmi
2020-08-11 13:20 ` ericonr
2020-08-11 13:33 ` [PR REVIEW] " ericonr
2020-08-11 13:39 ` lemmi
2020-08-13 7:08 ` [PR PATCH] [Updated] " lemmi
2020-08-13 7:28 ` lemmi [this message]
2020-08-13 7:35 ` lemmi
2020-09-02 1:18 ` [PR PATCH] [Merged]: " lemmi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200813072820.DfE9NddoFw0GcGRBg3CGEFUo2EeJm9GSO3BoOR2NNKA@z \
--to=lemmi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).