[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: gnu: darktable: Add dependency on GMIC and OpenCL headers.
From: |
guix-commits |
Subject: |
05/08: gnu: darktable: Add dependency on GMIC and OpenCL headers. |
Date: |
Mon, 29 Jun 2020 18:19:17 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 172ca314c3ad866b6dcb0896ef1a0b0b1e558ea0
Author: Vinicius Monego <monego@posteo.net>
AuthorDate: Fri Jun 26 17:39:04 2020 -0300
gnu: darktable: Add dependency on GMIC and OpenCL headers.
* gnu/packages/photo.scm (darktable)[arguments]: Fix opencl-c.h path.
[native-inputs]: Add opencl-headers, make LLVM version specific.
[inputs]: Add gmic.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/photo.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 75bbc45..09767f4 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -55,6 +55,7 @@
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
+ #:use-module (gnu packages image-processing)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages libcanberra)
@@ -63,6 +64,7 @@
#:use-module (gnu packages lua)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
+ #:use-module (gnu packages opencl)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
@@ -480,7 +482,13 @@ photographic equipment.")
(modify-phases %standard-phases
(add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys)
- (setenv "CC" "clang") (setenv "CXX" "clang++")))
+ (setenv "CC" "clang") (setenv "CXX" "clang++")
+ ;; Darktable looks for opencl-c.h in the LLVM dir. Guix installs
+ ;; it to the Clang dir. We fix this by patching CMakeLists.txt.
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{LLVM_INSTALL_PREFIX\\}")
+ (assoc-ref %build-inputs "clang")))
+ #t))
(add-before 'configure 'set-LDFLAGS-and-CPATH
(lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "LDFLAGS"
@@ -508,7 +516,8 @@ photographic equipment.")
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
- ("llvm" ,llvm)
+ ("llvm" ,llvm-9) ;should match the Clang version
+ ("opencl-headers" ,opencl-headers)
("perl" ,perl)
("pkg-config" ,pkg-config)
("po4a" ,po4a)))
@@ -520,6 +529,7 @@ photographic equipment.")
("dbus-glib" ,dbus-glib)
("exiv2" ,exiv2)
("freeimage" ,freeimage)
+ ("gmic" ,gmic)
("graphicsmagick" ,graphicsmagick)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
@@ -539,7 +549,7 @@ photographic equipment.")
("libwebp" ,libwebp)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
- ("lua" ,lua)
+ ("lua" ,lua) ;for plugins
("openexr" ,openexr)
("openjpeg" ,openjpeg)
("osm-gps-map" ,osm-gps-map)
- branch master updated (3e51f9e -> d2fde34), guix-commits, 2020/06/29
- 01/08: build-system/r: bioconductor-uri: Fix archive URL., guix-commits, 2020/06/29
- 02/08: pack: Dereference symlinks when looking for executables., guix-commits, 2020/06/29
- 04/08: gnu: python-imageio: Update home-page, synopsis and description., guix-commits, 2020/06/29
- 08/08: lint: Adjust 'swh-error exception handler., guix-commits, 2020/06/29
- 03/08: gnu: gcc-toolchain: Remove "glibc:debug" and "glibc:static" from "out"., guix-commits, 2020/06/29
- 06/08: gnu: geeqie: Update to 1.5., guix-commits, 2020/06/29
- 07/08: swh: Adjust for Guile-JSON 4.0 null handling., guix-commits, 2020/06/29
- 05/08: gnu: darktable: Add dependency on GMIC and OpenCL headers.,
guix-commits <=