From 8eac8f25226254102aed8d62e9fe388b85bdc524 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Jun 2021 12:51:24 +0200 Subject: [PATCH 1/2] exiv2: update to 0.27.4. --- srcpkgs/exiv2/template | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template index 65baaf1938ccb7..c1531dc934a626 100644 --- a/srcpkgs/exiv2/template +++ b/srcpkgs/exiv2/template @@ -1,25 +1,17 @@ # Template file for 'exiv2' pkgname=exiv2 -version=0.27.3 +version=0.27.4 revision=1 wrksrc="exiv2-${version}-Source" build_style=cmake -configure_args="-DEXIV2_BUILD_SAMPLES=OFF" +configure_args="-DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BMFF=ON" makedepends="zlib-devel expat-devel" short_desc="Image metadata manipulation" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.exiv2.org" distfiles="https://www.exiv2.org/builds/exiv2-${version}-Source.tar.gz" -checksum=a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778 - -pre_configure() { - case "$XBPS_TARGET_ARCH" in - "x86_64*") ;; - "i686*") ;; - *) vsed -i cmake/compilerFlags.cmake -e 's/-fcf-protection//' ;; - esac -} +checksum=84366dba7c162af9a7603bcd6c16f40fe0e9af294ba2fd2f66ffffb9fbec904e exiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" From e0f4168fc7c8dea9eaa0850e0e50d95e4dba62aa Mon Sep 17 00:00:00 2001 From: lemmi Date: Mon, 5 Jul 2021 00:50:29 +0200 Subject: [PATCH 2/2] darktable: update to 3.6.0. --- ...rget_clones-attribute-only-for-glibc.patch | 28 +++++++++++++++++++ ...01-only-use-target_clones-with-glibc.patch | 25 ----------------- srcpkgs/darktable/template | 4 +-- 3 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch delete mode 100644 srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch 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 new file mode 100644 index 00000000000000..8137cd133788d8 --- /dev/null +++ b/srcpkgs/darktable/patches/0001-define-target_clones-attribute-only-for-glibc.patch @@ -0,0 +1,28 @@ +From d61f3f153f8db2c991c09a3d2bd5ac9af69ce614 Mon Sep 17 00:00:00 2001 +From: lemmi +Date: Mon, 5 Jul 2021 02:31:17 +0200 +Subject: [PATCH] define target_clones attribute only for glibc + +--- + src/common/darktable.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/common/darktable.h b/src/common/darktable.h +index 3267cfed3..03f17f0ee 100644 +--- a/src/common/darktable.h ++++ b/src/common/darktable.h +@@ -126,9 +126,9 @@ 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__) + #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 +-- +2.32.0 + 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 deleted file mode 100644 index 32fc760a2fcab9..00000000000000 --- a/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 17a2b728e834ae046d6ba4a9e37868f2476be3ab Mon Sep 17 00:00:00 2001 -From: lemmi -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 ---- a/src/common/darktable.h -+++ b/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/template b/srcpkgs/darktable/template index 24f17d36dda88a..8be87e88887216 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,6 +1,6 @@ # Template file for 'darktable' pkgname=darktable -version=3.4.1 +version=3.6.0 revision=1 # upstream only supports these archs: archs="x86_64* aarch64* ppc64le*" @@ -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=7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e +checksum=86bcd0184af38b93c3688dffd3d5c19cc65f268ecf9358d649fa11fe26c70a39 build_options="gmic"