From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id EL/NJh+JDGYlfgAAe85BDQ:P1 (envelope-from ) for ; Wed, 03 Apr 2024 00:39:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id EL/NJh+JDGYlfgAAe85BDQ (envelope-from ) for ; Wed, 03 Apr 2024 00:39:27 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=Be8oqgVq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712097567; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=EF5l0V8iV94gWGU4gQnZQxKpOD9bloxOadPN/C+X6zM=; b=RMhYw1crV+kZUhExaJgJU3iFevtsZjwV5s3tZil0d6CHdBhxXjh7+9FOVuqu1/bAzJ0Csq 8cdX0MikAERdcanRSdDx8oQ762HBZFKDySnnpovH/y2j8EmNiR8PfZLpFYpTnNwZHKKltL QagteRi3WTE49PHBtvlBiKKNYVKiOUOPdSrTiwvRtc6crVeGPcwFlqk0I6OO9ivAxpRKs6 BIG8IrmP0BZJJZdEgeAo0ZdPrZ6owUPMQzg+Fm+quKSACCrjzWn6EqKzx/6a8uGxaRCzRP qCiewy79TAttmkTWZ3o/k/ckgJyeRUEpEM84FXYoKjCPbTxqNJwfxHcMAongyw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712097567; a=rsa-sha256; cv=none; b=kK8AX6TQmzQ/eymUKBmiO05LGdg7kH7tmtyve/6fbX2zbH8YLleb+l8dBWTU4vKfgK2DrV 5sRZ9x6wB2JGcUPAck0Fy4hpHtzQUEqdQIu9YjFtgSBxFU9xCEGfvISDh0PSU8fIRVQN7M fh/lSFRT8Yy0Il4UP7B+3kojRcljYolnYnBVmfnp4CBagvs6+7oabxecUNPUAmg6cvNygB lXCcBxyO43DR29YrSmmQ6G6zDO3BxXGTw+dXGtIo4uJX0EkNMcNepih8GVi7MubjIXeMMK U6NKSespLTDmL3VBWq9tS1LfqX9XOksLQlOlbkAnWUpbLaHBrcq+D6Jh/t5IvA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=Be8oqgVq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7474660AD0 for ; Wed, 3 Apr 2024 00:39:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrmmT-0000T1-3q; Tue, 02 Apr 2024 18:39:01 -0400 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 1rrmmQ-0000SR-D3 for guix-patches@gnu.org; Tue, 02 Apr 2024 18:38:58 -0400 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 1rrmmQ-0004DB-5O for guix-patches@gnu.org; Tue, 02 Apr 2024 18:38:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrmmT-0003sL-O8; Tue, 02 Apr 2024 18:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69593] [PATCH v2 1/3] gnu: Add fluidplug-lv2. References: <52cde204-a305-9783-a60d-17ee34a7d9ee@autistici.org> In-Reply-To: <52cde204-a305-9783-a60d-17ee34a7d9ee@autistici.org> Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: goodoldpaul@autistici.org, guix-patches@gnu.org Resent-Date: Tue, 02 Apr 2024 22:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69593 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69593@debbugs.gnu.org Cc: Giacomo Leidi , Giacomo Leidi X-Debbugs-Original-Xcc: Giacomo Leidi Received: via spool by 69593-submit@debbugs.gnu.org id=B69593.171209750114690 (code B ref 69593); Tue, 02 Apr 2024 22:39:01 +0000 Received: (at 69593) by debbugs.gnu.org; 2 Apr 2024 22:38:21 +0000 Received: from localhost ([127.0.0.1]:56499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrmlo-0003oq-Kr for submit@debbugs.gnu.org; Tue, 02 Apr 2024 18:38:21 -0400 Received: from confino.investici.org ([93.190.126.19]:55685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrmll-0003oX-Dp for 69593@debbugs.gnu.org; Tue, 02 Apr 2024 18:38:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1712097492; bh=EF5l0V8iV94gWGU4gQnZQxKpOD9bloxOadPN/C+X6zM=; h=From:To:Cc:Subject:Date:From; b=Be8oqgVqqA8+paKoXqaVsrb61+nDXYohlzU7tYm7o1uLuY4R21DbOcjmkpAVk1U1c OtZ7Aa/FCMLsOjmU+2e6kgf9cHiih0s2sxjOzoAvgpNG8C0SuGATYY0SfyKa7zFIVH Bjvl/2lacSOzk85R1WosqliCfgY63gXFn7PWh3fs= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4V8N7m5ZYTz117l; Tue, 2 Apr 2024 22:38:12 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4V8N7m4PZLz1102; Tue, 2 Apr 2024 22:38:12 +0000 (UTC) Date: Wed, 3 Apr 2024 00:37:56 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches From: Giacomo Leidi via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.95 X-Spam-Score: -6.95 X-Migadu-Queue-Id: 7474660AD0 X-Migadu-Scanner: mx13.migadu.com X-TUID: AwkmCCSwjEFM * gnu/packages/fluidplug.scm: New file; * gnu/local.mk: Add it. Change-Id: Iec61d692010f9d7635de2cf27c32e1356225ca09 --- gnu/local.mk | 1 + gnu/packages/fluidplug.scm | 319 +++++++++++++++++++++++++++++++++++++ 2 files changed, 320 insertions(+) create mode 100644 gnu/packages/fluidplug.scm diff --git a/gnu/local.mk b/gnu/local.mk index f2b480bded..6d554c0116 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -278,6 +278,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/flashing-tools.scm \ %D%/packages/flex.scm \ %D%/packages/fltk.scm \ + %D%/packages/fluidplug.scm \ %D%/packages/fonts.scm \ %D%/packages/fontutils.scm \ %D%/packages/fpga.scm \ diff --git a/gnu/packages/fluidplug.scm b/gnu/packages/fluidplug.scm new file mode 100644 index 0000000000..b45d3a85b5 --- /dev/null +++ b/gnu/packages/fluidplug.scm @@ -0,0 +1,319 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Giacomo Leidi +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages fluidplug) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix packages) + #:use-module (guix records) + #:use-module (guix utils) + #:use-module (gnu packages audio) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages pkg-config) + #:use-module (srfi srfi-1) + #:export (fluidplug-plugin + fluidplug-plugin? + fluidplug-plugin-name + fluidplug-plugin-path + fluidplug-plugin-hash + fluidplug-plugin-license)) + +(define-record-type* + fluidplug-plugin make-fluidplug-plugin + fluidplug-plugin? + (name fluidplug-plugin-name) ;string + (hash fluidplug-plugin-hash) ;string + (path fluidplug-plugin-path) ;string + (license fluidplug-plugin-license ;license + (default license:cc-by-sa4.0))) + +(define (fluidplug-plugin->package-name record) + (string-append "fluidplug-" + (string-downcase + (string-replace-substring + (fluidplug-plugin-name record) "_" "-")) + "-lv2")) + +(define (fluidplug-plugin->origin record) + (origin + (method url-fetch) + (uri + (string-append "https://download.linuxaudio.org/" + "musical-instrument-libraries/sf2/" + (fluidplug-plugin-path record))) + (sha256 + (base32 (fluidplug-plugin-hash record))))) + +(define (fluidplug-plugin->local-path record) + (string-append "./" (fluidplug-plugin-name record) ".lv2/" + (basename (fluidplug-plugin-path record)))) + +(define airfont320-fluidplug-plugin + (fluidplug-plugin + (name "AirFont320") + (path "airfont_a340u.tar.7z") + (hash "1x4xzm4khq823i4p18ydbkjza2nv3hzwyxp7vf3gzqs374jdcqbw") + (license license:gpl2))) + +(define avl-drumkits-perc-fluidplug-plugin + (fluidplug-plugin + (name "AVL_Drumkits_Perc") + (path "AVL-Drumkits-1.1-SF2-splitted/AVL_Drumkits_Perc_1.1.tar.7z") + (hash "0l1zvzw9dg922wf9llcl9zlw5ybjmayg7yqacp253xcr2jz1hn7m") + (license license:cc-by-sa3.0))) + +(define black-pearl-4a-fluidplug-plugin + (fluidplug-plugin + (name "Black_Pearl_4A") + (path "AVL-Drumkits-1.1-SF2-splitted/Black_Pearl_4A-1.1.tar.7z") + (hash "0flzlg5m2r3df8dchydzg3xllcv7ignr7hx6qxzy51s6gzrlbzli") + (license license:cc-by-sa3.0))) + +(define black-pearl-4b-fluidplug-plugin + (fluidplug-plugin + (name "Black_Pearl_4B") + (path "AVL-Drumkits-1.1-SF2-splitted/Black_Pearl_4B-1.1.tar.7z") + (hash "1z5q8z4k81xnbcv0gpc2xgrzqm9fg4n2yly1kaw82q7sm29vi0z9") + (license license:cc-by-sa3.0))) + +(define black-pearl-5-fluidplug-plugin + (fluidplug-plugin + (name "Black_Pearl_5") + (path "AVL-Drumkits-1.1-SF2-splitted/Black_Pearl_5-1.1.tar.7z") + (hash "0mg41wc912sfj2mydn86ychwk21l3ngbn7k3qsm6jgf1ipmsip9y") + (license license:cc-by-sa3.0))) + +(define red-zeppelin-4-fluidplug-plugin + (fluidplug-plugin + (name "Red_Zeppelin_4") + (path "AVL-Drumkits-1.1-SF2-splitted/Red_Zeppelin_4-1.1.tar.7z") + (hash "0pcswg4hlyn8j6nghbwvxa71ibp6r0wxcbxjzxs4iim43vpxc659") + (license license:cc-by-sa3.0))) + +(define red-zeppelin-5-fluidplug-plugin + (fluidplug-plugin + (name "Red_Zeppelin_5") + (path "AVL-Drumkits-1.1-SF2-splitted/Red_Zeppelin_5-1.1.tar.7z") + (hash "18hhmi1d1i7gr2rp4wn28pnfwl825rmhmjnvxvvcwdmis6nad4gm") + (license license:cc-by-sa3.0))) + +(define fluidgm-fluidplug-plugin + (fluidplug-plugin + (name "FluidGM") + (path "fluidr3.tar.7z") + (hash "00ka1b2pxn0g2g0hm7kdg5w785pfx8f9585238d183wjdkc3a8m6") + (license license:expat))) + +(define fluidbass-fluidplug-plugin + (fluidplug-plugin + (name "FluidBass") + (path "fluidr3-splitted/fluidr3gm_bass.sf2.tar.7z") + (hash "1zhixrxkwvmn6xkpy9f8zkrwxmaqwdcx0jz7zg8lc2amqkx9wqan"))) + +(define fluidbrass-fluidplug-plugin + (fluidplug-plugin + (name "FluidBrass") + (path "fluidr3-splitted/fluidr3gm_brass.sf2.tar.7z") + (hash "027l3q4q9011xzbzsrsp5nj3h05w9dj7d8b943xzck7q4sp9alkp"))) + +(define fluidchromperc-fluidplug-plugin + (fluidplug-plugin + (name "FluidChromPerc") + (path "fluidr3-splitted/fluidr3gm_chromaticpercussion.sf2.tar.7z") + (hash "1233fh36wlifrawh57v8vycxc0g4pbvy3qr9f596g9n7mm4h51f7"))) + +(define fluiddrums-fluidplug-plugin + (fluidplug-plugin + (name "FluidDrums") + (path "fluidr3-splitted/fluidr3gm_drums.sf2.tar.7z") + (hash "01pv3aj52pz8xy29acprwkb69jxhrn64kx7w29ch5bl091lccqgr"))) + +(define fluidensemble-fluidplug-plugin + (fluidplug-plugin + (name "FluidEnsemble") + (path "fluidr3-splitted/fluidr3gm_ensemble.sf2.tar.7z") + (hash "0rswcgzapcjmwddh2hgicym27hqz3p43r2s8j7hy1s40hzk3nbax"))) + +(define fluidethnic-fluidplug-plugin + (fluidplug-plugin + (name "FluidEthnic") + (path "fluidr3-splitted/fluidr3gm_ethnic.sf2.tar.7z") + (hash "0z1z37wn6lw1n919bkpfirachg5wwddi7f0g4l9vimazv34ds1b1"))) + +(define fluidguitars-fluidplug-plugin + (fluidplug-plugin + (name "FluidGuitars") + (path "fluidr3-splitted/fluidr3gm_guitar.sf2.tar.7z") + (hash "1d5jxx4sgbyh9sqmfksggcsri9hal7mw83a6h1vqb9xf59gnmx1i"))) + +(define fluidorgans-fluidplug-plugin + (fluidplug-plugin + (name "FluidOrgans") + (path "fluidr3-splitted/fluidr3gm_organ.sf2.tar.7z") + (hash "12zlq28cmr2hsgn1319hidzcm8yifx6vsqsqk544z3qkhc8cg4fr"))) + +(define fluidpercussion-fluidplug-plugin + (fluidplug-plugin + (name "FluidPercussion") + (path "fluidr3-splitted/fluidr3gm_percussive.sf2.tar.7z") + (hash "1gql0g1zk09n6r90mav47khdc406jhmg5iql6i2zjmg9l7yg65n3"))) + +(define fluidpianos-fluidplug-plugin + (fluidplug-plugin + (name "FluidPianos") + (path "fluidr3-splitted/fluidr3gm_piano.sf2.tar.7z") + (hash "06a817xvx7qj8plr1vhpanbdr97cbmzky0pp6xhff916s5k0jg2r"))) + +(define fluidpipes-fluidplug-plugin + (fluidplug-plugin + (name "FluidPipes") + (path "fluidr3-splitted/fluidr3gm_pipe.sf2.tar.7z") + (hash "09wzvsabcif27687g71g4m75zz08zpwpm2dzwh8a7xsfi5qdynf2"))) + +(define fluidreeds-fluidplug-plugin + (fluidplug-plugin + (name "FluidReeds") + (path "fluidr3-splitted/fluidr3gm_reed.sf2.tar.7z") + (hash "1yb0whi67wz7ag6hcfdns69m1ic3fq6firvbb893ilnx8h17yjak"))) + +(define fluidsoundfx-fluidplug-plugin + (fluidplug-plugin + (name "FluidSoundFX") + (path "fluidr3-splitted/fluidr3gm_soundeffects.sf2.tar.7z") + (hash "0sg8gca9735gy0pna63vgsfnabk54dl30n1lnhcf976n7y0npzfx"))) + +(define fluidstrings-fluidplug-plugin + (fluidplug-plugin + (name "FluidStrings") + (path "fluidr3-splitted/fluidr3gm_strings.sf2.tar.7z") + (hash "1nnxr62i3p3hhdpwlly62c4cvf7f3dzq818fmlnlxp25215h17bs"))) + +(define fluidsynthfx-fluidplug-plugin + (fluidplug-plugin + (name "FluidSynthFX") + (path "fluidr3-splitted/fluidr3gm_syntheffects.sf2.tar.7z") + (hash "0rlq58v9m6wjk45kxmza54y8fkj1b8y1zg00r80nwyqz6rylgjh4"))) + +(define fluidsynthleads-fluidplug-plugin + (fluidplug-plugin + (name "FluidSynthLeads") + (path "fluidr3-splitted/fluidr3gm_synthlead.sf2.tar.7z") + (hash "0axi5dyqf8zh1gn82qq0jpzr0cgbsjn4xm0yrlqld4k6h9ggj475"))) + +(define fluidsynthpads-fluidplug-plugin + (fluidplug-plugin + (name "FluidSynthPads") + (path "fluidr3-splitted/fluidr3gm_synthpad.sf2.tar.7z") + (hash "1q4pd6ymb08yc6rz68wlidjp5kp7pygc2aw45djw9wr8id6pnadi"))) + +(define-public fluidplug-plugins + (list airfont320-fluidplug-plugin + avl-drumkits-perc-fluidplug-plugin + black-pearl-4a-fluidplug-plugin + black-pearl-4b-fluidplug-plugin + black-pearl-5-fluidplug-plugin + red-zeppelin-4-fluidplug-plugin + red-zeppelin-5-fluidplug-plugin + fluidgm-fluidplug-plugin + fluidbass-fluidplug-plugin + fluidbrass-fluidplug-plugin + fluidchromperc-fluidplug-plugin + fluiddrums-fluidplug-plugin + fluidensemble-fluidplug-plugin + fluidethnic-fluidplug-plugin + fluidguitars-fluidplug-plugin + fluidorgans-fluidplug-plugin + fluidpercussion-fluidplug-plugin + fluidpianos-fluidplug-plugin + fluidpipes-fluidplug-plugin + fluidreeds-fluidplug-plugin + fluidsoundfx-fluidplug-plugin + fluidstrings-fluidplug-plugin + fluidsynthfx-fluidplug-plugin + fluidsynthleads-fluidplug-plugin + fluidsynthpads-fluidplug-plugin)) + +(define-public fluidplug-lv2 + (let ((version "0.0.5") + (revision "0") + (commit "38d7d0d5259c89199be3cf56768edf0d41bfd881")) + (package + (name "fluidplug-lv2") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/falkTX/FluidPlug") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k4wjcvpgf4nk4d5b40x5zckfgp22b4i3npcahqbr16hh21cjfjj")) + (modules '((guix build utils))) + (snippet '(begin + ;; SoundFonts can't be downloaded at build time + ;; in Guix, so it is disabled. + (substitute* "Makefile" + (("wget") "# wget")) + #t)))) + (build-system gnu-build-system) + (arguments + (list + ;; There are no tests. + #:tests? #f + #:make-flags #~(list (string-append "DESTDIR=" #$output) + "PREFIX=") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-plugin + (lambda _ + (use-modules (srfi srfi-1)) + (for-each + (lambda (p) + (define source (first p)) + (define target (second p)) + (symlink source target)) + '(#$@(map + (lambda (p) + (list (fluidplug-plugin->origin p) + (fluidplug-plugin->local-path p))) + fluidplug-plugins))))) + (delete 'configure) + (add-before 'build 'setenv + (lambda _ + (setenv "CC" "gcc")))))) + (native-inputs + (list lv2 gnu-make p7zip pkg-config)) + (inputs (list fluidsynth)) + (native-search-paths + (list (search-path-specification + (variable "LV2_PATH") + (files '("lib/lv2"))))) + (synopsis + "SoundFonts as LV2 plugins via FluidSynth") + (description + "@code{FluidPlug} provides SoundFonts as LV2 plugins via FluidSynth.") + (home-page "https://github.com/falkTX/FluidPlug") + (license + (delete-duplicates + (map fluidplug-plugin-license fluidplug-plugins)))))) base-commit: 7af70efd7633b0d70091762cf43ce01a86176e8e -- 2.41.0