Skip to content

Commit

Permalink
darktable: upgrade to 4.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cthbleachbit committed Jul 13, 2023
1 parent b74e9a7 commit d6b16c3
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
From 993e9ee531fb4edd2dd486ee3c4590bd477d84db Mon Sep 17 00:00:00 2001
From 457673302fc75fc6dba78c8a4a18b87e25e6f462 Mon Sep 17 00:00:00 2001
From: Tianhao Chai <[email protected]>
Date: Tue, 20 Dec 2022 01:01:11 -0500
Subject: [PATCH 1/2] common/guided_filter: remove broken ifdefs on ppc
Subject: [PATCH] common/guided_filter: remove broken ifdefs on ppc

---
src/common/guided_filter.h | 4 ----
1 file changed, 4 deletions(-)
src/common/sse.h | 4 +++-
src/tests/integration | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h
index 316a8f8bf7..23b99a3a58 100644
--- a/src/common/guided_filter.h
+++ b/src/common/guided_filter.h
@@ -23,12 +23,8 @@
#ifdef NO_WARN_X86_INTRINSICS
#include <xmmintrin.h>
#else
-#define NO_WARN_X86_INTRINSICS 1
diff --git a/src/common/sse.h b/src/common/sse.h
index f7609add9a..45d9c8e461 100644
--- a/src/common/sse.h
+++ b/src/common/sse.h
@@ -17,7 +17,9 @@
#include "common/darktable.h"

#ifdef __SSE__
-
+#ifdef __PPC64__
+#define NO_WARN_X86_INTRINSICS 1
+#endif
#include <xmmintrin.h>
-#undef NO_WARN_X86_INTRINSICS
#endif // NO_WARN_X86_INTRINSICS
-#else
-#include <xmmintrin.h>
#endif // __PPC64__
#endif


--
2.38.1
2.39.1

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From e415ac7c4280ed7046476548a3fe01f0cb645dca Mon Sep 17 00:00:00 2001
From 913ccb6e186a412c75dc27cf3d1a3365479fd1b2 Mon Sep 17 00:00:00 2001
From: Tianhao Chai <[email protected]>
Date: Tue, 20 Dec 2022 01:04:49 -0500
Subject: [PATCH 2/2] fix building for mips64
Subject: [PATCH] fix building for mips64

---
src/is_supported_platform.h | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/is_supported_platform.h b/src/is_supported_platform.h
index cf904e325f..96f193332c 100644
index 03a77f704d..9d418d3c5f 100644
--- a/src/is_supported_platform.h
+++ b/src/is_supported_platform.h
@@ -36,6 +36,12 @@
Expand Down Expand Up @@ -45,5 +45,5 @@ index cf904e325f..96f193332c 100644
#undef DT_SUPPORTED_X86

--
2.38.1
2.39.1

4 changes: 2 additions & 2 deletions app-creativity/darktable/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VER=4.2.1
VER=4.4.1
SRCS="tbl::https://github.com/darktable-org/darktable/releases/download/release-$VER/darktable-$VER.tar.xz"
CHKSUMS="sha256::603a39c6074291a601f7feb16ebb453fd0c5b02a6f5d3c7ab6db612eadc97bac"
CHKSUMS="sha256::e043d38d2e8adb67af7690b12b535a40e8ec7bea05cfa8684db8b21a626e0f0d"
CHKUPDATE="anitya::id=392"

0 comments on commit d6b16c3

Please sign in to comment.