From 8e0e45e11ece197d29554fb5a234006cb1c36439d3461cd2a436466a89109f22 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 24 Dec 2021 21:51:04 +0000 Subject: [PATCH] - Add https://github.com/darktable-org/darktable/pull/10678.patch to fix build on aarch64 - Lua fixes for deb OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=30 --- 10678.patch | 23 +++++++++++++++++++++++ darktable.changes | 6 ++++++ darktable.dsc | 2 +- darktable.spec | 1 + debian.tar.xz | 4 ++-- 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 10678.patch diff --git a/10678.patch b/10678.patch new file mode 100644 index 0000000..0dc3927 --- /dev/null +++ b/10678.patch @@ -0,0 +1,23 @@ +From 8c89be79f64883e4551db5aa51726b21a62a07e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Fri, 24 Dec 2021 15:42:17 -0500 +Subject: [PATCH] __DT_CLONE_TARGETS__ was undefined on aarch64 + +- it's probably broken on armv7 too and other non intel arch +--- + src/common/darktable.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/common/darktable.h b/src/common/darktable.h +index b841bf2bc15..aad6169f8b6 100644 +--- a/src/common/darktable.h ++++ b/src/common/darktable.h +@@ -133,6 +133,8 @@ typedef unsigned int u_int; + # elif defined(__PPC64__) + /* __PPC64__ is the only macro tested for in is_supported_platform.h, other macros would fail there anyway. */ + #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default","cpu=power9"))) ++# else ++#define __DT_CLONE_TARGETS__ + # endif + #else + #define __DT_CLONE_TARGETS__ diff --git a/darktable.changes b/darktable.changes index f61f7ba..d651a17 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 24 21:47:56 UTC 2021 - Andreas Schneider + +- Add https://github.com/darktable-org/darktable/pull/10678.patch + to fix build on aarch64 + ------------------------------------------------------------------- Fri Dec 24 17:10:20 UTC 2021 - Andreas Schneider diff --git a/darktable.dsc b/darktable.dsc index 2bedd6b..36a38ce 100644 --- a/darktable.dsc +++ b/darktable.dsc @@ -26,7 +26,7 @@ Build-Depends: cmake, libjson-glib-dev, liblcms2-dev, liblensfun-dev, - liblua5.3-dev, + liblua5.4-dev | liblua5.3-dev, libopenexr-dev, libopenjp2-7-dev, libosmgpsmap-1.0-dev, diff --git a/darktable.spec b/darktable.spec index 43b1fb4..f97d09b 100644 --- a/darktable.spec +++ b/darktable.spec @@ -117,6 +117,7 @@ Source98: debian.tar.xz Source99: README.openSUSE # Patch0: darktable-old-glib.patch +Patch1: https://github.com/darktable-org/darktable/pull/10678.patch # ExclusiveArch: x86_64 aarch64 ppc64le # build time tools diff --git a/debian.tar.xz b/debian.tar.xz index fd1d3b4..95fc26b 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8f696dae790b522e63db2a84133cf7b471c7f94f93de5829610cc6a676a3a61 -size 21192 +oid sha256:2ea87fa7f812d8ce2c95c9407d2e9d65aa00e886b36279abe47d1a9ad847e570 +size 21356