| 1 |
commit: 09d92df170e7e302400cee44c131de7fe0f9eb73 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 28 14:33:13 2020 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 14:34:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d92df1 |
| 7 |
|
| 8 |
media-gfx/darktable-3.4.0: fix build failure on non-SSE systems |
| 9 |
|
| 10 |
Backport of the upstream fix which will be included in the next release. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/762202 |
| 13 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 14 |
|
| 15 |
media-gfx/darktable/darktable-3.4.0-r1.ebuild | 2 ++ |
| 16 |
.../files/darktable-3.4.0-xmmintrin-sse-only.patch | 30 ++++++++++++++++++++++ |
| 17 |
2 files changed, 32 insertions(+) |
| 18 |
|
| 19 |
diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild |
| 20 |
index 8405fd12551..cb8b5d62769 100644 |
| 21 |
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild |
| 22 |
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild |
| 23 |
@@ -86,10 +86,12 @@ RDEPEND="${COMMON_DEPEND} |
| 24 |
kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) |
| 25 |
" |
| 26 |
|
| 27 |
+# the xmmintrin patch will no longer be needed come 3.4.1 |
| 28 |
PATCHES=( |
| 29 |
"${FILESDIR}"/"${PN}"-find-opencl-header.patch |
| 30 |
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch |
| 31 |
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch |
| 32 |
+ "${FILESDIR}"/${PN}-3.4.0-xmmintrin-sse-only.patch |
| 33 |
) |
| 34 |
|
| 35 |
S="${WORKDIR}/${P/_/~}" |
| 36 |
|
| 37 |
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 |
| 38 |
new file mode 100644 |
| 39 |
index 00000000000..2e13ad859c8 |
| 40 |
--- /dev/null |
| 41 |
+++ b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch |
| 42 |
@@ -0,0 +1,30 @@ |
| 43 |
+From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001 |
| 44 |
+From: Pascal Obry <pascal@××××.net> |
| 45 |
+Date: Thu, 24 Dec 2020 16:17:19 +0100 |
| 46 |
+Subject: [PATCH] guided_filter: include xmmintrin.h only if SSE defined. |
| 47 |
+ |
| 48 |
+Fixes #7428. |
| 49 |
+--- |
| 50 |
+ src/common/guided_filter.h | 2 ++ |
| 51 |
+ 1 file changed, 2 insertions(+) |
| 52 |
+ |
| 53 |
+diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h |
| 54 |
+index 36be0de04b9..59c8b2af999 100644 |
| 55 |
+--- a/src/common/guided_filter.h |
| 56 |
++++ b/src/common/guided_filter.h |
| 57 |
+@@ -18,6 +18,7 @@ |
| 58 |
+ |
| 59 |
+ #pragma once |
| 60 |
+ |
| 61 |
++#if defined(__SSE__) |
| 62 |
+ #ifdef __PPC64__ |
| 63 |
+ #ifdef NO_WARN_X86_INTRINSICS |
| 64 |
+ #include <xmmintrin.h> |
| 65 |
+@@ -29,6 +30,7 @@ |
| 66 |
+ #else |
| 67 |
+ #include <xmmintrin.h> |
| 68 |
+ #endif // __PPC64__ |
| 69 |
++#endif |
| 70 |
+ |
| 71 |
+ #include "common/darktable.h" |
| 72 |
+ #include "common/opencl.h" |
Archives