From patchwork Thu Jun 29 10:27:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 51429 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 3736D27BBE9; Thu, 29 Jun 2023 11:28:25 +0100 (BST) 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 3D8AF27BBE2 for ; Thu, 29 Jun 2023 11:28:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEosf-0007h7-JE; Thu, 29 Jun 2023 06:28:05 -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 1qEosc-0007gw-Ih for guix-patches@gnu.org; Thu, 29 Jun 2023 06:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEosc-0007xC-9s for guix-patches@gnu.org; Thu, 29 Jun 2023 06:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qEosc-00042V-5f for guix-patches@gnu.org; Thu, 29 Jun 2023 06:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63065] [PATCH v2 16/16] gnu: Add yabridgectl. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Jun 2023 10:28: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" <63065@debbugs.gnu.org> Received: via spool by 63065-submit@debbugs.gnu.org id=B63065.168803444315463 (code B ref 63065); Thu, 29 Jun 2023 10:28:02 +0000 Received: (at 63065) by debbugs.gnu.org; 29 Jun 2023 10:27:23 +0000 Received: from localhost ([127.0.0.1]:52405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEorz-00041K-4v for submit@debbugs.gnu.org; Thu, 29 Jun 2023 06:27:23 -0400 Received: from mail-4325.protonmail.ch ([185.70.43.25]:31973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEorx-000414-Jk for 63065@debbugs.gnu.org; Thu, 29 Jun 2023 06:27:22 -0400 Date: Thu, 29 Jun 2023 10:27:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1688034435; x=1688293635; bh=hHxcpJTrQhgqJfwX+u7/7hrwPA9HH3UDPanlQWc18/U=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=N+C7T/xcm9C+l/igU/WhcOMq0k/1OfV1SsXnqkL02KDTb7H+qKEldG9o2QqAYVAWi 2WFeydwwfFMtmEJQbJHGQaCU1dU46Zjfv7ZiC3G4RVspdgL/u2Bk528SIZcrTJC9HB zOBFVENfYutP6BmD+wwtAb8uCeugcoNJi7xApNZv/C7e3BRrLT93FHqZ7o030SMa76 pTizm7Amj70pKMXicnbJQxo91KIyzogdzPyeuLadqIyZAiyklOot9mx1lCTq5Gqxku DXkyJmzpV7s8MLjmgXamYmsv+DQqxtTB7BkvQgjG/F/cGW1zzU+Q7AUJyL6sFKUntg lJ3F/0WMd4qoQ== Message-ID: Feedback-ID: 45211691:user:proton 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. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 62 +++++++++++++++++++ ...yabridgectl-5.0.4-use-system-reflink.patch | 23 +++++++ 3 files changed, 86 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 dbb2143906..29f05ff669 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2099,6 +2099,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-fix-reflink.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ %D%/packages/patches/zig-use-system-paths.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 02d2a68396..3c22ba9ac1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -74,6 +74,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) @@ -123,6 +124,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages samba) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) @@ -140,6 +142,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) @@ -5968,6 +5971,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 +