me
/
guix
Archived
1
0
Fork 0

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 <othacehe@gnu.org>
master
Brendan Tildesley 2023-01-08 10:30:37 +01:00 committed by Mathieu Othacehe
parent e55bc944a9
commit 590700ce00
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
8 changed files with 38 additions and 61 deletions

View File

@ -6017,7 +6017,7 @@ and DSD streams.")
(arguments (list #:tests? #f)) ;; no tests (arguments (list #:tests? #f)) ;; no tests
(inputs (list alsa-lib (inputs (list alsa-lib
libxkbcommon libxkbcommon
pipewire-0.3 pipewire
qtbase qtbase
qtsvg)) qtsvg))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))

View File

@ -941,7 +941,7 @@
opus+custom opus+custom
pango pango
pciutils pciutils
pipewire-0.3 pipewire
pulseaudio pulseaudio
qtbase-5 qtbase-5
re2 re2

View File

@ -1372,7 +1372,7 @@ compositor.")
mtdev mtdev
linux-pam linux-pam
pango pango
pipewire-0.3 pipewire
wayland-protocols-next wayland-protocols-next
xorg-server-xwayland)) xorg-server-xwayland))
(propagated-inputs (propagated-inputs
@ -2693,7 +2693,7 @@ compatible with the well-known scripts of the same name.")
("libportal" ,libportal) ("libportal" ,libportal)
("dbus" ,dbus) ("dbus" ,dbus)
("geoclue" ,geoclue) ("geoclue" ,geoclue)
("pipewire" ,pipewire-0.3) ("pipewire" ,pipewire)
("fuse" ,fuse-3))) ("fuse" ,fuse-3)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2866,7 +2866,7 @@ for xdg-desktop-portal that is using Qt/KF5.")
grim grim
iniparser iniparser
libinih libinih
pipewire-0.3 pipewire
slurp slurp
wayland wayland
wayland-protocols)) wayland-protocols))

View File

@ -8118,7 +8118,7 @@ to display dialog boxes from the commandline and shell scripts.")
;; theme to please libxcursor. ;; theme to please libxcursor.
adwaita-icon-theme adwaita-icon-theme
libxcursor ;for XCURSOR_PATH libxcursor ;for XCURSOR_PATH
pipewire-0.3 pipewire
python python
python-dbus python-dbus
python-dbusmock python-dbusmock
@ -8160,7 +8160,7 @@ to display dialog boxes from the commandline and shell scripts.")
libxkbfile libxkbfile
libxrandr libxrandr
libxtst libxtst
pipewire-0.3 pipewire
startup-notification startup-notification
sysprof sysprof
upower upower

View File

@ -270,7 +270,7 @@ This package is part of the KDE base applications module.")
libxcb libxcb
libxtst libxtst
breeze-icons ;; default icon set breeze-icons ;; default icon set
pipewire-0.3 pipewire
plasma-wayland-protocols plasma-wayland-protocols
qtbase-5 qtbase-5
qtwayland-5 qtwayland-5

View File

@ -28,7 +28,7 @@
;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Dave Love <fx@gnu.org> ;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; 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 Manuel Graf <graf@init.at>
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
@ -9078,7 +9078,7 @@ types and interfaces and translates so that the X server can use them.")
(define-public pipewire (define-public pipewire
(package (package
(name "pipewire") (name "pipewire")
(version "0.2.7") (version "0.3.56")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (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)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc")) "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1"))))
(patches (search-patches "pipewire-0.2.7-fno-common.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (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 (native-inputs
(list pkg-config)) (list pkg-config
(inputs python-docutils))
(list alsa-lib (inputs (list alsa-lib
avahi
bluez
dbus dbus
eudev eudev
ffmpeg-4 ffmpeg
gstreamer
gst-plugins-base gst-plugins-base
gstreamer
jack-2
ldacbt
libva libva
pulseaudio
sbc sbc
sdl2)) sdl2
vulkan-headers
vulkan-loader))
(home-page "https://pipewire.org/") (home-page "https://pipewire.org/")
(synopsis "Server and user space API to deal with multimedia pipelines") (synopsis "Server and user space API to deal with multimedia pipelines")
(description (description
@ -9117,40 +9128,6 @@ and Flatpak we expect PipeWire to provide a core building block for the future
of Linux application development.") of Linux application development.")
(license license:lgpl2.0+))) (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 (define-public wireplumber
(package (package
(name "wireplumber") (name "wireplumber")
@ -9172,7 +9149,7 @@ of Linux application development.")
(native-inputs (native-inputs
(list `(,glib "bin") (list `(,glib "bin")
pkg-config)) 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") (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber")
(synopsis "Session / policy manager implementation for PipeWire") (synopsis "Session / policy manager implementation for PipeWire")
(description "WirePlumber is a modular session / policy manager for (description "WirePlumber is a modular session / policy manager for

View File

@ -338,7 +338,7 @@
openh264 openh264
openssl openssl
opus opus
pipewire-0.3 pipewire
protobuf)) protobuf))
(synopsis "WebRTC support for Telegram Desktop") (synopsis "WebRTC support for Telegram Desktop")
(description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by

View File

@ -3457,7 +3457,7 @@ be used for realtime video capture via Linux-specific APIs.")
mbedtls-apache mbedtls-apache
mesa mesa
pciutils pciutils
pipewire-0.3 pipewire
pulseaudio pulseaudio
python python
qtbase-5 qtbase-5