From patchwork Wed Mar 30 19:18:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Boulain X-Patchwork-Id: 38224 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 BEE1927BBEA; Wed, 30 Mar 2022 20:17:16 +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 3C6A027BBE9 for ; Wed, 30 Mar 2022 20:17:16 +0100 (BST) Received: from localhost ([::1]:37520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZdoh-0001nW-CK for patchwork@mira.cbaines.net; Wed, 30 Mar 2022 15:17:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZdoU-0001mj-UG for guix-patches@gnu.org; Wed, 30 Mar 2022 15:17:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43137) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZdoU-0003FP-K6 for guix-patches@gnu.org; Wed, 30 Mar 2022 15:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZdoU-0000FL-Fd for guix-patches@gnu.org; Wed, 30 Mar 2022 15:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH 1/2] gnu: linux: update PipeWire & WirePlumber References: <20220313223533.9632-1-kevinboulain@gmail.com> In-Reply-To: <20220313223533.9632-1-kevinboulain@gmail.com> Resent-From: Kevin Boulain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Mar 2022 19:17: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.1648667790894 (code B ref 54379); Wed, 30 Mar 2022 19:17:02 +0000 Received: (at 54379) by debbugs.gnu.org; 30 Mar 2022 19:16:30 +0000 Received: from localhost ([127.0.0.1]:37031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZdny-0000EM-3z for submit@debbugs.gnu.org; Wed, 30 Mar 2022 15:16:30 -0400 Received: from mail-ej1-f44.google.com ([209.85.218.44]:43644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZdnw-0000E4-AI for 54379@debbugs.gnu.org; Wed, 30 Mar 2022 15:16:29 -0400 Received: by mail-ej1-f44.google.com with SMTP id bq8so29535639ejb.10 for <54379@debbugs.gnu.org>; Wed, 30 Mar 2022 12:16:28 -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=nFTzCOj8kDoUBIIJ9uqdWfY5DYDadY41wHSmDrMSEkk=; b=FPrX9AzIoqOmVXWdyDTUWNnHn+KsqN15p5SG4qQkqr1T5A/Z5jRPFgMFiIAPLowgcn A2ajAwSQ8yuxAOYosQIsu3yXJNenG3DfPQngP0RHivVwuqMabj1rRiT393WNAdxp7+jR TZMDa8KxSP2MoA0X9S7HtK8sd+zLKpAWuOaE32OF7sQow6NCaOFOTKGOsSpv7B5vHVel VivQ08OUoZGqg87/pD5BleMt3eLYEFmw8lHR1cTviMxvD+c9N93iZzqpfJvFnNtLlmtT Owz8SbZAvxGtKy4LdvvT3UWpfXZynRTJZYANqlEn9/yoRiVe3OB0ESyTssS95t2UNJLz 0ksA== 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=nFTzCOj8kDoUBIIJ9uqdWfY5DYDadY41wHSmDrMSEkk=; b=O7OK58wIbcthB2tPRAFFQ5nWi49QCfBP+eHB1Gbisnth6LojfxrvKwFyvbXjiAL+CC iNe9sFXGkG0cBQS79mos2dCNW9oBsDWYKXjV8JPzjdpf48bPvkp43+crrGCGsFidEt9S v74V4PZY1EHJv/9KRyM7lvQZ7gBO8EbXsnW+W/GIc5xqe+MUnUNv4872/Okibw+sArJj RuU/E2HCtK2SPeWsIfawEPVS3pqD+FJxg1HUdr/SqNJaRNpvEIA8yvIJX/limf5+TPBV xRslkk/VgNksmU3oexnWHGLosQHVyIyGaS5P7sYrbuUQ83t5NhpZ8+ZibZkqqn/pUcb2 3gKQ== X-Gm-Message-State: AOAM5325smEr36yzO0omNE1TKTce0D8TiIKxHD4gpiz0MNUP42VhRYzl f6716UOtWA1t9QOuSdtAZU6019uyadFLeQ== X-Google-Smtp-Source: ABdhPJxBZOvyuZ34G2KJHizweEa3FCYw1PSzyHy/E+v8/DySzGpzz2m5NWLRxi3aYvFRVAW134xbAA== X-Received: by 2002:a17:906:c104:b0:6e4:a223:1af9 with SMTP id do4-20020a170906c10400b006e4a2231af9mr1121176ejc.441.1648667782191; Wed, 30 Mar 2022 12:16:22 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id v17-20020a170906339100b006e11af84acasm3449306eja.128.2022.03.30.12.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 12:16:21 -0700 (PDT) From: Kevin Boulain Date: Wed, 30 Mar 2022 21:18:17 +0200 Message-Id: <20220330191818.5933-1-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 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. * gnu/packages/linux.scm (wireplumber): Update to 0.4.9. --- 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 | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7aafcb636c..11330410ce 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,16 +8319,16 @@ (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") @@ -8340,19 +8339,28 @@ (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) + (prepend python-docutils))) ; For manpages. (inputs (modify-inputs (package-inputs pipewire) (prepend avahi bluez jack-2 ldacbt + libfdk + libsndfile + libusb + lilv + openssl pulseaudio + readline vulkan-loader - vulkan-headers))))) + vulkan-headers + webrtc-audio-processing))))) (define-public wireplumber (package (name "wireplumber") - (version "0.4.6") + (version "0.4.9") (source (origin (method git-fetch) @@ -8362,7 +8370,7 @@ (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"