From patchwork Fri Dec 8 22:22:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 57423 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 408FB27BBE9; Fri, 8 Dec 2023 22:23:08 +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_INVALID, DKIM_SIGNED,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 5FB1727BBE2 for ; Fri, 8 Dec 2023 22:23:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBjFE-00043j-7Z; Fri, 08 Dec 2023 17:22:52 -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 1rBjFB-00042x-Ng for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:49 -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 1rBjFA-0007OD-Nk for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBjFN-0007yn-Sy for guix-patches@gnu.org; Fri, 08 Dec 2023 17:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67719] [PATCH 1/3] gnu: gmic: Update to 3.3.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Dec 2023 22:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67719@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 67719-submit@debbugs.gnu.org id=B67719.170207416930600 (code B ref 67719); Fri, 08 Dec 2023 22:23:01 +0000 Received: (at 67719) by debbugs.gnu.org; 8 Dec 2023 22:22:49 +0000 Received: from localhost ([127.0.0.1]:46423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjFA-0007xR-I6 for submit@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:48 -0500 Received: from mout01.posteo.de ([185.67.36.65]:59281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjF8-0007x5-EJ for 67719@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:47 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7DD57240027 for <67719@debbugs.gnu.org>; Fri, 8 Dec 2023 23:22:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1702074147; bh=XO13nR0p+p0JDecjVa6m9qk3i986ohUb5zt5PiQzxg8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=iTqIuRqkpita1tQ2Gdwhc5saeoKdHrqhDon/GmJMcoFAKPE8D47ukY2670sTu3wiy oeM46UTRhCRIaIBLi9uxIVyAY5O/X+I7FpqYWSWf9mgZRmOrljCvWMapk1ckmaNH0l FCVvidmv7NJPiF+mJJ+KLP1POJakfMJhjEmzNq9Ldr/9VXffy9Fd0Eldehyvd3h/w6 y7bFmGSplXpgSvQWTKhZRCh06dj/hMfRnksj0HY9VcswAgNNGmbNJlOhfvQVqWG4CU sPvZskrUlTQR3oNsuP2oXevLmHaI4OQNILBybFcTE460NhHDF86AJ/kqowN8Ai4NrP QAtQcFWK6YlHQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Sn5H63cTBz6tn4; Fri, 8 Dec 2023 23:22:26 +0100 (CET) From: Vinicius Monego Date: Fri, 8 Dec 2023 22:22:05 +0000 Message-Id: <8c18031413e33a224d122a0465a76fe300f6359a.1702073949.git.monego@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches gmic was integrated into Krita 5+. * gnu/packages/image-processing.scm (gmic, gmic-qt): Update to 3.3.2. gmic-qt-krita: Delete variable. Change-Id: I44e33b570bcf3e1df3eba5eb9ede1f333f8a177a --- gnu/packages/image-processing.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 306da962cc..ca0828c2b1 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -832,14 +832,14 @@ (define-public vips (define-public gmic (package (name "gmic") - (version "3.0.0") + (version "3.3.2") (source (origin (method url-fetch) (uri (string-append "https://gmic.eu/files/source/gmic_" version ".tar.gz")) (sha256 - (base32 "080inz0wisv3rhvbnzrgcs3j25wq86gybp68yi56gw6vwswnn19z")))) + (base32 "0s7qcvsi1vjs7631fiw5hhx7y97csm2fhir9xy63fln574isspnr")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;there are no tests @@ -900,18 +900,6 @@ (define-public gmic-qt (synopsis "Qt frontend for the G'MIC image processing framework") (license license:gpl3+))) -(define-public gmic-qt-krita - (package - (inherit gmic-qt) - (name "gmic-qt-krita") - (arguments - (substitute-keyword-arguments (package-arguments gmic-qt) - ((#:configure-flags flags) - '(list "-DGMIC_QT_HOST=krita" "-DENABLE_DYNAMIC_LINKING=ON" - (string-append "-DGMIC_LIB_PATH=" - (assoc-ref %build-inputs "gmic") "/lib"))))) - (synopsis "Krita plugin for the G'MIC image processing framework"))) - (define-public gmic-qt-gimp (package (inherit gmic-qt) From patchwork Fri Dec 8 22:22:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 57425 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 372B327BBE9; Fri, 8 Dec 2023 22:23:11 +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_INVALID, DKIM_SIGNED,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 599CC27BBE2 for ; Fri, 8 Dec 2023 22:23:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBjFG-000443-2v; Fri, 08 Dec 2023 17:22:54 -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 1rBjFB-00042y-O8 for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:49 -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 1rBjFB-0007OP-4m for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBjFO-0007yu-9i for guix-patches@gnu.org; Fri, 08 Dec 2023 17:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67719] [PATCH 2/3] gnu: darktable: Build with GCC again. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Dec 2023 22:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67719@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 67719-submit@debbugs.gnu.org id=B67719.170207417530639 (code B ref 67719); Fri, 08 Dec 2023 22:23:02 +0000 Received: (at 67719) by debbugs.gnu.org; 8 Dec 2023 22:22:55 +0000 Received: from localhost ([127.0.0.1]:46427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjFG-0007y6-WA for submit@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:55 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjFB-0007x9-TE for 67719@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:53 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 138E3240027 for <67719@debbugs.gnu.org>; Fri, 8 Dec 2023 23:22:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1702074151; bh=RtoBXOnvQWSMYM7K8uTfmXMyw40CODfuEkLSqQIVp48=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=MaHafvzl2DSyopCqSwUxf0vgNVIUtXFVtaLS3T1mkfuYY0DI6AyKfBnI2J6wCFPYF oZm4xU97sf9sTxtVl7LWx+LBQI9jWdUGvDw0z0o+VzYKRghpXjv4YkuX1azGmTz/hi RK5PDv+zj9QxourdpZGdwdocEfKrgvpmCesDOKa3zYax5J4ywNG4Yk+LFsCyiFt7vn RAGMl0n5IRJd60VX9fplH0Q8SGKzTn691s0uxcR7AV3WjaixcCA4iiY1eJz28uBMNS 9u3AMwHYaUZ7hrXwgwY4tMSJ4PHRRkV5+lNTJE0lli80lpca0v4sapIF/TycXgkzq8 D7jhZ9cju6aLQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Sn5HB230rz6tn4; Fri, 8 Dec 2023 23:22:30 +0100 (CET) From: Vinicius Monego Date: Fri, 8 Dec 2023 22:22:06 +0000 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/photo.scm (darktable)[arguments][#:phases]: Delete the 'prepare-build-environment phase. [native-inputs]: Remove clang. Add gcc-13. Change-Id: Ia0dc1c6a717ccd00cd31d378aa51ce63fbf1806a --- gnu/packages/photo.scm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 86b7fbd15c..aa857a1d83 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) @@ -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,13 @@ (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 ; gcc-11 too old for darktable, 12+ required `(,glib "bin") gobject-introspection intltool - llvm ;should match the Clang version + llvm opencl-headers perl pkg-config From patchwork Fri Dec 8 22:22:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 57424 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 73F5C27BBE2; Fri, 8 Dec 2023 22:23:09 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CABCB27BBEA for ; Fri, 8 Dec 2023 22:23:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBjFG-00044I-F8; Fri, 08 Dec 2023 17:22:54 -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 1rBjFD-00043D-N9 for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:51 -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 1rBjFB-0007OW-Je for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBjFO-0007z2-OM for guix-patches@gnu.org; Fri, 08 Dec 2023 17:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67719] [PATCH 3/3] gnu: darktable: Enable more optional features. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Dec 2023 22:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67719@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 67719-submit@debbugs.gnu.org id=B67719.170207417530645 (code B ref 67719); Fri, 08 Dec 2023 22:23:02 +0000 Received: (at 67719) by debbugs.gnu.org; 8 Dec 2023 22:22:55 +0000 Received: from localhost ([127.0.0.1]:46429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjFH-0007y8-CG for submit@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:55 -0500 Received: from mout01.posteo.de ([185.67.36.65]:46303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjFF-0007xU-Qn for 67719@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:54 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 02D35240027 for <67719@debbugs.gnu.org>; Fri, 8 Dec 2023 23:22:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1702074155; bh=YUQ9iph1DftUdTpxX5Z2q97hHUfewm3KbHWWwbC/UzI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=KJPQPHA1QyFdjKdRU8uZk26kbjoEf/vLGAaHkeg56N3on1rvL62UnGeRLlmIp2W9o 73YhJ9rSGqs7zMIB9Xq8mcg6r/aXiEywgwKIYqcm9V2H0/2cen2RveBn/bseeEOIVa Qyi2czeH1VWlyCnatFuxQy7Z1lJSRmh+5MN/eMGEAHRYMw8cJtf9k0OQUTf6weVf86 B182HlPwElWWhoc7anC0QXRbdoXgz8S33XlBeHXx/EiiGdkbLqRNZNrvVjU5McDOSc YVXOxlIor53r5B7MA/rzFaeaHOn/StwXaggLDaGY3RA2ew43i7EJ07SaUpG8JBq60U jNOCEl+fBb76g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Sn5HG139Kz6tvZ; Fri, 8 Dec 2023 23:22:33 +0100 (CET) From: Vinicius Monego Date: Fri, 8 Dec 2023 22:22:07 +0000 Message-Id: <80f3a9c851e2d318e15711dae64c13ba3d0395b7.1702073949.git.monego@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/photo.scm (darktable)[inputs]: Add libjxl, portmidi. Change-Id: I7747dfc2e88379a13182590f87514951bdd70e0c --- gnu/packages/photo.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index aa857a1d83..f99223ae6d 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -76,6 +76,7 @@ (define-module (gnu packages photo) #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages music) #:use-module (gnu packages ocaml) #:use-module (gnu packages opencl) #:use-module (gnu packages perl) @@ -600,6 +601,7 @@ (define-public darktable libgphoto2 ;optional, for camera tethering libavif ;optional, for AVIF support libjpeg-turbo + libjxl ;optional, for JPEG-XL support libomp libpng (librsvg-for-system) @@ -615,6 +617,7 @@ (define-public darktable openexr ;optional, for EXR import/export openjpeg ;optional, for JPEG2000 export osm-gps-map ;optional, for geotagging view + portmidi ;optional, for hardware MIDI input devices pugixml python-jsonschema sdl2