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