GNU bug report logs - #67719
[PATCH 0/3] GMIC, Darktable updates

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67719 in the body.
You can then email your comments to 67719 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH 0/3] GMIC, Darktable updates
Date: Fri,  8 Dec 2023 22:20:17 +0000

Vinicius Monego (3):
  gnu: gmic: Update to 3.3.2.
  gnu: darktable: Build with GCC again.
  gnu: darktable: Enable more optional features.

 gnu/packages/image-processing.scm | 16 ++--------------
 gnu/packages/photo.scm            | 21 +++++++--------------
 2 files changed, 9 insertions(+), 28 deletions(-)


base-commit: 06f25a9a85be1bbe7a709e58ce41c1a834e5f1ae
-- 
2.39.2

Message #8 received at 67719 <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: 67719 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH 1/3] gnu: gmic: Update to 3.3.2.
Date: Fri,  8 Dec 2023 22:22:05 +0000

gmic was integrated into Krita 5+.

* gnu/packages/image-processing.scm (gmic, gmic-qt): Update to 3.3.2.
gmic-qt-krita: Delete variable.

Change-Id: I44e33b570bcf3e1df3eba5eb9ede1f333f8a177a
---
 gnu/packages/image-processing.scm | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 306da962cc..ca0828c2b1 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -832,14 +832,14 @@ (define-public vips
 (define-public gmic
   (package
     (name "gmic")
-    (version "3.0.0")
+    (version "3.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://gmic.eu/files/source/gmic_"
                            version ".tar.gz"))
        (sha256
-        (base32 "080inz0wisv3rhvbnzrgcs3j25wq86gybp68yi56gw6vwswnn19z"))))
+        (base32 "0s7qcvsi1vjs7631fiw5hhx7y97csm2fhir9xy63fln574isspnr"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ;there are no tests
@@ -900,18 +900,6 @@ (define-public gmic-qt
     (synopsis "Qt frontend for the G'MIC image processing framework")
     (license license:gpl3+)))
 
-(define-public gmic-qt-krita
-  (package
-    (inherit gmic-qt)
-    (name "gmic-qt-krita")
-    (arguments
-     (substitute-keyword-arguments (package-arguments gmic-qt)
-       ((#:configure-flags flags)
-        '(list "-DGMIC_QT_HOST=krita" "-DENABLE_DYNAMIC_LINKING=ON"
-               (string-append "-DGMIC_LIB_PATH="
-                              (assoc-ref %build-inputs "gmic") "/lib")))))
-    (synopsis "Krita plugin for the G'MIC image processing framework")))
-
 (define-public gmic-qt-gimp
   (package
     (inherit gmic-qt)
-- 
2.39.2

Message #11 received at 67719 <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: 67719 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH 2/3] gnu: darktable: Build with GCC again.
Date: Fri,  8 Dec 2023 22:22:06 +0000

* gnu/packages/photo.scm (darktable)[arguments][#:phases]: Delete the
'prepare-build-environment phase.
[native-inputs]: Remove clang. Add gcc-13.

Change-Id: Ia0dc1c6a717ccd00cd31d378aa51ce63fbf1806a
---
 gnu/packages/photo.scm | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 86b7fbd15c..aa857a1d83 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -54,6 +54,7 @@ (define-module (gnu packages photo)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages file)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages geo)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
@@ -553,17 +554,6 @@ (define-public darktable
                  (string-append "\""
                                 (search-input-file inputs "/lib/libOpenCL.so")
                                 "\"")))))
-          (add-before 'configure 'prepare-build-environment
-            (lambda _
-              ;; Rawspeed fails to build with GCC due to OpenMP error:
-              ;; "undefined reference to `GOMP_loop_nonmonotonic_dynamic_next'"
-              (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\\}")
-                 #$(this-package-native-input "clang")))))
           (add-before 'configure 'set-LDFLAGS
             (lambda _
               (setenv "LDFLAGS"
@@ -576,13 +566,13 @@ (define-public darktable
                   (,(string-append #$(this-package-input "gtk+")
                                    "/share/glib-2.0/schemas")))))))))
     (native-inputs
-     (list clang
-           cmocka
+     (list cmocka
            desktop-file-utils
+           gcc-13             ; gcc-11 too old for darktable, 12+ required
            `(,glib "bin")
            gobject-introspection
            intltool
-           llvm                         ;should match the Clang version
+           llvm
            opencl-headers
            perl
            pkg-config
-- 
2.39.2

Message #14 received at 67719 <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: 67719 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH 3/3] gnu: darktable: Enable more optional features.
Date: Fri,  8 Dec 2023 22:22:07 +0000

* gnu/packages/photo.scm (darktable)[inputs]: Add libjxl, portmidi.

Change-Id: I7747dfc2e88379a13182590f87514951bdd70e0c
---
 gnu/packages/photo.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index aa857a1d83..f99223ae6d 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -76,6 +76,7 @@ (define-module (gnu packages photo)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages music)
   #:use-module (gnu packages ocaml)
   #:use-module (gnu packages opencl)
   #:use-module (gnu packages perl)
@@ -600,6 +601,7 @@ (define-public darktable
            libgphoto2                ;optional, for camera tethering
            libavif                   ;optional, for AVIF support
            libjpeg-turbo
+           libjxl                    ;optional, for JPEG-XL support
            libomp
            libpng
            (librsvg-for-system)
@@ -615,6 +617,7 @@ (define-public darktable
            openexr                      ;optional, for EXR import/export
            openjpeg                     ;optional, for JPEG2000 export
            osm-gps-map                  ;optional, for geotagging view
+           portmidi                 ;optional, for hardware MIDI input devices
            pugixml
            python-jsonschema
            sdl2
-- 
2.39.2

Message #19 received at 67719-done <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Alex Devaure <ajadevaure <at> gmail.com>
Cc: guix-devel <at> gnu.org, Vinicius Monego <monego <at> posteo.net>,
 68293-done <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>,
 67719-done <at> debbugs.gnu.org
Subject: Re: update darktable version
Date: Thu, 25 Jan 2024 05:55:37 +0000

Hi Alex,

On Wed, Jan 24, 2024 at 06:15 PM, Alex Devaure wrote:

> Hi Maxim,
>
> Thank you for your answer. I created the issue #68293 and the
> modification is now on master branch.
> Best regards,
> Alex
>

Looks like Vinicius Monego already did the update in
9c67673d7bb9cdc43c1196b075447b57aff74039 after pushing #67719 starting
with 50731875243428cb11cc17fa712fa8079b307622.

However, both issues were left open, so I'm closing both with this message.

Sorry for any duplicated work and thanks both of you for keeping
Darktable up to date and improving it!

John

> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
>> Hi Alex,
>>
>> Alex Devaure <ajadevaure <at> gmail.com> writes:
>>
>>> Hi all,
>>> There is a new version of the RAW developer darktable. The patch #67719
>>> modifies the generation of it by replacing clang with gcc. The patch is
>>> not yet merged, should I base my patch (updating darktable version) to
>>> #67719?
>>
>> That'd be fine, yes.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.