diff --git a/7428.patch b/7428.patch new file mode 100644 index 0000000..2e13ad8 --- /dev/null +++ b/7428.patch @@ -0,0 +1,30 @@ +From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001 +From: Pascal Obry +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 +@@ -29,6 +30,7 @@ + #else + #include + #endif // __PPC64__ ++#endif + + #include "common/darktable.h" + #include "common/opencl.h" diff --git a/darktable.spec b/darktable.spec index efe4f6a..b3ae329 100644 --- a/darktable.spec +++ b/darktable.spec @@ -24,6 +24,8 @@ URL: http://www.darktable.org/ Source0: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{name}-%{version}.tar.xz Patch0: appdata-file.patch +# Patch1: 7428.ptach to be removed in 3.4.1 version https://github.com/darktable-org/darktable/issues/7428 +Patch1: 7428.patch BuildRequires: cairo-devel BuildRequires: clang >= 3.9 @@ -106,7 +108,7 @@ Provides: bundled(lua) # uses xmmintrin.h %if (0%{?fedora} || 0%{?el7}) -ExclusiveArch: x86_64 aarch64 ppc64le +ExclusiveArch: x86_64 aarch64 %endif # dependency colord-gtk-devel is not availble on EL8 aarch64 @@ -257,6 +259,8 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable - 3.4.0 release - added >= 0.8.2 requirement to libavif - removed 6594.patch 0001.patch +- added 7428.patch +- removed ppc64le on Fedora and EPEL 7. Read https://bugzilla.redhat.com/show_bug.cgi?id=1910792 * Wed Dec 09 2020 Robert-André Mauchin - 3.2.1-10 - Rebuild for new libavif 0.8.4