aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-12-24 17:19:54 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-12-24 18:12:59 +0000
commita6ab065ba8f9fc271e7c2ae2291215763af4345f (patch)
tree77320b8b01de3337af44d5d32ef41fd540e2bc76
parent733041490b590074cbb73eaff8d382c05909d106 (diff)
downloadaports-a6ab065ba8f9fc271e7c2ae2291215763af4345f.tar.gz
aports-a6ab065ba8f9fc271e7c2ae2291215763af4345f.tar.bz2
aports-a6ab065ba8f9fc271e7c2ae2291215763af4345f.tar.xz
community/darktable: upgrade to 3.4.0
-rw-r--r--community/darktable/APKBUILD8
-rw-r--r--community/darktable/aarch64-include-xmmintrin-if-sse-defined.patch32
2 files changed, 37 insertions, 3 deletions
diff --git a/community/darktable/APKBUILD b/community/darktable/APKBUILD
index ff1c4348fb..d0bb669b29 100644
--- a/community/darktable/APKBUILD
+++ b/community/darktable/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=darktable
-pkgver=3.2.1
+pkgver=3.4.0
pkgrel=0
pkgdesc="an open source photography workflow application and raw developer"
url="https://www.darktable.org/"
@@ -41,6 +41,7 @@ options="!check" # Dependencies missing
source="https://github.com/darktable-org/darktable/releases/download/release-${pkgver/_/}/darktable-${pkgver/_/.}.tar.xz
fix-ifunc-multiarch.patch
fix-cmake-none.patch
+ aarch64-include-xmmintrin-if-sse-defined.patch
"
prepare() {
@@ -64,6 +65,7 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7 darktable-3.2.1.tar.xz
+sha512sums="b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f darktable-3.4.0.tar.xz
bbb665f06b21a75f34a82f26d9e7421281445843b392871d1f851c7b73eabc862bbe43525b669a67429a22fea63bb03ca90b8a1d200d62a52907946ffcd9a7e3 fix-ifunc-multiarch.patch
-74a47de2820e34d5c4ac53adbc557be908f73c06ab7e978429b22a5decb9c974871f5a83a23dd4fe6a7c13bc54de65ef004776efda8aad3f38d27fb35c0bd2c6 fix-cmake-none.patch"
+74a47de2820e34d5c4ac53adbc557be908f73c06ab7e978429b22a5decb9c974871f5a83a23dd4fe6a7c13bc54de65ef004776efda8aad3f38d27fb35c0bd2c6 fix-cmake-none.patch
+b756b9d6c007580b5030c90bc64bbc70154ebabf2d54312a7af61274962cc2d3ec3b8c68def07072e113c492b3caee490dff6021576f1075db654057605e31d1 aarch64-include-xmmintrin-if-sse-defined.patch"
diff --git a/community/darktable/aarch64-include-xmmintrin-if-sse-defined.patch b/community/darktable/aarch64-include-xmmintrin-if-sse-defined.patch
new file mode 100644
index 0000000000..4453dbef71
--- /dev/null
+++ b/community/darktable/aarch64-include-xmmintrin-if-sse-defined.patch
@@ -0,0 +1,32 @@
+Description: Can be removed after 3.4.1
+Upstream: Yes
+From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001
+From: Pascal Obry <pascal@obry.net>
+Date: Thu, 24 Dec 2020 16:17:19 +0100
+Subject: [PATCH] guided_filter: include xmmintrin.h only if SSE defined.
+
+Fixes #7428.
+---
+ src/common/guided_filter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h
+index 36be0de04b9..59c8b2af999 100644
+--- a/src/common/guided_filter.h
++++ b/src/common/guided_filter.h
+@@ -18,6 +18,7 @@
+
+ #pragma once
+
++#if defined(__SSE__)
+ #ifdef __PPC64__
+ #ifdef NO_WARN_X86_INTRINSICS
+ #include <xmmintrin.h>
+@@ -29,6 +30,7 @@
+ #else
+ #include <xmmintrin.h>
+ #endif // __PPC64__
++#endif
+
+ #include "common/darktable.h"
+ #include "common/opencl.h"