[bug#67719] [PATCH 0/3] GMIC, Darktable updates

[bug#67719] [PATCH 0/3] GMIC, Darktable updates

[Vinicius Monego]

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

[bug#67719] [PATCH 1/3] gnu: gmic: Update to 3.3.2.

[Vinicius Monego]

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

[bug#67719] [PATCH 2/3] gnu: darktable: Build with GCC again.

[Vinicius Monego]

* 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

[bug#67719] [PATCH 3/3] gnu: darktable: Enable more optional features.

[Vinicius Monego]

* 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