From bbdf969f7b79ba4863b1138d355f968797e8e993 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sat, 25 Dec 2021 18:53:24 +0100 Subject: [PATCH] darktable: update to 3.8.0. --- ...rget_clones-attribute-only-for-glibc.patch | 30 +++++++++++-------- srcpkgs/darktable/template | 8 ++--- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch b/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch index 8137cd133788d8..b16a7a3457e8df 100644 --- a/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch +++ b/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch @@ -1,28 +1,34 @@ -From d61f3f153f8db2c991c09a3d2bd5ac9af69ce614 Mon Sep 17 00:00:00 2001 +From 305f9110e1d63bfa33064d5c92490c442b27c8bf Mon Sep 17 00:00:00 2001 From: lemmi -Date: Mon, 5 Jul 2021 02:31:17 +0200 +Date: Sat, 25 Dec 2021 18:20:21 +0100 Subject: [PATCH] define target_clones attribute only for glibc --- - src/common/darktable.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/common/darktable.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/darktable.h b/src/common/darktable.h -index 3267cfed3..03f17f0ee 100644 +index b841bf2bc..1b9b01d4e 100644 --- a/src/common/darktable.h +++ b/src/common/darktable.h -@@ -126,9 +126,9 @@ typedef unsigned int u_int; +@@ -127,14 +127,15 @@ typedef unsigned int u_int; /* Create cloned functions for various CPU SSE generations */ /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */ /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */ --#if __has_attribute(target_clones) && !defined(_WIN32) && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)) -+#if __has_attribute(target_clones) && !defined(_WIN32) && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)) && defined(__GLIBC__) +-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) ++#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && defined(__GLIBC__) + # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4"))) --#elif __has_attribute(target_clones) && !defined(_WIN32) && defined(__PPC64__) -+#elif __has_attribute(target_clones) && !defined(_WIN32) && defined(__PPC64__) && defined(__GLIBC__) + # elif defined(__PPC64__) /* __PPC64__ is the only macro tested for in is_supported_platform.h, other macros would fail there anyway. */ #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default","cpu=power9"))) - #else + # endif +-#else ++#endif ++#ifndef __DT_CLONE_TARGETS__ + #define __DT_CLONE_TARGETS__ + #endif + -- -2.32.0 +2.34.1 diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index f18f5f123b7eaf..2951cfda3560f5 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,7 +1,7 @@ # Template file for 'darktable' pkgname=darktable -version=3.6.0 -revision=2 +version=3.8.0 +revision=1 # upstream only supports these archs: archs="x86_64* aarch64* ppc64le*" build_style=cmake @@ -11,7 +11,7 @@ configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON 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 + lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel $(vopt_if gmic gmic-devel)" @@ -22,7 +22,7 @@ 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=86bcd0184af38b93c3688dffd3d5c19cc65f268ecf9358d649fa11fe26c70a39 +checksum=2e65c7c78d074ad218e3ef7a8c3051a8ea78f4a0406386667859645e5e4bf705 build_options="gmic"