From: Vinicius Monego <monego@posteo.net>
To: 50711@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#50711] [PATCH 2/2] gnu: darktable: Update to 3.6.1.
Date: Mon, 20 Sep 2021 23:37:46 +0000 [thread overview]
Message-ID: <20210920233746.103483-1-monego@posteo.net> (raw)
In-Reply-To: <20210920233430.103080-1-monego@posteo.net>
* 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.
---
gnu/packages/photo.scm | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 39ec490445..908a872b6b 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -471,7 +471,7 @@ photographic equipment.")
(define-public darktable
(package
(name "darktable")
- (version "3.6.0")
+ (version "3.6.1")
(source
(origin
(method url-fetch)
@@ -479,7 +479,7 @@ photographic equipment.")
"https://github.com/darktable-org/darktable/releases/"
"download/release-" version "/darktable-" version ".tar.xz"))
(sha256
- (base32 "0f8aqwkgw4gs97b5i4ygiqk5zilwq7ax7zwdd31r72zk98cd1g46"))))
+ (base32 "051dwhdqa9q3zyrvr78g0cfzl1zhaagfvgx9axa9895q0g0wggx2"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On"
@@ -492,19 +492,7 @@ photographic equipment.")
(substitute* "./src/common/dlopencl.c"
(("\"libOpenCL\"")
(string-append "\"" (assoc-ref inputs "opencl-icd-loader")
- "/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))
+ "/lib/libOpenCL.so\"")))))
(add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys)
;; 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.
(substitute* "CMakeLists.txt"
(("\\$\\{LLVM_INSTALL_PREFIX\\}")
- (assoc-ref %build-inputs "clang")))
- #t))
+ (assoc-ref %build-inputs "clang")))))
(add-before 'configure 'set-LDFLAGS-and-CPATH
(lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "LDFLAGS"
@@ -526,8 +513,8 @@ photographic equipment.")
;; Ensure the OpenEXR headers are found.
(setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase")
- "/include/OpenEXR:" (or (getenv "CPATH") "")))
- #t))
+ "/include/OpenEXR:"
+ (or (getenv "CPATH") "")))))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
@@ -535,8 +522,7 @@ photographic equipment.")
;; For GtkFileChooserDialog.
`("GSETTINGS_SCHEMA_DIR" =
(,(string-append (assoc-ref inputs "gtk+")
- "/share/glib-2.0/schemas"))))
- #t)))))
+ "/share/glib-2.0/schemas")))))))))
(native-inputs
`(("clang" ,clang-11)
("cmocka" ,cmocka)
--
2.30.2
next prev parent reply other threads:[~2021-09-20 23:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 23:34 [bug#50711] [PATCH 0/2] Update Darktable Vinicius Monego
2021-09-20 23:36 ` [bug#50711] [PATCH 1/2] gnu: darktable: Add powerpc64le-linux to supported systems Vinicius Monego
2021-09-20 23:37 ` Vinicius Monego [this message]
2021-09-26 17:12 ` bug#50711: [PATCH 0/2] Update Darktable Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210920233746.103483-1-monego@posteo.net \
--to=monego@posteo.net \
--cc=50711@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).