From patchwork Fri Apr 1 20:44:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Boulain X-Patchwork-Id: 38277 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 8658027BBEA; Fri, 1 Apr 2022 21:43:36 +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_ADSP_CUSTOM_MED, 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 0A74D27BBE9 for ; Fri, 1 Apr 2022 21:43:36 +0100 (BST) Received: from localhost ([::1]:50518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naO7L-0003B3-8Z for patchwork@mira.cbaines.net; Fri, 01 Apr 2022 16:43:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naO6p-0002pF-OO for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naO6o-0005v7-13 for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naO6n-0007uB-VX for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH 1/3] gnu: linux: update PipeWire Resent-From: Kevin Boulain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 20:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54379 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54379@debbugs.gnu.org Cc: Kevin Boulain Received: via spool by 54379-submit@debbugs.gnu.org id=B54379.164884577630343 (code B ref 54379); Fri, 01 Apr 2022 20:43:01 +0000 Received: (at 54379) by debbugs.gnu.org; 1 Apr 2022 20:42:56 +0000 Received: from localhost ([127.0.0.1]:43678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6i-0007tK-2S for submit@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:56 -0400 Received: from mail-ed1-f49.google.com ([209.85.208.49]:45646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6g-0007su-9Q for 54379@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:54 -0400 Received: by mail-ed1-f49.google.com with SMTP id u26so4286216eda.12 for <54379@debbugs.gnu.org>; Fri, 01 Apr 2022 13:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jR33lqzveC08z8JUSOOAk03LDgjVsff7EESMAMvjuAU=; b=Qm6K3i5vHwoYoVqwMqBVy8oGqL2j0KkxICxa3sO8ugihRxtGQ5WUG30Q34g+lKOXVX SmWcAD/Ub75qjrwv59XyyDWpOr/zHiWAdW+sBqzsGWSeCafmWxjfG99nNCIIkWqdc2QR MroLUrtv8gR7ySbfYvFegCFYvYoJYOEOirDmfheHD5WKE/ybMLlWtD/z3T0m+b1FNnKO q/G0usVOyJio0Gpbqcr8B56cSMMrSNWIE/aXiRYd1XIbOUH+P0uvJlTVTXV+VBG2Th6E P/vboD2vzUHJLzTkcFMbKw5umjmmMgZFDjCLaxZae+n7hq/QDb8Aqjk1TUfMobRHX8an 5jAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jR33lqzveC08z8JUSOOAk03LDgjVsff7EESMAMvjuAU=; b=oAPTpSwLZ/TDMrskrTdeW6zq0gwslnNYlDQ8MpBOH4sB/ebbH3qoEHw1T+DGwoq9OZ WAsAgPsXKf3IL0p8ipD1nq9ag0f0/jGWnMvQa3aUiwee2eQbbYfPGz+KmdnNOSRJOxi7 K9Vuic9jX6JA2w9CswDl9onRF+73yKXS/XADTjOH3JOw3Ijr5VzJYAyG8UvBt05G60J1 jNA+mL28VkH1peFzkEhXddOJzjceBXaZWQ/1oEQ1hYdENjZMInZj8QBeNuAegM5Fl8sn oadCBI3Dz4GM4MC9SNVjpRnQ0968Yb4fprWP6QgE5mqcpwanFzCL0bB6qIxpnF4GXhPd vBLQ== X-Gm-Message-State: AOAM531SxA+l2WbwLWzvQNyn1hb3ljQSbNi/Wy+ZK4ZeZdAC6ll6G4LA jvCaaZdvGcm6pScqSVC6fiu51EUTFLg= X-Google-Smtp-Source: ABdhPJy5MLh6G3HnxSut5zym/dFA1LlsTjlcvpdphFZRelqHl2J/dYATXqNzB76GeZqcMvInKZFFnw== X-Received: by 2002:a05:6402:50cf:b0:418:ee57:ed9 with SMTP id h15-20020a05640250cf00b00418ee570ed9mr22537368edb.37.1648845768170; Fri, 01 Apr 2022 13:42:48 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id i22-20020a170906251600b006d6d9081f46sm1371720ejb.150.2022.04.01.13.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:42:47 -0700 (PDT) From: Kevin Boulain Date: Fri, 1 Apr 2022 22:44:39 +0200 Message-Id: <20220401204441.8244-2-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401204441.8244-1-kevinboulain@gmail.com> References: <20220401204441.8244-1-kevinboulain@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (pipewire): Use the official repository URL instead of a mirror. Also remove sdl2 from the inputs as it's only used in tests (and is very sparsely used with PipeWire 0.3). * gnu/packages/linux.scm (pipewire-0.3): Update to 0.3.49 and use the official repository URL instead of a mirror. Also add a few more inputs to enable a few options: - libfdk to support the AAC Bluetooth codec - libsndfile to build pw-cat - libusb for Bluetooth quirks - lilv for LV2 plugins - openssl for raop-sink - readline to build pw-cli - webrtc-audio-processing for echo cancellation And python-docutils to the native inputs to generate man pages. X11 and libcanberra could be included for the X11 bell (no idea how useful that is). libcamera doesn't build with the current gstreamer version (g_memdup is deprecated). ROC doesn't appear to be in the packages yet so I'm skipping it. Finally, set the sysconfigdir to /etc to allow configuring PipeWire system-wide. --- PipeWire also supports the aptX Bluetooth codec but the situation appears to be very muddy: some distributions like Debian, Gentoo or Arch package libfreeaptx (a fork of libopenaptx to work around licensing issues) but others like Fedora or OpenSUSE refuse to do it so it's not included for now (see https://issues.guix.gnu.org/54379). --- gnu/packages/linux.scm | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7aafcb636c..40166ad36e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8281,7 +8281,7 @@ (define-public pipewire (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PipeWire/pipewire") + (url "https://gitlab.freedesktop.org/pipewire/pipewire.git") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8301,8 +8301,7 @@ (define-public pipewire gstreamer gst-plugins-base libva - sbc - sdl2)) + sbc)) (home-page "https://pipewire.org/") (synopsis "Server and user space API to deal with multimedia pipelines") (description @@ -8320,34 +8319,46 @@ (define-public pipewire-0.3 (package (inherit pipewire) (name "pipewire") - (version "0.3.43") + (version "0.3.49") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PipeWire/pipewire") + (url "https://gitlab.freedesktop.org/pipewire/pipewire.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0gp2h0sidapcqmnifl0iipdmbzb18bdh8zdi7pfywr9gsksh0cxy")))) + "1nm5in95318gw18prq4jfx5qrpkn22hvmkii7f40ngkcs3zrf5zj")))) (arguments '(#:configure-flags (list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out") "/lib/udev/rules.d") "-Dsystemd=disabled" - "-Dsession-managers=[]") + "-Dsession-managers=[]" + "-Dsysconfdir=/etc") ; System-wide configuration in /etc/pipewire. #:phases (modify-phases %standard-phases ;; Skip shrink-runpath, otherwise validate-runpath fails. (delete 'shrink-runpath)))) + (native-inputs (modify-inputs (package-native-inputs pipewire) + (prepend python-docutils))) ; For manpages. (inputs (modify-inputs (package-inputs pipewire) + ;; The libcamera plugin doesn't build with the current GStreamer + ;; version (g_memdup has to be replaced with g_memdup2 first). (prepend avahi bluez jack-2 ldacbt - pulseaudio + libfdk ; AAC Bluetooth codecs. + libsndfile ; To build pw-cat. + libusb ; Bluetooth quirks. + lilv ; LV2 plugins. + openssl ; For RAOP (AirPlay). + pulseaudio ; PulseAudio integration. + readline ; To buid pw-cli. vulkan-loader - vulkan-headers))))) + vulkan-headers + webrtc-audio-processing))))) ; For echo cancellation. (define-public wireplumber (package From patchwork Fri Apr 1 20:44:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Boulain X-Patchwork-Id: 38278 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 30F0D27BBEA; Fri, 1 Apr 2022 21:43:43 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 F092727BBE9 for ; Fri, 1 Apr 2022 21:43:42 +0100 (BST) Received: from localhost ([::1]:50780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naO7S-0003LL-5M for patchwork@mira.cbaines.net; Fri, 01 Apr 2022 16:43:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naO6p-0002pH-PE for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naO6o-0005v8-Cq for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naO6o-0007uI-BS for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH 2/3] gnu: linux: update WirePlumber Resent-From: Kevin Boulain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54379 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54379@debbugs.gnu.org Cc: Kevin Boulain Received: via spool by 54379-submit@debbugs.gnu.org id=B54379.164884577830363 (code B ref 54379); Fri, 01 Apr 2022 20:43:02 +0000 Received: (at 54379) by debbugs.gnu.org; 1 Apr 2022 20:42:58 +0000 Received: from localhost ([127.0.0.1]:43682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6k-0007td-En for submit@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:58 -0400 Received: from mail-ej1-f50.google.com ([209.85.218.50]:38625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6i-0007t2-8W for 54379@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:56 -0400 Received: by mail-ej1-f50.google.com with SMTP id r13so8276247ejd.5 for <54379@debbugs.gnu.org>; Fri, 01 Apr 2022 13:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=70ZPst9eHDnP+nCAZqtV+p/DQ8fIpaOlDe4mEqbqVvo=; b=RWq7PjifzmeAnFA19rG5BkgrrYTIp7OmFAdVfCWxUgM7KLvTzzKjjnjPiCVZ1/QySw ozgA2Bj+Zs2uY3wLQ3cVReRIkERRASVSrEqoH8mMfy5MUba6p5oegk40jHc6DRHx/pRZ u9TwXgxeOsJd2zCmM6EktAhVZ7d26PWCTSk44dPU0idtcPhVaCyPkXpc413LiGGIqbrR f/00sZGCTNrM8Cg1CqdKJK+shg6WobmEMq9ZWfecoSR7W0FyPntadPzOyTHJgOWX1XRJ ZcPeTJtoU9DR4xQVIQ3OQXzwijN9lhsZ3MjJEb+rHbNo4OlZ4AEW8R1NJ/QmVTkpby7J OmoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=70ZPst9eHDnP+nCAZqtV+p/DQ8fIpaOlDe4mEqbqVvo=; b=0e+UI61pyWmtX1r+LJc76+tui9Lb6TgYVvsoH7jIwFGzA3YTVcS5h2hDTvhSgSremq OixcSqeNNJ2Bfsho2x9huxLQ75Ml6U/ODfaxdTA9mGo2rqjg2Xblc+VrCBk9y0s+NJFs PgdYmWlFOvzX47Tzdv1CHar36jz2rzoLcLB603f3DuTUO1k5JYC/htv05bpzEqSsFUTI 7+fjUBNEP3CYgnP1sE0JxwiO4Bn/zUhMafToAvbhINC3uQGLwRC1NQm/lUSfH6DXlYbv 5vQg2vKdogl4Kia4WUoaf5EyG4BsLuj318W0fH7cT9X3aGscULrXzjYukT9MfxZk1GBg kiXQ== X-Gm-Message-State: AOAM533Bw7Kt5sZ4ob8fbbCvCSTKcdXv/WB/MYRdnnHGQkiNF4kVrWT5 IIV9HUmSbkc0lRmnnvt/DqZ0vlehZqM= X-Google-Smtp-Source: ABdhPJw2V9TZUNZvB60d7d7yjHuyL9S2fkjNJCL8ZrYiQVct+jEIPabdAZn1sInFG9XxgPwvmmP6tA== X-Received: by 2002:a17:907:7fa2:b0:6d8:2397:42 with SMTP id qk34-20020a1709077fa200b006d823970042mr1387840ejc.218.1648845770226; Fri, 01 Apr 2022 13:42:50 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id i22-20020a170906251600b006d6d9081f46sm1371720ejb.150.2022.04.01.13.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:42:49 -0700 (PDT) From: Kevin Boulain Date: Fri, 1 Apr 2022 22:44:40 +0200 Message-Id: <20220401204441.8244-3-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401204441.8244-1-kevinboulain@gmail.com> References: <20220401204441.8244-1-kevinboulain@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (wireplumber): Update to 0.4.9. Set the sysconfigdir to /etc to allow configuring WirePlumber system-wide. --- gnu/packages/linux.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 40166ad36e..5b9b2d5ca5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8363,7 +8363,7 @@ (define-public pipewire-0.3 (define-public wireplumber (package (name "wireplumber") - (version "0.4.6") + (version "0.4.9") (source (origin (method git-fetch) @@ -8373,11 +8373,13 @@ (define-public wireplumber (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0g7xkgkjlxrhs49hqkwrjk2hb478gq55wwydafvvbsv78vsa7qfb")))) + (base32 "0m90ymkrrcqrgr3y8x6i6836w0m3anlrv2masww9050lw77aipak")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dsystemd=disabled" - "-Dsystem-lua=true"))) + `(#:configure-flags + '("-Dsystemd=disabled" + "-Dsystem-lua=true" + "-Dsysconfdir=/etc"))) ; System-wide configuration in /etc/wireplumber. (native-inputs (list `(,glib "bin") pkg-config)) From patchwork Fri Apr 1 20:44:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Boulain X-Patchwork-Id: 38276 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 ED80727BBEA; Fri, 1 Apr 2022 21:43:26 +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_ADSP_CUSTOM_MED, 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 5A54627BBE9 for ; Fri, 1 Apr 2022 21:43:26 +0100 (BST) Received: from localhost ([::1]:50072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naO7B-0002qa-Bu for patchwork@mira.cbaines.net; Fri, 01 Apr 2022 16:43:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naO6p-0002pI-PL for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naO6o-0005v9-QH for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naO6o-0007uP-Or for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH 3/3] gnu: rename pipewire to pipewire-0.2 and pipewire-0.3 to pipewire Resent-From: Kevin Boulain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54379 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54379@debbugs.gnu.org Cc: Kevin Boulain Received: via spool by 54379-submit@debbugs.gnu.org id=B54379.164884577930370 (code B ref 54379); Fri, 01 Apr 2022 20:43:02 +0000 Received: (at 54379) by debbugs.gnu.org; 1 Apr 2022 20:42:59 +0000 Received: from localhost ([127.0.0.1]:43684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6k-0007tg-MV for submit@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:59 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:37432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6j-0007tA-DT for 54379@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:57 -0400 Received: by mail-ej1-f53.google.com with SMTP id bg10so8285636ejb.4 for <54379@debbugs.gnu.org>; Fri, 01 Apr 2022 13:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lis/VbiTXNWQzvA+mLJVbqi5U8T9H0fzITJaofNthEQ=; b=GgHHEBcXd4LFBew0N4edbpgBB6IaSVzVuinJOsLAmsr54hVGObnzT5vJ440JO7HvG9 +kQEGoYdkProzkxvxDwzp5EBXNoDj3Rh5zktiiabZVFydHhUe8cCpWokD7pw8b6BHWKN V49hjapargCqkqWAxFCfNep43TD7hdy5XuGxYgJcCSiC5Q1IziWJbrXKPauF0r7jhSsh TJzXLBZdDOWzNQGSnL0RjC0Ulpwyx26ODXBVbnPj3bgSUnjlfkGqhPOY0O6HKyiMhJ1z uIHrSXPXNbRs42ACVMtRkx3r21iu8IMM09KWBY9VuXYFnMVmsyRl7EtoU6nwe+A+nfCp vaSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lis/VbiTXNWQzvA+mLJVbqi5U8T9H0fzITJaofNthEQ=; b=cXagk2U+OygLpuJzYUnd5DDFnoZQTFsZIbgauaiRGqiPBs+RK75mCFXhyfQm0c8iNY 8CSGrbOS1t5Bdqwj2qmXJoVlQ9t7DystFU2LTQsfvUugFfseBVBsI9KKW9Zrl7BX8VzL nIWGmqUzzAzy0N6iTm87NfQN6dIOxSLBQL3II2tjcz4z60ZIMQ3BAOCNeoZH86bDMRfU KYyUpzalbiX9QGY2bUpybY1wuRnFPcmB4J3ZUe/BvsvYLXyR2PUouLflGrXVcaYsjsLx lXcvd64Q3gdSbxeVqPZj4rj7K4GgXyp3ocn/IjzPiLr9W8lNCdO6WvBoxPkQPFjLMksP HHfQ== X-Gm-Message-State: AOAM533q0auCTu68lVLYIo7/tRgNrZwMg5+cvJ3yLbYFy7AS0UBCgJiJ s8Cdsn4W0Wc71jjoqasgaX0ugYQtP8U= X-Google-Smtp-Source: ABdhPJxI3M3ErH9+p68BDiCmrrdvDmp+p7nV+pyrS4mTwr39mzI2WbeFYTy9jMi4pVW3mBuX3h5Zng== X-Received: by 2002:a17:907:869f:b0:6da:888b:4258 with SMTP id qa31-20020a170907869f00b006da888b4258mr1374174ejc.720.1648845771471; Fri, 01 Apr 2022 13:42:51 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id i22-20020a170906251600b006d6d9081f46sm1371720ejb.150.2022.04.01.13.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:42:51 -0700 (PDT) From: Kevin Boulain Date: Fri, 1 Apr 2022 22:44:41 +0200 Message-Id: <20220401204441.8244-4-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401204441.8244-1-kevinboulain@gmail.com> References: <20220401204441.8244-1-kevinboulain@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/chromium.scm (ungoogled-chromium): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/freedesktop.scm (weston): Change inputs from pipewire to pipewire-0.2. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/gnome.scm (mutter): Change native-inputs and inputs from pipewire-0.3 to pipewire. * gnu/packages/kde-systemtools.scm (krfb): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/linux.scm (pipewire): Rename to pipewire-0.2. * gnu/packages/linux.scm (pipewire-0.3): Rename to pipewire. * gnu/packages/linux.scm (wireplumber): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Change inputs from pipewire to pipewire-0.2. * gnu/packages/video.scm (obs): Change inputs from pipewire-0.3 to pipewire. --- gnu/packages/chromium.scm | 2 +- gnu/packages/freedesktop.scm | 6 +++--- gnu/packages/gnome.scm | 4 ++-- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/linux.scm | 12 ++++++------ gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7ef1e5ac1b..f60c9719fe 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -849,7 +849,7 @@ (define-public ungoogled-chromium opus+custom pango pciutils - pipewire-0.3 + pipewire pulseaudio re2 snappy diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 55bde8e705..b1248c466d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1120,7 +1120,7 @@ (define-public weston ("mtdev" ,mtdev) ("linux-pam" ,linux-pam) ("pango" ,pango) - ("pipewire" ,pipewire) + ("pipewire" ,pipewire-0.2) ("wayland-protocols" ,wayland-protocols) ("xorg-server-xwayland" ,xorg-server-xwayland))) (propagated-inputs @@ -2313,7 +2313,7 @@ (define-public xdg-desktop-portal ("libportal" ,libportal) ("dbus" ,dbus) ("geoclue" ,geoclue) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("fuse" ,fuse))) (arguments `(#:phases @@ -2442,7 +2442,7 @@ (define-public xdg-desktop-portal-wlr grim iniparser libinih - pipewire-0.3 + pipewire slurp wayland wayland-protocols)) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8ff59f084b..41b1a1c010 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7557,7 +7557,7 @@ (define-public mutter ;; theme to please libxcursor. ("adwaita-icon-theme" ,adwaita-icon-theme) ("libxcursor" ,libxcursor) ;for XCURSOR_PATH - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("python" ,python) ("python-dbus" ,python-dbus) ("python-dbusmock" ,python-dbusmock) @@ -7600,7 +7600,7 @@ (define-public mutter ("libxkbfile" ,libxkbfile) ("libxrandr" ,libxrandr) ("libxtst" ,libxtst) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("startup-notification" ,startup-notification) ("sysprof" ,sysprof) ("upower-glib" ,upower) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 3fab9089f3..205cd24e9d 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -254,7 +254,7 @@ (define-public krfb libxcb libxtst oxygen-icons ;; default icon set - pipewire-0.3 + pipewire qtbase-5 qtx11extras xcb-util-image diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5b9b2d5ca5..11ffe04c50 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8274,7 +8274,7 @@ (define-public inputattach types and interfaces and translates so that the X server can use them.") (license license:gpl2+))) -(define-public pipewire +(define-public pipewire-0.2 (package (name "pipewire") (version "0.2.7") @@ -8315,9 +8315,9 @@ (define-public pipewire of Linux application development.") (license license:lgpl2.0+))) -(define-public pipewire-0.3 +(define-public pipewire (package - (inherit pipewire) + (inherit pipewire-0.2) (name "pipewire") (version "0.3.49") (source (origin @@ -8340,9 +8340,9 @@ (define-public pipewire-0.3 (modify-phases %standard-phases ;; Skip shrink-runpath, otherwise validate-runpath fails. (delete 'shrink-runpath)))) - (native-inputs (modify-inputs (package-native-inputs pipewire) + (native-inputs (modify-inputs (package-native-inputs pipewire-0.2) (prepend python-docutils))) ; For manpages. - (inputs (modify-inputs (package-inputs pipewire) + (inputs (modify-inputs (package-inputs pipewire-0.2) ;; The libcamera plugin doesn't build with the current GStreamer ;; version (g_memdup has to be replaced with g_memdup2 first). (prepend avahi @@ -8383,7 +8383,7 @@ (define-public wireplumber (native-inputs (list `(,glib "bin") pkg-config)) - (inputs (list dbus elogind glib lua pipewire-0.3)) + (inputs (list dbus elogind glib lua pipewire)) (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber") (synopsis "Session / policy manager implementation for PipeWire") (description "WirePlumber is a modular session / policy manager for diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c5efc50b9..4213ac6e4e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -166,7 +166,7 @@ (define-public webrtc-for-telegram-desktop ("libxrandr" ,libxrandr) ("openssl" ,openssl) ("opus" ,opus) - ("pipewire" ,pipewire) + ("pipewire" ,pipewire-0.2) ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("x11" ,libx11) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc05c0a222..a5298ccfac 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3429,7 +3429,7 @@ (define-public obs libxcomposite mbedtls-apache mesa - pipewire-0.3 + pipewire pulseaudio qtbase-5 qtsvg