@@ -5862,7 +5862,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))
@@ -963,7 +963,7 @@ (define-public ungoogled-chromium
opus+custom
pango
pciutils
- pipewire-0.3
+ pipewire
pulseaudio
re2
snappy
@@ -1203,7 +1203,7 @@ (define-public weston
mtdev
linux-pam
pango
- pipewire-0.3
+ pipewire
wayland-protocols-next
xorg-server-xwayland))
(propagated-inputs
@@ -2454,7 +2454,7 @@ (define-public xdg-desktop-portal
("libportal" ,libportal)
("dbus" ,dbus)
("geoclue" ,geoclue)
- ("pipewire" ,pipewire-0.3)
+ ("pipewire" ,pipewire)
("fuse" ,fuse-3)))
(arguments
`(#:configure-flags
@@ -2586,7 +2586,7 @@ (define-public xdg-desktop-portal-wlr
grim
iniparser
libinih
- pipewire-0.3
+ pipewire
slurp
wayland
wayland-protocols))
@@ -7999,7 +7999,7 @@ (define-public mutter
;; theme to please libxcursor.
adwaita-icon-theme
libxcursor ;for XCURSOR_PATH
- pipewire-0.3
+ pipewire
python
python-dbus
python-dbusmock
@@ -8041,7 +8041,7 @@ (define-public mutter
libxkbfile
libxrandr
libxtst
- pipewire-0.3
+ pipewire
startup-notification
sysprof
upower
@@ -254,7 +254,7 @@ (define-public krfb
libxcb
libxtst
oxygen-icons ;; default icon set
- pipewire-0.3
+ pipewire
qtbase-5
qtx11extras
xcb-util-image
@@ -28,7 +28,7 @@
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
-;;; Copyright © 2018, 2020 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2018, 2020, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2018 Manuel Graf <graf@init.at>
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
@@ -8715,7 +8715,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
@@ -8724,23 +8724,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
- 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
@@ -8754,39 +8765,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)
- (prepend avahi
- bluez
- jack-2
- ldacbt
- pulseaudio
- vulkan-loader
- vulkan-headers)))))
-
(define-public wireplumber
(package
(name "wireplumber")
@@ -8808,7 +8786,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
@@ -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
@@ -3387,7 +3387,7 @@ (define-public obs
mbedtls-apache
mesa
pciutils
- pipewire-0.3
+ pipewire
pulseaudio
python
qtbase-5
From: Brendan Tildesley <mail@brendan.scot> * gnu/packages/linux.scm: Remove pipewire. Rename pipewire-0.3 to pipewire. It may cause a rebuild due to sorting theinput list. * gnu/packages/audio.scm: Replace all instances of pipewire-0.3 -> pipewire * gnu/packages/video.scm: Same as above. --- 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 | 78 ++++++++++++-------------------- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 8 files changed, 38 insertions(+), 60 deletions(-)