From patchwork Fri Apr 1 19:23:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Boulain X-Patchwork-Id: 38273 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 852F027BBEA; Fri, 1 Apr 2022 20:23:28 +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 ED03E27BBE9 for ; Fri, 1 Apr 2022 20:23:27 +0100 (BST) Received: from localhost ([::1]:46686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naMrn-0001Jx-4A for patchwork@mira.cbaines.net; Fri, 01 Apr 2022 15:23:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naMrW-00019v-OF for guix-patches@gnu.org; Fri, 01 Apr 2022 15:23:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naMrO-0003Gr-Dy for guix-patches@gnu.org; Fri, 01 Apr 2022 15:23:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naMrO-0005Yz-Al for guix-patches@gnu.org; Fri, 01 Apr 2022 15:23: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: Fri, 01 Apr 2022 19:23: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.164884095121324 (code B ref 54379); Fri, 01 Apr 2022 19:23:02 +0000 Received: (at 54379) by debbugs.gnu.org; 1 Apr 2022 19:22:31 +0000 Received: from localhost ([127.0.0.1]:43427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naMqs-0005Xr-Q3 for submit@debbugs.gnu.org; Fri, 01 Apr 2022 15:22:31 -0400 Received: from mail-ej1-f45.google.com ([209.85.218.45]:44735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naMqp-0005XW-IT for 54379@debbugs.gnu.org; Fri, 01 Apr 2022 15:22:28 -0400 Received: by mail-ej1-f45.google.com with SMTP id lr4so7783597ejb.11 for <54379@debbugs.gnu.org>; Fri, 01 Apr 2022 12:22:27 -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=DP3obMmW1EEZUbibP6Ck9JuYdoGVyWRhFXJmxF8WjNM=; b=oG7AuFf8rh+s1MtkmlS1QaVpIuRvMrlPZ6Cw1COajEG0hZhyegvGCeJJxBI8a5YSuJ Ee6/Swf+NtH4TCQRdlpLMXz//0Qlo68Ku3IocIUnE79ME9ho5Gqvrm8w0x5vPokyKFs7 CsaycOHRGj+lUsPCgV5kdRQ43XkE0dWzLrY75ArC5RtfD/NQqDyCCXcOaz5s4npRTJHN oHTwNBI4lsl1QL/Htz5ZdTADECjt0ysk4MOaawgyVbh2wcBd8UGKn3kKrGRfZsEHxYbG qjrRPJEnSVuBVsDzaEljYuUNwbq4AXCveYGJmJRzPOVnHe4DHdjP1ua+C2JHVkmY8GSs w4Iw== 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=DP3obMmW1EEZUbibP6Ck9JuYdoGVyWRhFXJmxF8WjNM=; b=Ght0yrWrbDj9zGXd1diJATQ6DX/GxKGizI6xUqYecVXTNlxzNXtSiBVJ7R4VeMg0rK 3dm2E34ZuV2Jjtwli+F7nzdMpyMqC62w/Mln7veP2BosAXhWHP8/WdbKshfNW0ddJYiD Eg8pE41eg84/yy4zt6HXi8j6dh++QIEtiUeMOCOB/Re754T6JTc63M6r+vNqJkvUk6of S0RjOkQ4rYMi+IyYocGT0/ZW6p7X8V87HYnaKCK6BOrd+Eao5ATEJshZYHv1L45sbrDB WOQok+eC+7DqFM40T004aPkzXfuJFGuyO3M8AT0wmD+FpZFww1SRlWLkdGdzLjCl/YcX T80Q== X-Gm-Message-State: AOAM531y/zBwRKooqG5rDaXPDQuEw6nvG3ANt9ZI8JJ+bgl5nqS7hrm7 iKEV+gYvuIrYIp5hBox9Banb4rn5F6c= X-Google-Smtp-Source: ABdhPJy5GrVlz1zGF+h0dAIiStIs+sf9kOGn/K22ZtWdn1L7NW0Zh5/8/4rJwVIM+BX6L8pFdw5pmQ== X-Received: by 2002:a17:907:c2a:b0:6e0:e1d3:2ab with SMTP id ga42-20020a1709070c2a00b006e0e1d302abmr1113425ejc.706.1648840941312; Fri, 01 Apr 2022 12:22:21 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id z13-20020a17090674cd00b006df78d85eabsm1343677ejl.111.2022.04.01.12.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 12:22:20 -0700 (PDT) From: Kevin Boulain Date: Fri, 1 Apr 2022 21:23:53 +0200 Message-Id: <20220401192354.7838-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. Finally, set the sysconfigdir to /etc to allow configuring PipeWire system-wide. * gnu/packages/linux.scm (wireplumber): Update to 0.4.9. Set the sysconfigdir to /etc to allow configuring WirePlumber 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 | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7aafcb636c..abe0185d43 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,39 +8319,49 @@ (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") #: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) (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,11 +8371,12 @@ (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"))) + "-Dsystem-lua=true" + "-Dsysconfdir=/etc"))) (native-inputs (list `(,glib "bin") pkg-config)) From patchwork Fri Apr 1 19:23:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Boulain X-Patchwork-Id: 38272 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 CC04427BBEA; Fri, 1 Apr 2022 20:23:21 +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 37E0127BBE9 for ; Fri, 1 Apr 2022 20:23:21 +0100 (BST) Received: from localhost ([::1]:46446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naMrg-0001AH-CW for patchwork@mira.cbaines.net; Fri, 01 Apr 2022 15:23:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naMrW-00019w-Qi for guix-patches@gnu.org; Fri, 01 Apr 2022 15:23:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naMrO-0003Gs-RJ for guix-patches@gnu.org; Fri, 01 Apr 2022 15:23:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naMrO-0005Z6-NX for guix-patches@gnu.org; Fri, 01 Apr 2022 15:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH 2/2] 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 19:23: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.164884095121331 (code B ref 54379); Fri, 01 Apr 2022 19:23:02 +0000 Received: (at 54379) by debbugs.gnu.org; 1 Apr 2022 19:22:31 +0000 Received: from localhost ([127.0.0.1]:43429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naMqt-0005Xt-6P for submit@debbugs.gnu.org; Fri, 01 Apr 2022 15:22:31 -0400 Received: from mail-ed1-f47.google.com ([209.85.208.47]:41857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naMqr-0005Xa-94 for 54379@debbugs.gnu.org; Fri, 01 Apr 2022 15:22:29 -0400 Received: by mail-ed1-f47.google.com with SMTP id x34so4067567ede.8 for <54379@debbugs.gnu.org>; Fri, 01 Apr 2022 12:22: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=MktT1yX9ePFCVRv9dP3RScPpArjAiY+ToJ8o/JNKnjU=; b=k045W0EEs09+btweG9A1/hCCEGh1cVs1yutoVUj5dOXH+noYTL94rKl08pPL163a4/ 9MGKfopEArbvHohNZoEDXsztKCa0Zfi5Sg9zoFKtmQv28EYXrf/C5vk2i3QBoyFo1mX+ OR86Ox44yRVyCYONO90Km6v8SyqdfWGSSjxOs5nMMtXeV1JxJStKFtrI7wl7lmk4e0/y JGc6oSGfFkmk6y9X3lCByziihnxDh1SOQ6adIO9tx/B1U6Bxo7ogfAeeqYHWK0MxQVah 3IHIi8gfsQvJcsrtAH8d5ake4kCNMQpBOhmfc79/szBDHW6jeczydJmwaNm0MNoyZids 9ndg== 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=MktT1yX9ePFCVRv9dP3RScPpArjAiY+ToJ8o/JNKnjU=; b=hL1Tb7r0fGaqaefDTiQdLq4hh5847Fh4aoU8V3LrP5ht9ib9/LFYk0k04pbz8V6U1w to2I+NsKNhyQOvZ91DCaVgCTEai6vIG8XWEULY9/h1CNwGw7v+f19UKC+K+aNB6GOiVV Vt5qQZHUdGOtcWlqOFze6p0jCzrHtjBH0nwZpX+RW8XEIhiPSwxOugA3bVXYkx4c3jwT d/BUDySTWbv+Fc+nJDre6yo7Gx6XhRE1ATAh71IOaeeDKbCwPQIBygiNI+8qSW4O8BPi re8LjnvrAvnfUmrbPlhqdcQTJgqMAa+17wobxSibxxcfpoj3pEGeZek/ee2pdAFCIivd Wnqw== X-Gm-Message-State: AOAM532nV+Sm1aOyO+S7mv/w52c+6cN9LvysCqowY3DBzDCAw/4DFz2O JI4M/VR4IsJX4m/zlquqKK2Jq+wC+jI= X-Google-Smtp-Source: ABdhPJzXsiAPMUrz+1SVhB19/G8ZXZxjbyRrVPDt+hLFiJoDxEaEqVrnXRqPv23FJaGgmJ9LW3ElCA== X-Received: by 2002:a05:6402:516c:b0:419:92c:a2a with SMTP id d12-20020a056402516c00b00419092c0a2amr22578043ede.175.1648840943202; Fri, 01 Apr 2022 12:22:23 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id z13-20020a17090674cd00b006df78d85eabsm1343677ejl.111.2022.04.01.12.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 12:22:22 -0700 (PDT) From: Kevin Boulain Date: Fri, 1 Apr 2022 21:23:54 +0200 Message-Id: <20220401192354.7838-2-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401192354.7838-1-kevinboulain@gmail.com> References: <20220401192354.7838-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 abe0185d43..74bebda024 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) (prepend avahi bluez jack-2 @@ -8380,7 +8380,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