[PR PATCH] darktable: update to 3.8.0.

[PR PATCH] darktable: update to 3.8.0.

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

There is a new pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages darktable-3.8
https://github.com/void-linux/void-packages/pull/34694

darktable: update to 3.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/34694.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-darktable-3.8-34694.patch --]
[-- Type: text/x-diff, Size: 4460 bytes --]

From 7bc38b59f13faac0f513071e2a7998db1dcb52d8 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 25 Dec 2021 18:53:24 +0100
Subject: [PATCH] darktable: update to 3.8.0.

---
 ...rget_clones-attribute-only-for-glibc.patch | 25 ++++++++-----------
 srcpkgs/darktable/template                    |  8 +++---
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch b/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch
index 8137cd133788..9ba81b0d9067 100644
--- a/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch
+++ b/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch
@@ -1,28 +1,25 @@
-From d61f3f153f8db2c991c09a3d2bd5ac9af69ce614 Mon Sep 17 00:00:00 2001
+From d4560c20044a9d187b0f8c558b3a65945fbc5a27 Mon Sep 17 00:00:00 2001
 From: lemmi <lemmi@nerd2nerd.org>
-Date: Mon, 5 Jul 2021 02:31:17 +0200
+Date: Sat, 25 Dec 2021 18:20:21 +0100
 Subject: [PATCH] define target_clones attribute only for glibc
 
 ---
- src/common/darktable.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/common/darktable.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/common/darktable.h b/src/common/darktable.h
-index 3267cfed3..03f17f0ee 100644
+index b841bf2bc..7894badab 100644
 --- a/src/common/darktable.h
 +++ b/src/common/darktable.h
-@@ -126,9 +126,9 @@ typedef unsigned int u_int;
+@@ -127,7 +127,7 @@ typedef unsigned int u_int;
  /* Create cloned functions for various CPU SSE generations */
  /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */
  /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */
--#if __has_attribute(target_clones) && !defined(_WIN32) && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64))
-+#if __has_attribute(target_clones) && !defined(_WIN32) && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)) && defined(__GLIBC__)
+-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH)
++#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && defined(__GLIBC__)
+ # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
  #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4")))
--#elif __has_attribute(target_clones) && !defined(_WIN32) && defined(__PPC64__)
-+#elif __has_attribute(target_clones) && !defined(_WIN32) && defined(__PPC64__) && defined(__GLIBC__)
- /* __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
+ # elif defined(__PPC64__)
 -- 
-2.32.0
+2.34.1
 
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..2951cfda3560 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=3.6.0
-revision=2
+version=3.8.0
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
@@ -11,7 +11,7 @@ configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON
 hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
 makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
  dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
- lensfun-devel sqlite-devel librsvg-devel lua53-devel json-glib-devel
+ lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
  libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
  libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
  $(vopt_if gmic gmic-devel)"
@@ -22,7 +22,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.darktable.org/"
 changelog="https://github.com/darktable-org/darktable/releases"
 distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=86bcd0184af38b93c3688dffd3d5c19cc65f268ecf9358d649fa11fe26c70a39
+checksum=2e65c7c78d074ad218e3ef7a8c3051a8ea78f4a0406386667859645e5e4bf705
 
 build_options="gmic"
 

Re: darktable: update to 3.8.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34694#issuecomment-1001097631

Comment:
```
 In file included from /builddir/darktable-3.8.0/src/common/dwt.c:20:
/builddir/darktable-3.8.0/src/common/imagebuf.h:59:21: error: expected ';' before 'static'
   59 | __DT_CLONE_TARGETS__
      |                     ^
      |                     ;
   60 | static inline void dt_simd_memcpy(const float *const __restrict__ in,
      | ~~~~~~               
[289/868] Building C object bin/CMakeFiles/lib_darktable.dir/common/eaw.c.o
```

Something funky in aarch64 specific code.

Re: [PR PATCH] [Updated] darktable: update to 3.8.0.

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

There is an updated pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages darktable-3.8
https://github.com/void-linux/void-packages/pull/34694

darktable: update to 3.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/34694.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-darktable-3.8-34694.patch --]
[-- Type: text/x-diff, Size: 4567 bytes --]

From bbdf969f7b79ba4863b1138d355f968797e8e993 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 25 Dec 2021 18:53:24 +0100
Subject: [PATCH] darktable: update to 3.8.0.

---
 ...rget_clones-attribute-only-for-glibc.patch | 30 +++++++++++--------
 srcpkgs/darktable/template                    |  8 ++---
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch b/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch
index 8137cd133788..b16a7a3457e8 100644
--- a/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch
+++ b/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch
@@ -1,28 +1,34 @@
-From d61f3f153f8db2c991c09a3d2bd5ac9af69ce614 Mon Sep 17 00:00:00 2001
+From 305f9110e1d63bfa33064d5c92490c442b27c8bf Mon Sep 17 00:00:00 2001
 From: lemmi <lemmi@nerd2nerd.org>
-Date: Mon, 5 Jul 2021 02:31:17 +0200
+Date: Sat, 25 Dec 2021 18:20:21 +0100
 Subject: [PATCH] define target_clones attribute only for glibc
 
 ---
- src/common/darktable.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/common/darktable.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/common/darktable.h b/src/common/darktable.h
-index 3267cfed3..03f17f0ee 100644
+index b841bf2bc..1b9b01d4e 100644
 --- a/src/common/darktable.h
 +++ b/src/common/darktable.h
-@@ -126,9 +126,9 @@ typedef unsigned int u_int;
+@@ -127,14 +127,15 @@ typedef unsigned int u_int;
  /* Create cloned functions for various CPU SSE generations */
  /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */
  /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */
--#if __has_attribute(target_clones) && !defined(_WIN32) && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64))
-+#if __has_attribute(target_clones) && !defined(_WIN32) && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)) && defined(__GLIBC__)
+-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH)
++#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && defined(__GLIBC__)
+ # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
  #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4")))
--#elif __has_attribute(target_clones) && !defined(_WIN32) && defined(__PPC64__)
-+#elif __has_attribute(target_clones) && !defined(_WIN32) && defined(__PPC64__) && defined(__GLIBC__)
+ # 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
+ # endif
+-#else
++#endif
++#ifndef __DT_CLONE_TARGETS__
+ #define __DT_CLONE_TARGETS__
+ #endif
+ 
 -- 
-2.32.0
+2.34.1
 
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..2951cfda3560 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=3.6.0
-revision=2
+version=3.8.0
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
@@ -11,7 +11,7 @@ configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON
 hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
 makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
  dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
- lensfun-devel sqlite-devel librsvg-devel lua53-devel json-glib-devel
+ lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
  libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
  libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
  $(vopt_if gmic gmic-devel)"
@@ -22,7 +22,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.darktable.org/"
 changelog="https://github.com/darktable-org/darktable/releases"
 distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=86bcd0184af38b93c3688dffd3d5c19cc65f268ecf9358d649fa11fe26c70a39
+checksum=2e65c7c78d074ad218e3ef7a8c3051a8ea78f4a0406386667859645e5e4bf705
 
 build_options="gmic"
 

Re: darktable: update to 3.8.0.

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/34694#issuecomment-1001144978

Comment:
Yeah. My patch didn't catch `aarch64` at all, so `__DT_CLONE_TARGETS__` was undefined. 

Re: [PR PATCH] [Merged]: darktable: update to 3.8.0.

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 924 bytes --]

There's a merged pull request on the void-packages repository

darktable: update to 3.8.0.
https://github.com/void-linux/void-packages/pull/34694

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)