Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages /
darktable
Commits:
20e5c96e by Andreas Radke at 2025-11-06T16:36:41+01:00
upgpkg: 2:5.2.1-4; icu 78 rebuild; fix build with recent clang
- - - - -
4 changed files:
- .SRCINFO
- + 0001-Fix-build-with-clang-21.patch
- PKGBUILD
- REUSE.toml
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = darktable
pkgdesc = Utility to organize and develop raw images
pkgver = 5.2.1
- pkgrel = 3
+ pkgrel = 4
epoch = 2
url = https://darktable.org
arch = x86_64
@@ -42,9 +42,11 @@ pkgbase = darktable
optdepends = gnuplot: noise profile script
source =
https://github.com/darktable-org/darktable/releases/download/release-5.2.1/darktable-5.2.1.tar.xz
source =
https://github.com/darktable-org/darktable/releases/download/release-5.2.1/darktable-5.2.1.tar.xz.asc
+ source = 0001-Fix-build-with-clang-21.patch
validpgpkeys = C4CBC150699956E2A3268EF5BB5CC8295B1779C9
validpgpkeys = F10F9686652B0E949FCD94C318DCA123F949BD3B
sha256sums =
02f1aa9ae93949e7bc54c34eeb5ff92c2b87f95d2547865df55c60467564ee11
sha256sums = SKIP
+ sha256sums =
ff199cbd3964a109b76d029ca46d52aecda7f67cfcfde8c00099f7931c1b75ae
pkgname = darktable
=====================================
0001-Fix-build-with-clang-21.patch
=====================================
@@ -0,0 +1,35 @@
+From 3edee833b9524c216c9a88580898595eded5c675 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <[email protected]>
+Date: Thu, 3 Jul 2025 05:45:50 +0000
+Subject: [PATCH] Fix build with clang-21
+
+Error Message:
+
+darktable-5.2.0/data/kernels/soften.cl:33:18: error: use of undeclared
identifier 'read_imagef'
+ 33 | float4 pixel = read_imagef(in, sampleri, (int2)(x, y));
+ | ^~~~~~~~~~~
+
+https://github.com/llvm/llvm-project/commit/c1aebd495be0e468044f716a3a0ff98fccccb2be
+wrapped all the image function declarations in the __IMAGE_SUPPORT__
+macro, so darktable needs to define this macro in order to use these
+functions.
+---
+ data/kernels/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
+index 2e7fd0b309..48771063a3 100644
+--- a/data/kernels/CMakeLists.txt
++++ b/data/kernels/CMakeLists.txt
+@@ -15,7 +15,7 @@ macro (testcompile_opencl_kernel IN)
+
+ add_custom_command(
+ OUTPUT ${TOUCH}
+- COMMAND ${CLANG_OPENCL_COMPILER} -cc1 -cl-std=CL1.2 -isystem
${CLANG_OPENCL_INCLUDE_DIR} -finclude-default-header
-I${CMAKE_CURRENT_SOURCE_DIR} ${IN}
++ COMMAND ${CLANG_OPENCL_COMPILER} -cc1 -cl-std=CL1.2 -isystem
${CLANG_OPENCL_INCLUDE_DIR} -D__IMAGE_SUPPORT__=1 -finclude-default-header
-I${CMAKE_CURRENT_SOURCE_DIR} ${IN}
+ COMMAND ${CMAKE_COMMAND} -E touch ${TOUCH} # will be empty!
+ DEPENDS ${IN}
+ COMMENT "Test-compiling OpenCL program ${KERNAME}"
+--
+2.49.0
+
=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@
pkgname=darktable
epoch=2
pkgver=5.2.1
-pkgrel=3
+pkgrel=4
pkgdesc='Utility to organize and develop raw images'
arch=(x86_64)
url='https://darktable.org'
@@ -49,12 +49,19 @@ makedepends=(clang
portmidi
python-jsonschema)
_archive="$pkgname-$pkgver"
-source=("$_url/releases/download/release-$pkgver/$_archive.tar.xz"{,.asc})
+source=("$_url/releases/download/release-$pkgver/$_archive.tar.xz"{,.asc}
+ 0001-Fix-build-with-clang-21.patch )
sha256sums=('02f1aa9ae93949e7bc54c34eeb5ff92c2b87f95d2547865df55c60467564ee11'
- 'SKIP')
+ 'SKIP'
+ 'ff199cbd3964a109b76d029ca46d52aecda7f67cfcfde8c00099f7931c1b75ae')
validpgpkeys=(C4CBC150699956E2A3268EF5BB5CC8295B1779C9 # darktable releases
<[email protected]>
F10F9686652B0E949FCD94C318DCA123F949BD3B) # Pascal Obry
<[email protected]>
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../0001-Fix-build-with-clang-21.patch
+}
+
build() {
cmake -B build -S "$_archive" \
-D CMAKE_INSTALL_PREFIX=/usr \
=====================================
REUSE.toml
=====================================
@@ -24,6 +24,7 @@ SPDX-License-Identifier = "0BSD"
[[annotations]]
path = [
"libavif-1.patch",
+ "0001-Fix-build-with-clang-21.patch",
]
SPDX-FileCopyrightText = "darktable contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/darktable/-/commit/20e5c96e6f713e50614987da9a28017ae3172146
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/darktable/-/commit/20e5c96e6f713e50614987da9a28017ae3172146
You're receiving this email because of your account on gitlab.archlinux.org.
