From fdb15c605b688d074e0d811ade7c9f0ff03526f4 Mon Sep 17 00:00:00 2001 From: lemmi 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 -+ #undef __APPLE_ALTIVEC__ -+ #else - #include /* 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