diff options
| author |   George Kiagiadakis <george.kiagiadakis@collabora.com> | 2019-09-26 17:55:46 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-09-29 12:45:29 +0000 |
| commit | 34e620431e485932dab84735253eb412497a09ae (patch) | |
| tree | f17cd7a0c7fdd0f67b8207b5c35a6f2db8507d6d /meta-pipewire/recipes-multimedia/wireplumber | |
| parent | 0308bce9409477d557761b4a8e8b3634b7f4b0a3 (diff) | |
pipewire: update pipewire & wireplumber to the latest development version
This refreshes all the patches, removing all those that made it upstream,
redoing the endpoint extension (now called session-manager extension),
and adding some more last moment fixes.
In addition, the configuration files for wireplumber & pipewire
are being updated to load the new modules, as the module set
has changed in both daemons.
Finally, the pipewire recipe is adding PACKAGECONFIG options
for jack and vulkan, so that we can actually disable them.
Pipewire upstream builds them by default and we don't want that.
Bug-AGL: SPEC-2837
Change-Id: Id42119c027558466f0a0aa71813ff15f33dfcb56
Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Diffstat (limited to 'meta-pipewire/recipes-multimedia/wireplumber')
| -rw-r--r-- | meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in | 20 | ||||
| -rw-r--r-- | meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in index fcd1b877..09bbfc3f 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in @@ -1,3 +1,13 @@ +# Register well-known SPA factories +# These do not need to exist on the system to be registered +add-spa-lib audio.convert* audioconvert/libspa-audioconvert +add-spa-lib api.alsa.* alsa/libspa-alsa +add-spa-lib api.v4l2.* v4l2/libspa-v4l2 +add-spa-lib api.bluez5.* bluez5/libspa-bluez5 + +# the client-device pipewire module is needed for libwireplumber-module-monitor +load-pipewire-module libpipewire-module-client-device + # Basic pipewire integration - do not remove load-module C libwireplumber-module-pipewire @@ -18,6 +28,16 @@ load-module C libwireplumber-module-mixer { "Communication", "Emergency"]> } +load-module C libwireplumber-module-monitor { + "factory": <"api.alsa.monitor">, + "flags": <["use-adapter"]> +} + +load-module C libwireplumber-module-monitor { + "factory": <"api.bluez5.monitor">, + "flags": <["local-nodes", "use-adapter"]> +} + # Monitors the ALSA devices that are discovered via udev # and creates softdsp-endopints for each one of them # The streams specified here are the ones that will be available for linking diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb index 618ee142..604a1080 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb @@ -11,8 +11,8 @@ inherit meson pkgconfig gobject-introspection DEPENDS = "glib-2.0 glib-2.0-native pipewire" -SRC_URI = "git://gitlab.freedesktop.org/gkiagia/wireplumber;protocol=https;branch=0.1" -SRCREV = "68a44d5db3d5bbdd77f97a694178c2eef4d08705" +SRC_URI = "git://gitlab.freedesktop.org/gkiagia/wireplumber;protocol=https;branch=master" +SRCREV = "897d94c7ddad79774b32a2acda1c08fbd20c0697" PV = "0.1.1+git${SRCPV}" S = "${WORKDIR}/git" |