From patchwork Sun Jan 8 09:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 45927 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 23A1927BBED; Sun, 8 Jan 2023 09:32:19 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 C098D27BBE9 for ; Sun, 8 Jan 2023 09:32:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pES1M-0007gf-2k; Sun, 08 Jan 2023 04:31:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pES1C-0007fP-CR for guix-patches@gnu.org; Sun, 08 Jan 2023 04:31:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pES18-0007z1-QZ for guix-patches@gnu.org; Sun, 08 Jan 2023 04:31:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pES18-0001yQ-K8 for guix-patches@gnu.org; Sun, 08 Jan 2023 04:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH v5 1/6] gnu: pipewire: Switch default to 0.3. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Jan 2023 09:31: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: Josselin Poiret , 'Brendan Tildesley , 54379@debbugs.gnu.org Cc: Kevin Boulain , Maxime Devos Received: via spool by 54379-submit@debbugs.gnu.org id=B54379.16731702497517 (code B ref 54379); Sun, 08 Jan 2023 09:31:02 +0000 Received: (at 54379) by debbugs.gnu.org; 8 Jan 2023 09:30:49 +0000 Received: from localhost ([127.0.0.1]:59875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pES0s-0001wp-GK for submit@debbugs.gnu.org; Sun, 08 Jan 2023 04:30:49 -0500 Received: from jpoiret.xyz ([206.189.101.64]:49714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pES0r-0001wg-4c for 54379@debbugs.gnu.org; Sun, 08 Jan 2023 04:30:45 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id D52C718531A; Sun, 8 Jan 2023 09:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1673170244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2a3RtVEgQkLVDdqnLX5GlpdvMQvpkEOthI5xxx9qvZc=; b=RsENcoIW9zd6c6GOo+qYTurdlHOs/mGRAJQgKnQIxtMoxDl/W7NZ5+TKeusx4Ui33/MdYe e/i3PyjvvjtE+5VjlgujOPvgi5oJp5/fqYep5NH1tzuJXqeU2nxpKRhLApquXlUzpUBPQy bsJHsueyA/EMiw/6KoeHJyIxvIqWfi55GtHJCc9VVUQd7Lvt+yIpby84UYOy5gjlEyP6N4 NZHbxGrtsSa5BEawT8vAhUFiITDBiMaiqT1izaGcGC046iHphn5Jss8/eqtgBMjTd0Trhr d0Np8CofA7OfIdlgd9iaWhdzhNxisQBRLo2ik9SUzuW+/FcyIUdPmXZabsen0w== Date: Sun, 8 Jan 2023 10:30:37 +0100 Message-Id: In-Reply-To: <875ydh9xw7.fsf@jpoiret.xyz> References: <875ydh9xw7.fsf@jpoiret.xyz> MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: --- 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Brendan Tildesley * gnu/packages/linux.scm (pipewire): Switch to pipewire 0.3. (pipewire-0.3): Remove variable. (wireplumber): Replace all pipewire-0.3 by pipewire. * gnu/packages/audio.scm (qpwgraph): Ditto. * gnu/packages/chromium.scm (ungoogled-chromium): Ditto. * gnu/packages/freedesktop.scm (weston, xdg-desktop-portal, xdg-desktop-portal-wlr): Ditto. * gnu/packages/gnome.scm (mutter): Ditto. * gnu/packages/kde-systemtools.scm (krfb): Ditto. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Ditto. * gnu/packages/video.scm (obs): Ditto. --- gnu/packages/audio.scm | 2 +- 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 | 79 +++++++++++--------------------- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 8 files changed, 38 insertions(+), 61 deletions(-) base-commit: 5b2d100a51f9ff98054ed8d0fd7550c777d23753 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 49e33402eb..0cefc61ca2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -6017,7 +6017,7 @@ (define-public qpwgraph (arguments (list #:tests? #f)) ;; no tests (inputs (list alsa-lib libxkbcommon - pipewire-0.3 + pipewire qtbase qtsvg)) (native-inputs (list pkg-config)) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index ed6dd9dfd1..799c2422ac 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -941,7 +941,7 @@ (define-public ungoogled-chromium opus+custom pango pciutils - pipewire-0.3 + pipewire pulseaudio qtbase-5 re2 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 515d9b9cea..6a7f738cda 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1312,7 +1312,7 @@ (define-public weston mtdev linux-pam pango - pipewire-0.3 + pipewire wayland-protocols-next xorg-server-xwayland)) (propagated-inputs @@ -2633,7 +2633,7 @@ (define-public xdg-desktop-portal ("libportal" ,libportal) ("dbus" ,dbus) ("geoclue" ,geoclue) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("fuse" ,fuse-3))) (arguments `(#:configure-flags @@ -2806,7 +2806,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 e41c3754e4..6eca063aa6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8118,7 +8118,7 @@ (define-public mutter ;; theme to please libxcursor. adwaita-icon-theme libxcursor ;for XCURSOR_PATH - pipewire-0.3 + pipewire python python-dbus python-dbusmock @@ -8160,7 +8160,7 @@ (define-public mutter libxkbfile libxrandr libxtst - pipewire-0.3 + pipewire startup-notification sysprof upower diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 96ed5cb777..455798ab8c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -270,7 +270,7 @@ (define-public krfb libxcb libxtst breeze-icons ;; default icon set - pipewire-0.3 + pipewire plasma-wayland-protocols qtbase-5 qtwayland-5 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5c8d886fbd..8d20f105cb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018, 2020 Brendan Tildesley +;;; Copyright © 2018, 2020, 2022 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu @@ -9078,7 +9078,7 @@ (define-public inputattach (define-public pipewire (package (name "pipewire") - (version "0.2.7") + (version "0.3.56") (source (origin (method git-fetch) (uri (git-reference @@ -9087,23 +9087,34 @@ (define-public pipewire (file-name (git-file-name name version)) (sha256 (base32 - "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc")) - (patches (search-patches "pipewire-0.2.7-fno-common.patch")))) + "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dsystemd=false"))) + (list + #:configure-flags + #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") + "-Dsystemd=disabled" + "-Dsession-managers=[]" + "-Dman=enabled"))) (native-inputs - (list pkg-config)) - (inputs - (list alsa-lib - dbus - eudev - ffmpeg-4 - gstreamer - gst-plugins-base - libva - sbc - sdl2)) + (list pkg-config + python-docutils)) + (inputs (list alsa-lib + avahi + bluez + dbus + eudev + ffmpeg + gst-plugins-base + gstreamer + jack-2 + ldacbt + libva + pulseaudio + sbc + sdl2 + vulkan-headers + vulkan-loader)) (home-page "https://pipewire.org/") (synopsis "Server and user space API to deal with multimedia pipelines") (description @@ -9117,40 +9128,6 @@ (define-public pipewire of Linux application development.") (license license:lgpl2.0+))) -(define-public pipewire-0.3 - (package - (inherit pipewire) - (name "pipewire") - (version "0.3.56") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PipeWire/pipewire") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) - (arguments - (list - #:configure-flags - #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") - "-Dsystemd=disabled" - "-Dsession-managers=[]" - "-Dman=enabled"))) - (native-inputs - (modify-inputs (package-native-inputs pipewire) - (prepend python-docutils))) - (inputs (modify-inputs (package-inputs pipewire) - (replace "ffmpeg" ffmpeg) - (prepend avahi - bluez - jack-2 - ldacbt - pulseaudio - vulkan-loader - vulkan-headers))))) - (define-public wireplumber (package (name "wireplumber") @@ -9172,7 +9149,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 14e0602d93..ad9ca74a6c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -338,7 +338,7 @@ (define-public webrtc-for-telegram-desktop openh264 openssl opus - pipewire-0.3 + pipewire protobuf)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e934379ff4..fc430b9196 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3457,7 +3457,7 @@ (define-public obs mbedtls-apache mesa pciutils - pipewire-0.3 + pipewire pulseaudio python qtbase-5