From patchwork Wed Nov 1 09:19:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55782 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 148F027BBEA; Wed, 1 Nov 2023 09:23:40 +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 40A5727BBE2 for ; Wed, 1 Nov 2023 09:23:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy7Rh-0002fx-Nw; Wed, 01 Nov 2023 05:23:29 -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 1qy7Rg-0002fc-KD for guix-patches@gnu.org; Wed, 01 Nov 2023 05:23:28 -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 1qy7Rg-0002lG-Ce for guix-patches@gnu.org; Wed, 01 Nov 2023 05:23:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy7SE-0004jc-Ii; Wed, 01 Nov 2023 05:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63065] [PATCH v4 7/7] gnu: Add yabridgectl. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 09:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63065@debbugs.gnu.org Cc: Sughosha , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 63065-submit@debbugs.gnu.org id=B63065.169883059118113 (code B ref 63065); Wed, 01 Nov 2023 09:24:02 +0000 Received: (at 63065) by debbugs.gnu.org; 1 Nov 2023 09:23:11 +0000 Received: from localhost ([127.0.0.1]:49903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7RP-0004i3-9E for submit@debbugs.gnu.org; Wed, 01 Nov 2023 05:23:11 -0400 Received: from layka.disroot.org ([178.21.23.139]:58474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7RM-0004hv-VJ for 63065@debbugs.gnu.org; Wed, 01 Nov 2023 05:23:09 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3251C44F4D; Wed, 1 Nov 2023 10:22:34 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a7IfZMHrBjRd; Wed, 1 Nov 2023 10:22:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698830549; bh=jsZKzJQdQy7+qDa4Y0X7zeaFo2ctVquURPS9HeeHzl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KqC6OetaznTSvE4lFNA6FdjqaWZ7zZGn10RSnNY92LkSzR8ZCeNy1l6JRll822TsU LLjIu/7D7WNOK2pU6e0OzbED01tuy9ZDHw26AH3FneLr9qN2djkYvbpC533g8C2rgM EwxgucNysrOshf0APUYONBhmafDCxdXniPDM9VPgOJZoisZv29BepXZZA9Iw8rLyli BsIi2FB93XJ1WafJq+MXxjoBJdaW90PV13UHJfmo16/R45l2bXibAyvJOrS7rifH6/ hb7adYE08Wir34q8koORzqXAwBA+nG1I3dO95FQpuvaMm6UKOOSK1rBFf6F+sAcHfp YYOq/2lWpOdfg== Date: Wed, 1 Nov 2023 10:19:58 +0100 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/audio.scm (yabridgectl): New variable. * gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch: New patch file. * gnu/local.mk: Register it. Change-Id: I6a7fe3eff7852c60c306c4559cf00a4161ce81e1 --- gnu/local.mk | 1 + gnu/packages/audio.scm | 61 +++++++++++++++++++ ...yabridgectl-5.0.4-use-system-reflink.patch | 23 +++++++ 3 files changed, 85 insertions(+) create mode 100644 gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4718ad49a5..e535a8403e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2168,6 +2168,7 @@ dist_patch_DATA = \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/xygrib-newer-proj.patch \ %D%/packages/patches/yabridge-5.0.4-fix-dependency-search.patch \ + %D%/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index aae97d4169..102d064fb2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -76,6 +76,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) @@ -144,6 +145,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) @@ -6056,6 +6058,65 @@ (define-public yabridge quick startup times.") (license license:gpl3+))) +(define-public yabridgectl + (package/inherit yabridge + (name "yabridgectl") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robbert-vdh/yabridge") + (commit (package-version yabridge)))) + (sha256 + (base32 + "0ayl706nv67jkixbrh9z7225gdwg2s4rzndx77761x33mk6by7a8")) + (patches + (search-patches + "yabridgectl-5.0.4-use-system-reflink.patch")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-3) + ("rust-colored" ,rust-colored-2) + ("rust-is-executable" ,rust-is-executable-1) + ("rust-goblin" ,rust-goblin-0.6) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-promptly" ,rust-promptly-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-reflink" ,rust-reflink-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-jsonrc" ,rust-serde-jsonrc-0.1) + ("rust-textwrap" ,rust-textwrap-0.11) + ("rust-toml" ,rust-toml-0.5) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-which" ,rust-which-4) + ("rust-xdg" ,rust-xdg-2)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "tools/yabridgectl"))) + (add-after 'change-directory 'patch-paths + (lambda _ + (with-directory-excursion "src" + (substitute* '("config.rs" "main.rs") + (("/usr") #$yabridge))))) + (add-after 'install 'wrap-program + (lambda _ + (wrap-program (string-append #$output "/bin/yabridgectl") + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append #$yabridge "/lib") + ,(string-append #$dbus "/lib"))))))))) + (native-inputs '()) + (inputs + (list dbus)) + (propagated-inputs + (list yabridge)) + (synopsis "Utility to set up and update yabridge") + (description + "@command{yabridgectl} is a tool to setup and update @code{yabridge}."))) + (define-public ableton-link (package (name "ableton-link") diff --git a/gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch b/gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch new file mode 100644 index 0000000000..d863f35c2f --- /dev/null +++ b/gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch @@ -0,0 +1,23 @@ +rust-reflink version 0.1.3 available in Guix is patched with the fix for +the assumption of a 64-bit toolchain. + +--- + tools/yabridgectl/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/yabridgectl/Cargo.toml b/tools/yabridgectl/Cargo.toml +index f2ea73fb..09490e43 100644 +--- a/tools/yabridgectl/Cargo.toml ++++ b/tools/yabridgectl/Cargo.toml +@@ -18,7 +18,7 @@ goblin = { version = "0.6", default_features = false, features = ["std", "pe32", + libloading = "0.7.3" + promptly = "0.3.1" + # Version 0.1.3 from crates.io assumes a 64-bit toolchain +-reflink = { git = "https://github.com/nicokoch/reflink", rev = "e8d93b465f5d9ad340cd052b64bbc77b8ee107e2" } ++reflink = "0.1.3" + rayon = "1.5.1" + serde = "1.0.133" + serde_derive = "1.0.133" +-- +2.39.2 +