me/guix
Archived
1
0
Fork 0
Code Activity

gnu: darktable: Update to 3.6.1.

Browse source 
* gnu/packages/photo.scm (darktable): Update to 3.6.1.
[arguments]<#:phases>: Don't return #t. Remove 'opencl-inline phase because
the issue was fixed by upstream in this version.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Vinicius Monego 2021-09-20 23:37:46 +00:00 • committed by Efraim Flashner
parent 255fd9beea
commit 3852b9eb5b
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/photo.scm
View file

@ -471,7 +471,7 @@ photographic equipment.")
(define-public darktable (define-public darktable
(package (package
(name "darktable") (name "darktable")
(version "3.6.0") (version "3.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -479,7 +479,7 @@ photographic equipment.")
"https://github.com/darktable-org/darktable/releases/" "https://github.com/darktable-org/darktable/releases/"
"download/release-" version "/darktable-" version ".tar.xz")) "download/release-" version "/darktable-" version ".tar.xz"))
(sha256 (sha256
(base32 "0f8aqwkgw4gs97b5i4ygiqk5zilwq7ax7zwdd31r72zk98cd1g46")))) (base32 "051dwhdqa9q3zyrvr78g0cfzl1zhaagfvgx9axa9895q0g0wggx2"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On" `(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On"
@ -492,19 +492,7 @@ photographic equipment.")
(substitute* "./src/common/dlopencl.c" (substitute* "./src/common/dlopencl.c"
(("\"libOpenCL\"") (("\"libOpenCL\"")
(string-append "\"" (assoc-ref inputs "opencl-icd-loader") (string-append "\"" (assoc-ref inputs "opencl-icd-loader")
"/lib/libOpenCL.so\""))) "/lib/libOpenCL.so\"")))))
#t))
;; The use of inline is wrong and darktable cannot compile its kernels
;; with ROCm. See upstream commit
;; https://github.com/darktable-org/darktable/commit/f0d8710f5ef34eb7e33b4064e022ebf3057b9e53
(add-after 'unpack 'opencl-inline
(lambda* (#:key inputs #:allow-other-keys)
;; This is a feature of OpenCL 1.2 and later.
(substitute* "data/kernels/CMakeLists.txt"
(("CL1\\.1") "CL1.2"))
(substitute* (find-files "data/kernels" "\\.(cl|h)$")
(("inline") "static inline"))
#t))
(add-before 'configure 'prepare-build-environment (add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Rawspeed fails to build with GCC due to OpenMP error: ;; Rawspeed fails to build with GCC due to OpenMP error:
@ -514,8 +502,7 @@ photographic equipment.")
;; it to the Clang dir. We fix this by patching CMakeLists.txt. ;; it to the Clang dir. We fix this by patching CMakeLists.txt.
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("\\$\\{LLVM_INSTALL_PREFIX\\}") (("\\$\\{LLVM_INSTALL_PREFIX\\}")
(assoc-ref %build-inputs "clang"))) (assoc-ref %build-inputs "clang")))))
#t))
(add-before 'configure 'set-LDFLAGS-and-CPATH (add-before 'configure 'set-LDFLAGS-and-CPATH
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "LDFLAGS" (setenv "LDFLAGS"
@ -526,8 +513,8 @@ photographic equipment.")
;; Ensure the OpenEXR headers are found. ;; Ensure the OpenEXR headers are found.
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase") (string-append (assoc-ref inputs "ilmbase")
"/include/OpenEXR:" (or (getenv "CPATH") ""))) "/include/OpenEXR:"
#t)) (or (getenv "CPATH") "")))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out") (wrap-program (string-append (assoc-ref outputs "out")
@ -535,8 +522,7 @@ photographic equipment.")
;; For GtkFileChooserDialog. ;; For GtkFileChooserDialog.
`("GSETTINGS_SCHEMA_DIR" = `("GSETTINGS_SCHEMA_DIR" =
(,(string-append (assoc-ref inputs "gtk+") (,(string-append (assoc-ref inputs "gtk+")
"/share/glib-2.0/schemas")))) "/share/glib-2.0/schemas")))))))))
#t)))))
(native-inputs (native-inputs
`(("clang" ,clang-11) `(("clang" ,clang-11)
("cmocka" ,cmocka) ("cmocka" ,cmocka)