From patchwork Sat Jan 6 16:52:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Devaure X-Patchwork-Id: 58434 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 ECE5027BBE9; Sat, 6 Jan 2024 16:58:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE7EE27BBE2 for ; Sat, 6 Jan 2024 16:58:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rM9zj-0000VG-FX; Sat, 06 Jan 2024 11:57:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rM9zi-0000V8-19 for guix-patches@gnu.org; Sat, 06 Jan 2024 11:57:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rM9zh-00007f-Pf for guix-patches@gnu.org; Sat, 06 Jan 2024 11:57:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rM9zm-0008LU-HZ for guix-patches@gnu.org; Sat, 06 Jan 2024 11:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68293] [PATCH] gnu: darktable: update to 4.6.0 Resent-From: Alex Devaure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Jan 2024 16:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68293 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68293@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.170456026732057 (code B ref -1); Sat, 06 Jan 2024 16:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jan 2024 16:57:47 +0000 Received: from localhost ([127.0.0.1]:60238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rM9zX-0008Kz-3M for submit@debbugs.gnu.org; Sat, 06 Jan 2024 11:57:47 -0500 Received: from lists.gnu.org ([2001:470:142::17]:34848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rM9zV-0008Kl-MH for submit@debbugs.gnu.org; Sat, 06 Jan 2024 11:57:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rM9zK-0000Pu-I1 for guix-patches@gnu.org; Sat, 06 Jan 2024 11:57:34 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rM9zI-0008RD-DJ for guix-patches@gnu.org; Sat, 06 Jan 2024 11:57:34 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3368ac0f74dso513721f8f.0 for ; Sat, 06 Jan 2024 08:57:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704560250; x=1705165050; darn=gnu.org; h=mime-version:message-id:date:subject:to:from:user-agent:from:to:cc :subject:date:message-id:reply-to; bh=FxtY1bb1kV/ZPqAkV0JehrMFEfDOoJV+37jp4un/L4I=; b=UGBiJZQgoWteKsUNvFfYKyCKgP0i03p5LmicTC7vcjkrlQEORNyqyePC7+y5THI6kD YS0GA7UbX/aCe7BEQ7P2/srZczcSco7P2CdC3ft88lpM0O1RDYxi5+59Y405/h7HC8Pr dbkzVTDmkcCgfkYf8KGLvfuIqbG0XGDZeKxocQPgRzdFBF0GmlsMLFobEuZl1aHI5rvZ /mzfD24FZs+EzmTdsRVGqYlxuvOXtof6Edg4hf5DpaPd26nDPzQCELWoIaPaaMDpNaNR FnsfigMKEC1k1H/WIl3CDSBTm9i/fGkTuPJfA/1BYIJhteF//n3Y0ogk2i3kINpVB7cW qcfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704560250; x=1705165050; h=mime-version:message-id:date:subject:to:from:user-agent :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FxtY1bb1kV/ZPqAkV0JehrMFEfDOoJV+37jp4un/L4I=; b=cel5jS/AdbduiGuUmTsQy0WJ+rHteyCjFJ6U1Hjm7+SkO8JzRPIuYSsnWm/a3mRcnU krZ1L8SZvDA1+GFZi4ohTE7UpytcEC8b/9/k5vbx4qJ388JGrCYeRPojcMiVhXF+6p+8 QZiaiHYKHR7OjZAvxNZO16F+Kjxy/hl0qNlaYyRUzc8y6oGGqIQ7YiFSwThTNAapOh0c 0Z//wfEEj7NJRyWfFs9Z9OfE1pYV4SK/FQ0wtxElRhpwuMHXV8l17bo9coafu9ikI4mE iEpZRyossB/ATY5HS2VI7T/uT1zvie/boAr007cPOXRvS7kEr9+x6wi/a0bkypyrTohJ tqKg== X-Gm-Message-State: AOJu0Yz4BFlylU/XdQlsma5jOVs/i7DCLU8xVOsnu//P59sIINTocT35 keXr7F0rd7Q27SV/dgrbPwBYuHtl8NY= X-Google-Smtp-Source: AGHT+IGLyJpZBNG6UPQehbrUPxXr5JbG6ddkF1L5CpX2SHuvRvnfNcx89Y5omw7T9GxG0IsAtxd3nw== X-Received: by 2002:a5d:5226:0:b0:336:7bba:1d2c with SMTP id i6-20020a5d5226000000b003367bba1d2cmr470184wra.61.1704560250204; Sat, 06 Jan 2024 08:57:30 -0800 (PST) Received: from calvados ([2a02:c7c:e0dc:c00:7ec4:835a:972:718a]) by smtp.gmail.com with ESMTPSA id i16-20020a5d5230000000b00333404e9935sm3686840wra.54.2024.01.06.08.57.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 08:57:29 -0800 (PST) User-agent: mu4e 1.10.8; emacs 29.1 From: Alex Devaure Date: Sat, 06 Jan 2024 16:52:51 +0000 Message-ID: <87ttnqs8my.fsf@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=ajadevaure@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, Here is the patch for the update of darktable, gcc is replacing clang like in issue 67719 that has not been integrated yet. Change-Id: Ieb1a4dc0631330501ed38c9c2d30543d99c30296 --- gnu/packages/photo.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) base-commit: 157ad70182ade608203e9c0a42fb45b022039698 diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 78ae61c799..2e93d895f3 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) @@ -528,7 +529,7 @@ (define-public lensfun (define-public darktable (package (name "darktable") - (version "4.4.2") + (version "4.6.0") (source (origin (method url-fetch) @@ -536,7 +537,7 @@ (define-public darktable "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "167sdj8m3srj9h5hh9cf2kvfpp349sygkcdrfbjrqbnz9x1jh7f1")))) + (base32 "1hmcib37b5v8893d69i2qgvmbkmils8a0gn5dpg2462d43ijfjvj")))) (build-system cmake-build-system) (arguments (list @@ -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,12 @@ (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 `(,glib "bin") gobject-introspection intltool - llvm ;should match the Clang version opencl-headers perl pkg-config