[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#52171] [PATCH core-updates-frozen 2/2] gnu: darktable: Build with O

From: Vinicius Monego
Subject: [bug#52171] [PATCH core-updates-frozen 2/2] gnu: darktable: Build with OpenEXR 3.
Date: Sun, 28 Nov 2021 23:51:10 +0000

* gnu/packages/photo.scm (darktable)[arguments]<#:phases>: Rename
'set-LDFLAGS-and-CPATH to 'set-LDFLAGS. Don't set CPATH.
[inputs]: Remove ilmbase. Add imath. Change openxr-2 to openexr.
 gnu/packages/photo.scm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 8a07f32f3c..9b60ec2884 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -504,18 +504,12 @@ photographic equipment.")
              (substitute* "CMakeLists.txt"
                 (assoc-ref %build-inputs "clang")))))
-         (add-before 'configure 'set-LDFLAGS-and-CPATH
+         (add-before 'configure 'set-LDFLAGS
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (setenv "LDFLAGS"
-                      (assoc-ref outputs "out") "/lib/darktable"))
-             ;; Ensure the OpenEXR headers are found.
-             (setenv "CPATH"
-                     (string-append
-                      (search-input-directory inputs "include/OpenEXR")
-                      ":" (or (getenv "CPATH") "")))))
+                      (assoc-ref outputs "out") "/lib/darktable"))))
          (add-after 'install 'wrap-program
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (wrap-program (string-append (assoc-ref outputs "out")
@@ -550,7 +544,7 @@ photographic equipment.")
        ("graphicsmagick" ,graphicsmagick)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtk+" ,gtk+)
-       ("ilmbase" ,ilmbase)
+       ("imath" ,imath)
        ("iso-codes" ,iso-codes) ;optional, for language names in the 
        ("json-glib" ,json-glib)
        ("lcms" ,lcms)
@@ -569,7 +563,7 @@ photographic equipment.")
        ("libxslt" ,libxslt)
        ("lua" ,lua) ;optional, for plugins
        ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support
-       ("openexr" ,openexr-2) ;optional, for EXR import/export
+       ("openexr" ,openexr) ;optional, for EXR import/export
        ("openjpeg" ,openjpeg) ;optional, for JPEG2000 export
        ("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view
        ("pugixml" ,pugixml)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]