From patchwork Mon Sep 20 23:37:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33226 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6923127BBE3; Tue, 21 Sep 2021 00:38:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 23A1127BBE1 for ; Tue, 21 Sep 2021 00:38:53 +0100 (BST) Received: from localhost ([::1]:47870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSSs6-0005J8-9G for patchwork@mira.cbaines.net; Mon, 20 Sep 2021 19:38:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSSrK-0005FU-Od for guix-patches@gnu.org; Mon, 20 Sep 2021 19:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSSrK-000308-Gt for guix-patches@gnu.org; Mon, 20 Sep 2021 19:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mSSrK-00033r-EG for guix-patches@gnu.org; Mon, 20 Sep 2021 19:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50711] [PATCH 2/2] gnu: darktable: Update to 3.6.1. References: <20210920233430.103080-1-monego@posteo.net> In-Reply-To: <20210920233430.103080-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Sep 2021 23:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50711@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 50711-submit@debbugs.gnu.org id=B50711.163218106011706 (code B ref 50711); Mon, 20 Sep 2021 23:38:02 +0000 Received: (at 50711) by debbugs.gnu.org; 20 Sep 2021 23:37:40 +0000 Received: from localhost ([127.0.0.1]:44296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSSqy-00032k-7J for submit@debbugs.gnu.org; Mon, 20 Sep 2021 19:37:40 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSSqx-00032T-AJ for 50711@debbugs.gnu.org; Mon, 20 Sep 2021 19:37:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9140C240103 for <50711@debbugs.gnu.org>; Tue, 21 Sep 2021 01:37:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632181053; bh=2UEQhmy/AxjPcUcg1hF7aiBKyF0TmcqCiiU7qitBczU=; h=From:To:Cc:Subject:Date:From; b=lY5wyxbnRzJvcpdQEskXv4oFKksTsTKvYWcLDiFECnbktmNuBPJWA+IG71+2cYmtY yfg0zTuIQSISSn4GcXEAyAqVQWXgB5NG00yCnBSJrlyT/MQdxl3IDoH/ktz16WS6ob xzrZDjnCMYODzayq07OMHEpM4sNjEpXVVGIghFfginqIrqqqXSDsm1ql1TviOyuQsE Uc50/6WuLL2kOHVl5miLFXnAL+83cQGWTjzzMp38SB1CWLPeQG9NMDOkkFCoB3lV14 sUHbBYVBbdBitJec/pnTB3JQXptyeXAF0yyIKcq/9TbUbYBPFsxX6EeVQsVqwaNvVd 0uKQHaRkmQI/w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HD1F84xLBz9rxQ; Tue, 21 Sep 2021 01:37:32 +0200 (CEST) From: Vinicius Monego Date: Mon, 20 Sep 2021 23:37:46 +0000 Message-Id: <20210920233746.103483-1-monego@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)