Accepting request 862411 from graphics:darktable

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/862411
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=91
This commit is contained in:
Dominique Leuenberger 2021-01-13 17:19:34 +00:00 committed by Git OBS Bridge
commit 2d7299cd9e
6 changed files with 45 additions and 8 deletions

View File

@ -0,0 +1,30 @@
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"

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fee58bd23441f9a5f8b7b5028caeedf169cf8819c231608bb3b14dfdae7d8b93
size 16309424
oid sha256:ca1405f56cdff29dbca860fd031b02d1b3bcc9dabe1604b44ac16a80bcd75e64
size 16307772

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e25bafd98847a2a4c941936480684daa1102cb185682294b73ea0e7c565ddc7
size 16370984
oid sha256:0b9fddcdd9244456d391f798ec5c27a57e2f34e3eb4ea2ef9bcf110e4f4a06a0
size 16358723

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59ed50056b933439a48bc77af6b6eacfb957e4d426f303cb79a76f16362434e4
size 16303184
oid sha256:0e4bab204afcb77be5ebe844e114e513b308213b3c5647b634c78b35e5d05048
size 16300682

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 4 15:34:46 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>
- Added d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6.patch
* Fix building on aarch64
-------------------------------------------------------------------
Thu Dec 24 08:00:00 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package darktable
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -106,7 +106,8 @@ Source98: debian.tar.xz
Source99: README.openSUSE
#
Patch0: darktable-old-glib.patch
Patch1: https://github.com/darktable-org/darktable/commit/d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6.patch
#
ExclusiveArch: x86_64 aarch64 ppc64le
# build time tools
BuildRequires: clang