diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2020-12-28 14:33:13 +0000 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2020-12-28 14:34:47 +0000 |
| commit | 09d92df170e7e302400cee44c131de7fe0f9eb73 (patch) | |
| tree | 4393ababffc36296012b1eb8bfebfbf358e3c488 | |
| parent | net-misc/httpstat: bump to v1.3.1 (diff) | |
| download | gentoo-09d92df1.tar.gz gentoo-09d92df1.tar.bz2 gentoo-09d92df1.zip | |
media-gfx/darktable-3.4.0: fix build failure on non-SSE systems
Backport of the upstream fix which will be included in the next release.
Closes: https://bugs.gentoo.org/762202
Signed-off-by: Marek Szuba <marecki@gentoo.org>
| -rw-r--r-- | media-gfx/darktable/darktable-3.4.0-r1.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch | 30 |
2 files changed, 32 insertions, 0 deletions
diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild index 8405fd125512..cb8b5d62769c 100644 --- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild +++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild @@ -86,10 +86,12 @@ RDEPEND="${COMMON_DEPEND} kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) " +# the xmmintrin patch will no longer be needed come 3.4.1 PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch + "${FILESDIR}"/${PN}-3.4.0-xmmintrin-sse-only.patch ) S="${WORKDIR}/${P/_/~}" diff --git a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch new file mode 100644 index 000000000000..2e13ad859c82 --- /dev/null +++ b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch @@ -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" |