From patchwork Mon Aug 15 11:34:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Formbi X-Patchwork-Id: 41688 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 9820527BBEA; Mon, 15 Aug 2022 12:41:32 +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,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 E1B9627BBE9 for ; Mon, 15 Aug 2022 12:41:31 +0100 (BST) Received: from localhost ([::1]:40292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNYTL-0005G6-0c for patchwork@mira.cbaines.net; Mon, 15 Aug 2022 07:41:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNYO6-0003Mi-Q4 for guix-patches@gnu.org; Mon, 15 Aug 2022 07:36:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNYO2-0008Ob-C6 for guix-patches@gnu.org; Mon, 15 Aug 2022 07:36:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oNYO2-0006bD-8Q for guix-patches@gnu.org; Mon, 15 Aug 2022 07:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57220] Acknowledgement ([PATCH] gnu: move wireplumber and qpwgraph) Resent-From: Formbi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Aug 2022 11:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57220 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57220@debbugs.gnu.org Received: via spool by 57220-submit@debbugs.gnu.org id=B57220.166056330325264 (code B ref 57220); Mon, 15 Aug 2022 11:36:02 +0000 Received: (at 57220) by debbugs.gnu.org; 15 Aug 2022 11:35:03 +0000 Received: from localhost ([127.0.0.1]:41026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNYN4-0006ZO-7r for submit@debbugs.gnu.org; Mon, 15 Aug 2022 07:35:02 -0400 Received: from mail-40130.protonmail.ch ([185.70.40.130]:58317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNYN1-0006Yp-4W for 57220@debbugs.gnu.org; Mon, 15 Aug 2022 07:35:00 -0400 Date: Mon, 15 Aug 2022 11:34:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1660563292; x=1660822492; bh=kXjQ01G8yNKTSiVQOJiwdINl+cA5dj8JIuYZsaTXJgY=; h=Date:To:From:Reply-To:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=NYNLSai93xAB83qeDFgmze7pX2tw58ecrEBZeM8Xa7LuLjITStvzPeEQ4BQ1F9pqF Zj4mH4l2cKgoaG1U0Fu3KTTE6NVwqIn4l7LLmumgZUMt3x0kKUgMTzXGhgBRtIGsNr YcENMPNHPiy9dmG48/9TZYQF8KHnzopqncRaewmYIclqe8vklcL4Wao/u+ziiV8h1k gTut95aU4NN+Be9Pbi7OCZ4sbmpKvSL0oDw/2slZD7Bg/isY0qaYIopDlJ/OofEN7c nKtn5VVr5wrFFGk9fXPlxmtPj+kQt75qe7OrZa9/evgXSrUpYOaSYOWXvFvS3Hi7vg TkXybYUUU1Y4Q== Message-ID: In-Reply-To: References: <5zuylumYe6MHtncZM72HW7QABD8W98dltQ4rU8K9sHa4ssMO_WAhwsew5RhS6WXypbT_HaVNvKLVKUx1GNvsvNicoZK3sva8lcicnhPFGKw=@protonmail.com> Feedback-ID: 5138958: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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Formbi X-ACL-Warn: , Formbi via Guix-patches X-Patchwork-Original-From: Formbi via Guix-patches via From: Formbi X-getmail-retrieved-from-mailbox: Patches Sorry, the commit got mixed up with the previous changes, I hope it's ok now: From e006cfc3d81cb19e64d62cee84db7a042aceae74 Mon Sep 17 00:00:00 2001 From: Formbi Date: Mon, 15 Aug 2022 13:31:27 +0200 Subject: [PATCH] gnu: Move wireplumber and qpwgraph to pipewire.scm. * gnu/packages/pipewire.scm: Move wireplumber and qpwgraph. * gnu/packages/linux.scm: Remove wireplumber. * gnu/packages/audio.scm: Remove qpwgraph. --- gnu/packages/audio.scm | 29 ----------------- gnu/packages/linux.scm | 30 ------------------ gnu/packages/pipewire.scm | 65 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 59 deletions(-) -- 2.37.0 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index aad86bac06..803109fb70 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5834,32 +5834,3 @@ (define-public odio-sacd and DSD streams.") (home-page "https://tari.in/www/software/odio-sacd/") (license license:gpl3+))) - -(define-public qpwgraph - (package - (name "qpwgraph") - (version "0.3.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.freedesktop.org/rncbc/qpwgraph") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xqmlbqj6ny4cpclzr8xyy6d6i392h9f1vmlbasp6xfy5b0yya94")))) - (build-system cmake-build-system) - (arguments (list #:tests? #f)) ;; no tests - (inputs (list alsa-lib - libxkbcommon - pipewire-0.3 - qtbase - qtsvg)) - (native-inputs (list pkg-config)) - (synopsis "PipeWire graph manager") - (description - "qpwgraph is a graph manager dedicated to PipeWire, using the Qt C++ -framework. It provides a visual interface to audio and video connections -managed by PipeWire.") - (home-page "https://gitlab.freedesktop.org/rncbc/qpwgraph") - (license license:gpl2))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f936dde55a..a8d6627feb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8788,36 +8788,6 @@ (define-public pipewire-0.3 vulkan-loader vulkan-headers))))) -(define-public wireplumber - (package - (name "wireplumber") - (version "0.4.6") - (source - (origin - (method git-fetch) - (uri (git-reference - (url - "https://gitlab.freedesktop.org/pipewire/wireplumber.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0g7xkgkjlxrhs49hqkwrjk2hb478gq55wwydafvvbsv78vsa7qfb")))) - (build-system meson-build-system) - (arguments - `(#:configure-flags '("-Dsystemd=disabled" - "-Dsystem-lua=true"))) - (native-inputs - (list `(,glib "bin") - pkg-config)) - (inputs (list dbus elogind glib lua pipewire-0.3)) - (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber") - (synopsis "Session / policy manager implementation for PipeWire") - (description "WirePlumber is a modular session / policy manager for -PipeWire and a GObject-based high-level library that wraps PipeWire's API, -providing convenience for writing the daemon's modules as well as external -tools for managing PipeWire.") - (license license:expat))) - (define-public ell (package (name "ell") diff --git a/gnu/packages/pipewire.scm b/gnu/packages/pipewire.scm index 2b923e0d05..9fb8ed66ab 100644 --- a/gnu/packages/pipewire.scm +++ b/gnu/packages/pipewire.scm @@ -1,4 +1,10 @@ +;;; Copyright © 2021 Josselin Poiret +;;; Copyright © 2022 Tobias Geerinckx-Rice +;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Juliana Sims ;;; Copyright © 2022 Marcel Kupiec +;;; Copyright © 2022 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +52,65 @@ (define-module (gnu packages pipewire) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph)) +(define-public wireplumber + (package + (name "wireplumber") + (version "0.4.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url + "https://gitlab.freedesktop.org/pipewire/wireplumber.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g7xkgkjlxrhs49hqkwrjk2hb478gq55wwydafvvbsv78vsa7qfb")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-Dsystemd=disabled" + "-Dsystem-lua=true"))) + (native-inputs + (list `(,glib "bin") + pkg-config)) + (inputs (list dbus elogind glib lua pipewire-0.3)) + (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber") + (synopsis "Session / policy manager implementation for PipeWire") + (description "WirePlumber is a modular session / policy manager for +PipeWire and a GObject-based high-level library that wraps PipeWire's API, +providing convenience for writing the daemon's modules as well as external +tools for managing PipeWire.") + (license license:expat))) + +(define-public qpwgraph + (package + (name "qpwgraph") + (version "0.3.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/rncbc/qpwgraph") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xqmlbqj6ny4cpclzr8xyy6d6i392h9f1vmlbasp6xfy5b0yya94")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) ;; no tests + (inputs (list alsa-lib + libxkbcommon + pipewire-0.3 + qtbase + qtsvg)) + (native-inputs (list pkg-config)) + (synopsis "PipeWire graph manager") + (description + "qpwgraph is a graph manager dedicated to PipeWire, using the Qt C++ +framework. It provides a visual interface to audio and video connections +managed by PipeWire.") + (home-page "https://gitlab.freedesktop.org/rncbc/qpwgraph") + (license license:gpl2))) + (define-public easyeffects (let ((toolchain (specification->package "gcc-toolchain@11"))) ;; for std::source_location