Subject: bug#42807: closed (Re: [bug#42807] [PATCH v2 1/2] gnu: darktable: Update to 3.2.1.)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 04 Sep 2020 09:07:02 +0000

Your bug report

#42807: [PATCH 1/2] gnu: darktable: Update to 3.2.1.

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].

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

Subject: Re: [bug#42807] [PATCH v2 1/2] gnu: darktable: Update to 3.2.1.
From: Ludovic Courtès <[email-masked]>
To: Vinicius Monego <[email-masked]>
Cc: [email-masked]
Date: Fri, 04 Sep 2020 11:06:14 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Vinicius Monego <[email-masked]> skribis:

> * gnu/packages/photo.scm (darktable): Update to 3.2.1.

[...]

> * gnu/packages/photo.scm (darktable)[inputs]: Add libavif, ocl-icd.
> [arguments]: Set LD_LIBRARY_PATH for OpenCL.
> [supported-systems]: Remove i686 which is not supported anymore.

Thanks, applied!

> +             (wrap-program (string-append (assoc-ref outputs "out")
> +                                          "/bin/darktable")
> +               ;; For GtkFileChooserDialog.
> +               `("GSETTINGS_SCHEMA_DIR" =
> +                 (,(string-append (assoc-ref inputs "gtk+")
> +                                  "/share/glib-2.0/schemas")))
> +               ;; For libOpenCL.so.
> +               `("LD_LIBRARY_PATH" =
> +                 (,(string-append (assoc-ref inputs "ocl-icd")
> +                                  "/lib"))))

It’s weird that LD_LIBRARY_PATH needs to be specified here.  Isn’t the
binary already linked against libOpenCL?  If so, it should have it in
as NEEDed and its its RUNPATH, no?

Ludo’.

Subject: [PATCH 1/2] gnu: darktable: Update to 3.2.1.
From: Vinicius Monego <[email-masked]>
To: [email-masked]
Cc: Vinicius Monego <[email-masked]>
Date: Mon, 10 Aug 2020 20:23:25 -0300
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/photo.scm (darktable): update to 3.2.1.
---
 gnu/packages/photo.scm | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index abdb751a5a..6be0094a8d 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -465,7 +465,7 @@ photographic equipment.")
 (define-public darktable
   (package
     (name "darktable")
-    (version "3.0.2")
+    (version "3.2.1")
     (source
      (origin
        (method url-fetch)
@@ -473,7 +473,7 @@ photographic equipment.")
              "https://github.com/darktable-org/darktable/releases/"
              "download/release-" version "/darktable-" version ".tar.xz"))
        (sha256
-        (base32 "1yrnkw8c47kmy2x6m1xp69hwyk02xyc8pd9kvcmyj54lzrhzdfka"))))
+        (base32 "035rvqmw386hm0jpi14lf4dnpr5rjkalzjkyprqh42nwi3m86dkf"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; there are no tests
@@ -482,6 +482,7 @@ photographic equipment.")
        (modify-phases %standard-phases
          (add-before 'configure 'prepare-build-environment
            (lambda* (#:key inputs #:allow-other-keys)
+             ;; Build fails with every version of GCC.
              (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.
@@ -524,35 +525,35 @@ photographic equipment.")
     (inputs
      `(("cairo" ,cairo)
        ("colord-gtk" ,colord-gtk)
-       ("cups" ,cups)
+       ("cups" ,cups) ;optional, for printing support
        ("curl" ,curl)
        ("dbus-glib" ,dbus-glib)
        ("exiv2" ,exiv2)
        ("freeimage" ,freeimage)
-       ("gmic" ,gmic)
+       ("gmic" ,gmic) ;optional
        ("graphicsmagick" ,graphicsmagick)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtk+" ,gtk+)
        ("ilmbase" ,ilmbase)
-       ("iso-codes" ,iso-codes)
+       ("iso-codes" ,iso-codes) ;optional
        ("json-glib" ,json-glib)
        ("lcms" ,lcms)
-       ("lensfun" ,lensfun)
-       ("libgphoto2" ,libgphoto2)
+       ("lensfun" ,lensfun) ;optional
+       ("libgphoto2" ,libgphoto2) ;optional
        ("libjpeg" ,libjpeg-turbo)
        ("libomp" ,libomp)
        ("libpng" ,libpng)
        ("librsvg" ,librsvg)
-       ("libsecret" ,libsecret)
-       ("libsoup" ,libsoup)
+       ("libsecret" ,libsecret) ;optional
+       ("libsoup" ,libsoup) ;optional
        ("libtiff" ,libtiff)
-       ("libwebp" ,libwebp)
-       ("libxml2" ,libxml2)
+       ("libwebp" ,libwebp) ;optional, for WebP support
+       ("libxml2" ,libxml2) ;optional, for validation of data/cameras.xml
        ("libxslt" ,libxslt)
-       ("lua" ,lua) ;for plugins
+       ("lua" ,lua) ;optional, for plugins
        ("openexr" ,openexr)
-       ("openjpeg" ,openjpeg)
-       ("osm-gps-map" ,osm-gps-map)
+       ("openjpeg" ,openjpeg) ;optional
+       ("osm-gps-map" ,osm-gps-map) ;optional,
        ("pugixml" ,pugixml)
        ("python-jsonschema" ,python-jsonschema)
        ("sqlite" ,sqlite)))
-- 
2.20.1