darktable: update to 3.2.1.

This commit is contained in:
lemmi 2020-08-11 15:07:20 +02:00
parent 33abec1c02
commit 6fbe588447
4 changed files with 11 additions and 45 deletions

View File

@ -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"

View File

@ -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})

View File

@ -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;

View File

@ -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:
#