Message ID | 20220313223533.9632-1-kevinboulain@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ADCA427BBEA; Sun, 13 Mar 2022 22:35:12 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 4577627BBE9 for <patchwork@mira.cbaines.net>; Sun, 13 Mar 2022 22:35:12 +0000 (GMT) Received: from localhost ([::1]:57024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1nTWnv-0003UY-Du for patchwork@mira.cbaines.net; Sun, 13 Mar 2022 18:35:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nTWnm-0003U8-MP for guix-patches@gnu.org; Sun, 13 Mar 2022 18:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nTWnm-0004ey-Ds for guix-patches@gnu.org; Sun, 13 Mar 2022 18:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nTWnl-0000Rw-UZ for guix-patches@gnu.org; Sun, 13 Mar 2022 18:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH] gnu: linux: update PipeWire & WirePlumber Resent-From: Kevin Boulain <kevinboulain@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Mar 2022 22:35:01 +0000 Resent-Message-ID: <handler.54379.B.16472108781688@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54379 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54379@debbugs.gnu.org Cc: Kevin Boulain <kevinboulain@gmail.com> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16472108781688 (code B ref -1); Sun, 13 Mar 2022 22:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Mar 2022 22:34:38 +0000 Received: from localhost ([127.0.0.1]:43543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1nTWnO-0000R9-3r for submit@debbugs.gnu.org; Sun, 13 Mar 2022 18:34:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:47478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <kevinboulain@gmail.com>) id 1nTWnM-0000R2-VC for submit@debbugs.gnu.org; Sun, 13 Mar 2022 18:34:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <kevinboulain@gmail.com>) id 1nTWnM-0003TG-Jg for guix-patches@gnu.org; Sun, 13 Mar 2022 18:34:36 -0400 Received: from [2a00:1450:4864:20::52d] (port=35343 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <kevinboulain@gmail.com>) id 1nTWnL-0004c4-1K for guix-patches@gnu.org; Sun, 13 Mar 2022 18:34:36 -0400 Received: by mail-ed1-x52d.google.com with SMTP id y22so17466328eds.2 for <guix-patches@gnu.org>; Sun, 13 Mar 2022 15:34:29 -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:mime-version :content-transfer-encoding; bh=Lsp4o0OofXP2rR3+6IeM1qM0XT2WkBGFn0gz3678FTI=; b=BKxlvRMokHdN91FBDvB14FNvvGQRAlfXTRC9HHz9oguHi0NaCpRyZd00igvXRC7y1u cJP2Ulu6Tm3bBd5e4xTi3PqRfYQg6hZqT4jv9V/MnmQjT+WTdyJRWySrNtag137BNCOS A10Mvk2EZ5VCKwPVeD/pgY9JxAlDESW0x1oE49uRD45Nj5xa2S85j1u3wROkH72rmX+V xKDV1ixN6EjeDcFk/Ng8dw4+XtZR8voVOK9zBaspI3nGwozx1/TOVC924kvAJxz6gVQs 8OE7/HnSR4ic+kEmOMT7bK7ERRB0opjRkO8Jl1O0zT4A74Ft/nXtA+E2YCcj3B7/w0J1 3OcA== 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:mime-version :content-transfer-encoding; bh=Lsp4o0OofXP2rR3+6IeM1qM0XT2WkBGFn0gz3678FTI=; b=kWQTvSjAnIMtJB0WxEsb6WSePCKv/Fi8zh47BB7azRM5vJh8scR3BCoIhkECLqhQHr 7J/nXMRVwvnTAxTwfxQcRpfPUDKHH1B61fLXhXoZ0crKSwv9WirWzOfFLwyCLjtdizop /j4x8T4yGvbsvCU6DBpnvRJc3LND2C+5rtUmBDNNGCfMuRoJQ4d7VBU5K8hOgGNxzJjG /45gsXF5Fk4sgUhDkdFd5G9MUD8OMhW4GLG5miuXi2FFnnO8oQZH2JArd/HNw83XPlNR uZKKT11SctWaM4vMEZGeaAbZA8zxQoa7wYE2nOnKzYfLagXayLosFPPb9ip4JNAjlInc flqA== X-Gm-Message-State: AOAM531ww5u97QH+acNwEt5yD9bAHxrzVUF5iYWFB6yZ5jR+UIhU+JbR H5SNI6vELw6kR7UA7aNu4nBFNM7qRNs= X-Google-Smtp-Source: ABdhPJx7Q3HY1b5h2EWMEc2hrFBYQCahaw8vSPSE8+mJgA0PCwwGLYweXnzeudhP3gREwReilqd6Hw== X-Received: by 2002:a50:dacb:0:b0:416:ac0f:cee2 with SMTP id s11-20020a50dacb000000b00416ac0fcee2mr17170139edj.199.1647210867480; Sun, 13 Mar 2022 15:34:27 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id o23-20020a170906861700b006da745f7233sm6010175ejx.5.2022.03.13.15.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Mar 2022 15:34:26 -0700 (PDT) From: Kevin Boulain <kevinboulain@gmail.com> Date: Sun, 13 Mar 2022 23:35:33 +0100 Message-Id: <20220313223533.9632-1-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=kevinboulain@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
Series |
[bug#54379] gnu: linux: update PipeWire & WirePlumber
|
|
Commit Message
Kevin Boulain
March 13, 2022, 10:35 p.m. UTC
* gnu/packages/linux.scm (pipewire-0.3): Update to 0.3.48. Also add a few more inputs to PipeWire to enable a few options: - libfdk to support the AAC Bluetooth codec - libsndfile to build pw-cat * gnu/packages/linux.scm (wireplumber): Update to 0.4.8. --- 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 other like Fedora or OpenSUSE refuse to do it. --- gnu/packages/linux.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Comments
On Fri, 1 Apr 2022 at 21:34, Maxime Devos <maximedevos@telenet.be> wrote: > What's the impact on the output closure size? I assume you mean ./pre-inst-env guix size pipewire? store item total self /gnu/store/vbcfrng1aadxa79g7f8mlgm7wp9dzqwf-mesa-21.3.2 411.5 169.5 21.2% /gnu/store/fvfymzksvj8k6pc54gmhx2lnvkxysfd8-llvm-11.0.0 221.5 149.5 18.7% /gnu/store/b6j1qw1a5rkbfvcy7lc9fm95abbzpa4x-python-3.9.9 155.3 63.7 8.0% /gnu/store/cnfsv9ywaacyafkqdqsv2ry8f01yr7a9-guile-3.0.7 129.1 52.0 6.5% /gnu/store/hzic3ddl5yvnyw7gm4a0qc5icgqy2442-icu4c-69.1 110.7 38.0 4.7% /gnu/store/5h2w4qi9hk1qzzgi1w83220ydslinr4s-glibc-2.33 38.3 36.6 4.6% /gnu/store/094bbaq6glba86h1d4cj16xhdi6fk2jl-gcc-10.3.0-lib 71.7 33.4 4.2% /gnu/store/6qlv57cr2xz37sarbwiv6ksqabf589p6-iso-codes-4.5.0 18.5 18.5 2.3% /gnu/store/78b0194wv2d5vrqr408x2m2ndfy11j7j-eudev-3.2.11 102.2 17.7 2.2% /gnu/store/84bvs9y0arsimxd2ay26a57xkqw7nsqm-glib-2.70.2 98.1 15.3 1.9% /gnu/store/rvirnmnxxm2ymqgcxcnj3dxvnrnqlk0l-fftwf-3.3.8 85.9 13.2 1.6% /gnu/store/614385afpnp5kcnixhrz5mz3fnbgyqkf-gst-plugins-base-1.18.5 656.1 12.8 1.6% /gnu/store/df3ghmicrls14q2zcaj86217dicgnzs7-gstreamer-1.18.5 196.6 10.5 1.3% /gnu/store/ln5dqqs2wkhhaqrpib5xqga0m1wpj028-pipewire-0.3.49 799.5 10.2 1.3% /gnu/store/gkjna040y14xvk4y5mcccvjkkmdcvmnv-font-dejavu-2.37 9.8 9.8 1.2% /gnu/store/5583c2za2jsn9g6az79rnksgvigwnsk7-util-linux-2.37.2-lib 80.7 9.0 1.1% /gnu/store/84v5kpb4wcag0q173rq1jc9ajc953455-pulseaudio-15.0 304.1 8.9 1.1% /gnu/store/3dy6pwfayfwdmf9y3rm4yaryzxkbdqv7-libical-3.0.10 149.6 7.5 0.9% /gnu/store/9rrnm5hdjw7cy96a2a9rfgh6y08wsbmf-ncurses-6.2.20210619 77.6 5.9 0.7% /gnu/store/zkl2vfmlifcyxphidx5nbv177qs9ziaz-harfbuzz-2.8.2 147.3 5.5 0.7% /gnu/store/plr00nij45964cyy7sfcg5rcsi8hks0h-openssl-1.1.1l 77.2 5.5 0.7% [...] total: 799.5 MiB Do you need the full output (where should I paste it)? WirePumber doesn't add much: [...] /gnu/store/x4aak1x0l6wvb229zdqh3lh94bf2kl0j-wireplumber-0.4.9 802.3 1.5 0.2% /gnu/store/wa7cjcx12pgx2zpk2psmlpxkmkqn79ri-lua-5.3.5 80.3 1.3 0.2% [...] total: 802.3 MiB > For future reference, I would put this information in comments in the > package definition. That seems much more convenient to me than having > to dig through the git history. I wasn't too sure if that's common style, but I also prefer commenting the dependencies when they aren't obvious. Done. On Fri, 1 Apr 2022 at 21:41, Maxime Devos <maximedevos@telenet.be> wrote: > Looks like some of these are only used for some plugins. Yeah, most of them. > Can plugins be built separately? If they are built separately (and > hence, the 'main' pipewire package does not have these extra packages), > then updating, say, lilv, would cause less rebuilds. I've no idea how that works on Guix, I assume it's not as simple as with other distributions where all libraries/plugins can be found in a single place (/lib). Do you have an example? I agree it would be nicer and I'm happy to split the package (talking about plugins, do you happen to have some pointers for https://issues.guix.gnu.org/54379#5?). On Fri, 1 Apr 2022 at 21:42, Maxime Devos <maximedevos@telenet.be> wrote: > Can this be updated in a separate patch or are pipewire and wireplumber > too intertwined? It builds and plays sound. I've split the commit. Kevin Boulain (3): gnu: linux: update PipeWire gnu: linux: update WirePlumber gnu: rename pipewire to pipewire-0.2 and 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 | 49 ++++++++++++++++++++------------ gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 7 files changed, 40 insertions(+), 27 deletions(-)
Kevin Boulain schreef op vr 01-04-2022 om 22:44 [+0200]: > I assume you mean ./pre-inst-env guix size pipewire? > store item total self > [...] > Do you need the full output (where should I paste it)? More concretely, I'm wondering what the impact is of the new inputs: + libfdk + libsndfile + libusb + lilv + openssl + readline + webrtc-audio-processing What are their 'total self percentage' values? Greetings, Maxime.
Kevin Boulain schreef op vr 01-04-2022 om 22:44 [+0200]: > I've no idea how that works on Guix, I assume it's not as simple as with other > distributions where all libraries/plugins can be found in a single place (/lib). > Do you have an example? Maybe have a look at how audacity searches AUDACITY_MODULE_PATH and 'dlopen's things? Or BASH_LOADABLES_PATH. Greetings, Maxime.
On Sat, 2 Apr 2022 at 18:19, Maxime Devos <maximedevos@telenet.be> wrote: > More concretely, I'm wondering what the impact is of the new inputs: > [...] > What are their 'total self percentage' values? Right, so just to make sure we're on the same page: - guix size pipewire before this patch: https://paste.debian.net/hidden/57a05080/ - guix size pipewire after this patch: https://paste.debian.net/hidden/cbb93545/ - diff: https://paste.debian.net/hidden/3cb51fbd/ Surprisingly there isn't that much of an increase (~5MiB). That's because most of the new dependencies were already pulled in by existing dependencies. For example, PulseAudio was pulling libsndfile & webrtc-audio-processing. Bluez was pulling readline. I traced one OpenSSL use back to a ffmpeg plugin dependency (rav1e's rust-cargo-c, it's also used by other things but the Graphviz graph is too big to generate a visualization). This leaves us with only these new dependencies (see diff): libfdk-2.0.1 75.2 3.5 0.4% libusb-1.0.24 72.1 0.4 0.0% lilv-0.24.12 74.0 0.3 0.0% serd-0.30.8 71.9 0.2 0.0% sord-0.16.8 73.7 0.1 0.0% sratom-0.6.6 73.7 0.1 0.0%
Kevin Boulain schreef op za 02-04-2022 om 20:33 [+0200]: > Surprisingly there isn't that much of an increase (~5MiB). That's > because most of the new dependencies were already pulled in by > existing dependencies. Ok, that doesn't seem too bad. Greetings, Maxime.
Friendly ping: what's the status of these patches? Are we waiting to see if the extra functionaly can be provided as separate plug-in packages so they won't clutter up the dependency graph? Thanks, Jack
On 18-08-2022 22:46, Jack Hill wrote: > Friendly ping: what's the status of these patches? Are we waiting to > see if the extra functionaly can be provided as separate plug-in > packages so they won't clutter up the dependency graph? AFAIK, no, it would be useful but AFAIK not a blocker. AFAIK the only thing we are waiting for is for someone to commit the patches. Though as a reminder, I only looked at the patches, I didn't check the source diff for various forms of 'badness'. Greetings, Maxime.
Now that weston has been update to 10, it appears there isn't anything else in Guix that requires pipewire 0.2. I notice in your last patchset Kevin, you set Telegram to use pipewire 0.2, but I'm not aware of any reason that in needs it? Was that intentional? Apologies in advance for 1) highjacking your submission with my own patchset, and 2) Messing up commit messages and other basic things I always forget.
Same as v3 but uses PREFIX instead of DESTDIR for libfreeaptx.
On Sun, 9 Oct 2022 at 06:02, 'Brendan Tildesley <mail@brendan.scot> wrote: > Now that weston has been update to 10, it appears there isn't anything else in > Guix that requires pipewire 0.2. I notice in your last patchset Kevin, you set > Telegram to use pipewire 0.2, but I'm not aware of any reason that in needs it? Most of the packages depended on PipeWire 0.3 but a few still depended on PipeWire 0.2. Because I couldn't test all of them, I went for a minimal change and kept the same PipeWire version as previously declared in the dependencies (but renamed 'pipewire' to 'pipewire-0.2' and 'pipewire-0.3' to 'pipewire' to make updates easier). So no reason in particular besides that I didn't test if Telegram was still working with a newer version.
Hi Brendan and Kevin,
'Brendan Tildesley <mail@brendan.scot> writes:
> Same as v3 but uses PREFIX instead of DESTDIR for libfreeaptx.
This patch totally flew under my radar before, but now that I wanted to
add aptX support I finally found it (after writing the libfreeaptx
definition myself first :p).
Looks good overall, I'm using it without any issues, but I have a couple
of very small nitpicks:
* First of all, patch 1 doesn't cleanly apply on master anymore (which
is normal). To make it easier for maintainers to merge your patches,
you should specify base-commit in your patches using the --base
option, so that they know what patch this was supposed to cleanly
apply on;
* in patch 5, you apparently left an entry in the commit message about
the `/etc` change, even though you separated it into its own commit;
* while we're at it, there's a small typo in patch 1's commit message,
`theinput` -> `the input`;
* if you're inheriting patches from someone else, you should consider
either leaving them as the primary author if you're keeping their
changes as-is, or putting them in the commit message as
Co-authored-by:. It's not really an issue here I think, but something
to remember.
Best,
Hi again both of you, To avoid letting this patch rot in the MLs for too long, I can pick it up, rebase it and fix up the commit messages, unless you plan to work further on it. I can also update the programs to latest while I'm at it. Unless there are objections, I'll try doing that in the upcoming week(s). Best,
Hi, Josselin Poiret <dev@jpoiret.xyz> writes: > To avoid letting this patch rot in the MLs for too long, I can pick it > up, rebase it and fix up the commit messages, unless you plan to work > further on it. I can also update the programs to latest while I'm at > it. I've done the above, here's an updated and cleaned patchset. Best,
Hello,
> I've done the above, here's an updated and cleaned patchset.
I just pushed the latest patchset.
Thanks everyone,
Mathieu
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7ebf54c18..1d1429cdbd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8280,7 +8280,7 @@ (define-public pipewire-0.3 (package (inherit pipewire) (name "pipewire") - (version "0.3.43") + (version "0.3.48") (source (origin (method git-fetch) (uri (git-reference @@ -8289,7 +8289,7 @@ (define-public pipewire-0.3 (file-name (git-file-name name version)) (sha256 (base32 - "0gp2h0sidapcqmnifl0iipdmbzb18bdh8zdi7pfywr9gsksh0cxy")))) + "0abi8z7rfzspsiydc5j5l0x3dqizs5hf726xq30n32jqkwq3y2gs")))) (arguments '(#:configure-flags (list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out") @@ -8305,6 +8305,8 @@ (define-public pipewire-0.3 bluez jack-2 ldacbt + libfdk + libsndfile pulseaudio vulkan-loader vulkan-headers))))) @@ -8312,7 +8314,7 @@ (define-public pipewire-0.3 (define-public wireplumber (package (name "wireplumber") - (version "0.4.6") + (version "0.4.8") (source (origin (method git-fetch) @@ -8322,7 +8324,7 @@ (define-public wireplumber (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0g7xkgkjlxrhs49hqkwrjk2hb478gq55wwydafvvbsv78vsa7qfb")))) + (base32 "1xhbymfml6k6l1iqgfbibgbai3j2mb9fkiyvcmk1w7nap21f01y7")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dsystemd=disabled"