From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0DF401382C5 for ; Mon, 28 Dec 2020 14:35:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA480E0C89; Mon, 28 Dec 2020 14:34:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9DDD2E0C89 for ; Mon, 28 Dec 2020 14:34:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19466341341 for ; Mon, 28 Dec 2020 14:34:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D358CC for ; Mon, 28 Dec 2020 14:34:56 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1609166087.09d92df170e7e302400cee44c131de7fe0f9eb73.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-3.4.0-r1.ebuild media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch X-VCS-Directories: media-gfx/darktable/files/ media-gfx/darktable/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 09d92df170e7e302400cee44c131de7fe0f9eb73 X-VCS-Branch: master Date: Mon, 28 Dec 2020 14:34:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 60798524-47aa-4649-8b6a-30a7dc14c569 X-Archives-Hash: d17b4acf11e5ea4877e0ddee0cfc8dd7 commit: 09d92df170e7e302400cee44c131de7fe0f9eb73 Author: Marek Szuba gentoo org> AuthorDate: Mon Dec 28 14:33:13 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Dec 28 14:34:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d92df1 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 gentoo.org> media-gfx/darktable/darktable-3.4.0-r1.ebuild | 2 ++ .../files/darktable-3.4.0-xmmintrin-sse-only.patch | 30 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild index 8405fd12551..cb8b5d62769 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 00000000000..2e13ad859c8 --- /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 +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"