From 590700ce00177a826872c867066eeba6eb7c4641 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 8 Jan 2023 10:30:37 +0100 Subject: gnu: pipewire: Switch default to 0.3. * 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. Signed-off-by: Mathieu Othacehe --- 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(-) 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 @@ and DSD streams.") (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 @@ 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 d63fe8f7ca..130a7adec4 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1372,7 +1372,7 @@ compositor.") mtdev linux-pam pango - pipewire-0.3 + pipewire wayland-protocols-next xorg-server-xwayland)) (propagated-inputs @@ -2693,7 +2693,7 @@ compatible with the well-known scripts of the same name.") ("libportal" ,libportal) ("dbus" ,dbus) ("geoclue" ,geoclue) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("fuse" ,fuse-3))) (arguments `(#:configure-flags @@ -2866,7 +2866,7 @@ for xdg-desktop-portal that is using Qt/KF5.") grim iniparser libinih - pipewire-0.3 + pipewire slurp wayland wayland-protocols)) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b5273b5c06..09b8056cc9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8118,7 +8118,7 @@ to display dialog boxes from the commandline and shell scripts.") ;; theme to please libxcursor. adwaita-icon-theme libxcursor ;for XCURSOR_PATH - pipewire-0.3 + pipewire python python-dbus python-dbusmock @@ -8160,7 +8160,7 @@ to display dialog boxes from the commandline and shell scripts.") 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 @@ This package is part of the KDE base applications module.") 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 @@ types and interfaces and translates so that the X server can use them.") (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 @@ types and interfaces and translates so that the X server can use them.") (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 @@ and Flatpak we expect PipeWire to provide a core building block for the future 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 @@ of Linux application development.") (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 @@ 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 @@ be used for realtime video capture via Linux-specific APIs.") mbedtls-apache mesa pciutils - pipewire-0.3 + pipewire pulseaudio python qtbase-5 -- cgit v1.2.3