Subject: bug#42067: closed (Re: [bug#42067] [PATCH] gnu: darktable: Add optional dependencies.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 29 Jun 2020 22:00:02 +0000

Your bug report

#42067: [PATCH] gnu: darktable: Add optional dependencies.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
42067: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=42067
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#42067] [PATCH] gnu: darktable: Add optional dependencies.
From: Ludovic Courtès <[email-masked]>
To: Vinicius Monego <[email-masked]>
Cc: [email-masked]
Date: Mon, 29 Jun 2020 23:59:01 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Vinicius Monego <[email-masked]> skribis:

> [arguments]: Fix opencl-c.h path.
> [native-inputs]: Add opencl-headers, make LLVM version specific.
> [inputs]: Add gmic.

I adjusted the commit log and applied the tiny change below.

>           (add-before 'configure 'prepare-build-environment
>             (lambda* (#:key inputs #:allow-other-keys)
> -             (setenv "CC" "clang") (setenv "CXX" "clang++")))
> +             (setenv "CC" "clang") (setenv "CXX" "clang++")

BTW, why are we building with Clang?

Thanks!

Ludo’.

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 5b5e057b65..09767f464e 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -486,8 +486,9 @@ photographic equipment.")
              ;; 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")))))
+               (("\\$\\{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"

Subject: [PATCH] gnu: darktable: Add optional dependencies.
From: Vinicius Monego <[email-masked]>
To: [email-masked]
Cc: Vinicius Monego <[email-masked]>
Date: Fri, 26 Jun 2020 17:39:04 -0300
List-Id: <debbugs-submit.debbugs.gnu.org>

[arguments]: Fix opencl-c.h path.
[native-inputs]: Add opencl-headers, make LLVM version specific.
[inputs]: Add gmic.
---
 gnu/packages/photo.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 75bbc45380..5b5e057b65 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,12 @@ 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")))))
          (add-before 'configure 'set-LDFLAGS-and-CPATH
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (setenv "LDFLAGS"
@@ -508,7 +515,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 +528,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 +548,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)
-- 
2.20.1