[PR PATCH] [no merge] darktable: update to 3.0.0.

[PR PATCH] [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

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

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

[no merge] darktable: update to 3.0.0.
Since this is a rather huge upgrade to darktable and version `3.0.1` is probably not too far out, I'd like to wait until then. So this is PR is more or less a placeholder and the first test if this builds everywhere. 

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

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

From fdb15c605b688d074e0d811ade7c9f0ff03526f4 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 26 Dec 2019 09:24:58 +0100
Subject: [PATCH] darktable: update to 3.0.0.

---
 srcpkgs/darktable/patches/altivec.patch | 37 -------------------------
 srcpkgs/darktable/template              |  6 ++--
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/darktable/patches/altivec.patch

diff --git a/srcpkgs/darktable/patches/altivec.patch b/srcpkgs/darktable/patches/altivec.patch
deleted file mode 100644
index 4bed6ef4b5f..00000000000
--- a/srcpkgs/darktable/patches/altivec.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This fixes compilation on ppc with opencl on. Prevent opencl
-headers from defining keywords as macros which would conflict
-with C++ keywords as well as C99 keyword macro bool.
-
---- src/external/CL/cl_platform.h
-+++ src/external/CL/cl_platform.h
-@@ -275,14 +275,23 @@ typedef unsigned int cl_GLenum;
- 
- /* Define basic vector types */
- #if defined( __VEC__ )
-+   #ifndef __APPLE_ALTIVEC__
-+     /* prevent gcc from defining the keywords as macros
-+      * do not manually undef for c99 stdbool.h compat
-+      */
-+     #define __APPLE_ALTIVEC__ 1
-+     #include <altivec.h>
-+     #undef __APPLE_ALTIVEC__
-+   #else
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   #endif
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f54cbd9e2a0..8e685c4636d 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=2.6.3
-revision=3
+version=3.0.0
+revision=1
 # upstream only supports these archs:
 archs="i686* x86_64* aarch64* ppc64le*"
 build_style=cmake
@@ -22,4 +22,4 @@ 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=a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0
+checksum=7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-569165682

Comment:
Here is a little hack of a patch that may help:
https://termbin.com/85h4

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-569165682

Comment:
Here is a little hack of a patch that may help, it disables the platform check and error if not "supported":
https://termbin.com/85h4

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-569165682

Comment:
Here is a little hack of a patch that may help, it disables the platform check and error if not "supported":
https://termbin.com/85h4

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-569440211

Comment:
Looks like darktable-3.0.0 gets rid of 32bit archs

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-569464592

Comment:
Found out how to build this, so far it is build on aarch64, one is to disable openmp, which during compile it gives something like expect a LOT of functionality to be missing. Second is to remove, "include(ConfigureChecks.cmake) from CMakeLists.txt this will disable platform check

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-571901288

Comment:
I already mentioned this in IRC: I'm not sure I want to keep `32bit` alive for `darktable`. There is a reason upstream drops the support. To be able to do any sort of meaningful work with `darktable` you need ram (and lots of it) and computing power. And you won't get that anymore with `32bit` plattforms.

If there is someone out there depending on `32bit` `darktable`, I'm willing to keep this alive for a bit. Otherwise I'm going with upstream and remove support now as well.

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-571902853

Comment:
Probably just best to go with upstream in reality. Other option, in which I am sure won't be "ok" is to have the old version around for i686 and the new ones excluding i686. Just a thought, sure it won't be a think :)

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-571902853

Comment:
Probably just best to go with upstream in reality. Other option, in which I am sure won't be "ok" is to have the old version around for i686 and the new ones excluding i686. Just a thought, sure it won't be a thing :)

Re: [no merge] darktable: update to 3.0.0.

[voidlinux-github]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-571904584

Comment:
Thought about keeping the old version around for a while anyway since `3.0` has an almost completely new processing pipeline. That way you'd also have a safety net if you wanted to grab something from you archive and it isn't supported anymore for some reason. 

Re: [no merge] darktable: update to 3.0.0.

[TeddyDD]

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

New comment by TeddyDD on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-591032945

Comment:
Any progress on this? I compiled Darktable from this PR and it seems to be working fine.

Re: [no merge] darktable: update to 3.0.0.

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/17787#issuecomment-591050081

Comment:
There was supposed to be a 3.1 relatively soon after the 3.0 release, but given how stable it is for me and apparently for other people as well, I'm thinking about merging this as is (and dropping i686 support). I'll decide this week.

Re: [PR PATCH] [Updated] [no merge] darktable: update to 3.0.0.

[lemmi]

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

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

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

[no merge] darktable: update to 3.0.0.
Since this is a rather huge upgrade to darktable and version `3.0.1` is probably not too far out, I'd like to wait until then. So this is PR is more or less a placeholder and the first test if this builds everywhere. 

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

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

From 041327abae217aa7e52b515a51480363fb7a66aa Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 26 Dec 2019 09:24:58 +0100
Subject: [PATCH] darktable: update to 3.0.2.

---
 srcpkgs/darktable/patches/altivec.patch | 37 -------------------------
 srcpkgs/darktable/template              | 12 ++++----
 2 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/darktable/patches/altivec.patch

diff --git a/srcpkgs/darktable/patches/altivec.patch b/srcpkgs/darktable/patches/altivec.patch
deleted file mode 100644
index 4bed6ef4b5f..00000000000
--- a/srcpkgs/darktable/patches/altivec.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This fixes compilation on ppc with opencl on. Prevent opencl
-headers from defining keywords as macros which would conflict
-with C++ keywords as well as C99 keyword macro bool.
-
---- src/external/CL/cl_platform.h
-+++ src/external/CL/cl_platform.h
-@@ -275,14 +275,23 @@ typedef unsigned int cl_GLenum;
- 
- /* Define basic vector types */
- #if defined( __VEC__ )
-+   #ifndef __APPLE_ALTIVEC__
-+     /* prevent gcc from defining the keywords as macros
-+      * do not manually undef for c99 stdbool.h compat
-+      */
-+     #define __APPLE_ALTIVEC__ 1
-+     #include <altivec.h>
-+     #undef __APPLE_ALTIVEC__
-+   #else
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   #endif
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f54cbd9e2a0..1855ff30ec7 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,9 +1,9 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=2.6.3
-revision=3
+version=3.0.2
+revision=1
 # upstream only supports these archs:
-archs="i686* x86_64* aarch64* ppc64le*"
+archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
 # this makes sure to use -march=generic and -msse3
 configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON
@@ -13,8 +13,8 @@ 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 lua-devel json-glib-devel
  libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
- libsecret-devel pugixml-devel libosmgpsmap-devel flickcurl-devel
- colord-gtk-devel desktop-file-utils"
+ libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
+ desktop-file-utils"
 depends="adwaita-icon-theme"
 short_desc="Virtual lighttable and darkroom for photographers"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -22,4 +22,4 @@ 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=a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0
+checksum=6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb

Re: [PR PATCH] [Updated] [no merge] darktable: update to 3.0.0.

[lemmi]

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

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

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

[no merge] darktable: update to 3.0.0.
Since this is a rather huge upgrade to darktable and version `3.0.1` is probably not too far out, I'd like to wait until then. So this is PR is more or less a placeholder and the first test if this builds everywhere. 

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

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

From 041327abae217aa7e52b515a51480363fb7a66aa Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 26 Dec 2019 09:24:58 +0100
Subject: [PATCH 1/2] darktable: update to 3.0.2.

---
 srcpkgs/darktable/patches/altivec.patch | 37 -------------------------
 srcpkgs/darktable/template              | 12 ++++----
 2 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/darktable/patches/altivec.patch

diff --git a/srcpkgs/darktable/patches/altivec.patch b/srcpkgs/darktable/patches/altivec.patch
deleted file mode 100644
index 4bed6ef4b5f..00000000000
--- a/srcpkgs/darktable/patches/altivec.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This fixes compilation on ppc with opencl on. Prevent opencl
-headers from defining keywords as macros which would conflict
-with C++ keywords as well as C99 keyword macro bool.
-
---- src/external/CL/cl_platform.h
-+++ src/external/CL/cl_platform.h
-@@ -275,14 +275,23 @@ typedef unsigned int cl_GLenum;
- 
- /* Define basic vector types */
- #if defined( __VEC__ )
-+   #ifndef __APPLE_ALTIVEC__
-+     /* prevent gcc from defining the keywords as macros
-+      * do not manually undef for c99 stdbool.h compat
-+      */
-+     #define __APPLE_ALTIVEC__ 1
-+     #include <altivec.h>
-+     #undef __APPLE_ALTIVEC__
-+   #else
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   #endif
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f54cbd9e2a0..1855ff30ec7 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,9 +1,9 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=2.6.3
-revision=3
+version=3.0.2
+revision=1
 # upstream only supports these archs:
-archs="i686* x86_64* aarch64* ppc64le*"
+archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
 # this makes sure to use -march=generic and -msse3
 configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON
@@ -13,8 +13,8 @@ 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 lua-devel json-glib-devel
  libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
- libsecret-devel pugixml-devel libosmgpsmap-devel flickcurl-devel
- colord-gtk-devel desktop-file-utils"
+ libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
+ desktop-file-utils"
 depends="adwaita-icon-theme"
 short_desc="Virtual lighttable and darkroom for photographers"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -22,4 +22,4 @@ 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=a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0
+checksum=6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb

From 958ea329ef93471df0982729bd5cfed5a2acfe7f Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 18 Apr 2020 08:38:37 +0200
Subject: [PATCH 2/2] fixup! darktable: update to 3.0.2.

---
 srcpkgs/darktable/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 1855ff30ec7..bbd5d8853ab 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,3 +23,13 @@ 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=6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb
+
+# Temporarily disable OpenMP for aarch64:
+#
+# see https://github.com/void-linux/void-packages/issues/21105
+
+case $XBPS_TARGET_MACHINE in
+    aarch64*)
+        configure_args+=" -DUSE_OPENMP=OFF"
+        ;;
+esac

Re: [PR PATCH] [Updated] [no merge] darktable: update to 3.0.0.

[lemmi]

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

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

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

[no merge] darktable: update to 3.0.0.
Since this is a rather huge upgrade to darktable and version `3.0.1` is probably not too far out, I'd like to wait until then. So this is PR is more or less a placeholder and the first test if this builds everywhere. 

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

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

From cd3c38a4c523d83b5138b8847c351ada7cf56669 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 26 Dec 2019 09:24:58 +0100
Subject: [PATCH] darktable: update to 3.0.2.

---
 srcpkgs/darktable/patches/altivec.patch | 37 -------------------------
 srcpkgs/darktable/template              | 22 +++++++++++----
 2 files changed, 16 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/darktable/patches/altivec.patch

diff --git a/srcpkgs/darktable/patches/altivec.patch b/srcpkgs/darktable/patches/altivec.patch
deleted file mode 100644
index 4bed6ef4b5f..00000000000
--- a/srcpkgs/darktable/patches/altivec.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This fixes compilation on ppc with opencl on. Prevent opencl
-headers from defining keywords as macros which would conflict
-with C++ keywords as well as C99 keyword macro bool.
-
---- src/external/CL/cl_platform.h
-+++ src/external/CL/cl_platform.h
-@@ -275,14 +275,23 @@ typedef unsigned int cl_GLenum;
- 
- /* Define basic vector types */
- #if defined( __VEC__ )
-+   #ifndef __APPLE_ALTIVEC__
-+     /* prevent gcc from defining the keywords as macros
-+      * do not manually undef for c99 stdbool.h compat
-+      */
-+     #define __APPLE_ALTIVEC__ 1
-+     #include <altivec.h>
-+     #undef __APPLE_ALTIVEC__
-+   #else
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   #endif
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f54cbd9e2a0..5d1246342c6 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,9 +1,9 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=2.6.3
-revision=3
+version=3.0.2
+revision=1
 # upstream only supports these archs:
-archs="i686* x86_64* aarch64* ppc64le*"
+archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
 # this makes sure to use -march=generic and -msse3
 configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON
@@ -13,8 +13,8 @@ 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 lua-devel json-glib-devel
  libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
- libsecret-devel pugixml-devel libosmgpsmap-devel flickcurl-devel
- colord-gtk-devel desktop-file-utils"
+ libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
+ desktop-file-utils"
 depends="adwaita-icon-theme"
 short_desc="Virtual lighttable and darkroom for photographers"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -22,4 +22,14 @@ 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=a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0
+checksum=6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb
+
+# Temporarily disable OpenMP for aarch64:
+#
+# see https://github.com/void-linux/void-packages/issues/21105
+
+case $XBPS_TARGET_MACHINE in
+	aarch64*)
+		configure_args+=" -DUSE_OPENMP=OFF"
+		;;
+esac

Re: [PR PATCH] [Updated] [no merge] darktable: update to 3.0.0.

[lemmi]

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

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

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

[no merge] darktable: update to 3.0.0.
Since this is a rather huge upgrade to darktable and version `3.0.1` is probably not too far out, I'd like to wait until then. So this is PR is more or less a placeholder and the first test if this builds everywhere. 

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

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

From 426a4e13407ab74c7e74870cf44414e1755adf14 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 26 Dec 2019 09:24:58 +0100
Subject: [PATCH] darktable: update to 3.0.2.

---
 ...01-only-use-target_clones-with-glibc.patch | 25 +++++++++++++
 srcpkgs/darktable/patches/altivec.patch       | 37 -------------------
 srcpkgs/darktable/template                    | 22 ++++++++---
 3 files changed, 41 insertions(+), 43 deletions(-)
 create mode 100644 srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch
 delete mode 100644 srcpkgs/darktable/patches/altivec.patch

diff --git a/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch b/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch
new file mode 100644
index 00000000000..22ea16ba9be
--- /dev/null
+++ b/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch
@@ -0,0 +1,25 @@
+From 17a2b728e834ae046d6ba4a9e37868f2476be3ab Mon Sep 17 00:00:00 2001
+From: lemmi <lemmi@nerd2nerd.org>
+Date: Sat, 18 Apr 2020 09:24:45 +0200
+Subject: [PATCH] only use target_clones with glibc
+
+---
+ src/common/darktable.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/common/darktable.h src/common/darktable.h
+index b3ad929..ae871a0 100644
+--- src/common/darktable.h
++++ src/common/darktable.h
+@@ -102,7 +102,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(__SSE__)
++#if __has_attribute(target_clones) && !defined(_WIN32) && defined(__SSE__) && defined(__GLIBC__)
+ #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4")))
+ #else
+ #define __DT_CLONE_TARGETS__
+-- 
+2.26.1
+
diff --git a/srcpkgs/darktable/patches/altivec.patch b/srcpkgs/darktable/patches/altivec.patch
deleted file mode 100644
index 4bed6ef4b5f..00000000000
--- a/srcpkgs/darktable/patches/altivec.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This fixes compilation on ppc with opencl on. Prevent opencl
-headers from defining keywords as macros which would conflict
-with C++ keywords as well as C99 keyword macro bool.
-
---- src/external/CL/cl_platform.h
-+++ src/external/CL/cl_platform.h
-@@ -275,14 +275,23 @@ typedef unsigned int cl_GLenum;
- 
- /* Define basic vector types */
- #if defined( __VEC__ )
-+   #ifndef __APPLE_ALTIVEC__
-+     /* prevent gcc from defining the keywords as macros
-+      * do not manually undef for c99 stdbool.h compat
-+      */
-+     #define __APPLE_ALTIVEC__ 1
-+     #include <altivec.h>
-+     #undef __APPLE_ALTIVEC__
-+   #else
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   #endif
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f54cbd9e2a0..5d1246342c6 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,9 +1,9 @@
 # Template file for 'darktable'
 pkgname=darktable
-version=2.6.3
-revision=3
+version=3.0.2
+revision=1
 # upstream only supports these archs:
-archs="i686* x86_64* aarch64* ppc64le*"
+archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
 # this makes sure to use -march=generic and -msse3
 configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON
@@ -13,8 +13,8 @@ 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 lua-devel json-glib-devel
  libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
- libsecret-devel pugixml-devel libosmgpsmap-devel flickcurl-devel
- colord-gtk-devel desktop-file-utils"
+ libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
+ desktop-file-utils"
 depends="adwaita-icon-theme"
 short_desc="Virtual lighttable and darkroom for photographers"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -22,4 +22,14 @@ 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=a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0
+checksum=6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb
+
+# Temporarily disable OpenMP for aarch64:
+#
+# see https://github.com/void-linux/void-packages/issues/21105
+
+case $XBPS_TARGET_MACHINE in
+	aarch64*)
+		configure_args+=" -DUSE_OPENMP=OFF"
+		;;
+esac

Re: [PR PATCH] [Closed]: [no merge] darktable: update to 3.0.0.

[lemmi]

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

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

[no merge] darktable: update to 3.0.0.
https://github.com/void-linux/void-packages/pull/17787

Description:
Since this is a rather huge upgrade to darktable and version `3.0.1` is probably not too far out, I'd like to wait until then. So this is PR is more or less a placeholder and the first test if this builds everywhere.