- set pipewire-jack to be runtime recommended if it is built
- make media-session and wireplumber conflicting each other
Signed-off-by: Markus Volk <f_l_k@...>
---
.../recipes-multimedia/pipewire/pipewire_0.3.56.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.56.=
bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.56.bb
index 6c88e99f9..feefe7c15 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.56.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.56.bb
@@ -109,10 +109,10 @@ PACKAGECONFIG[jack] =3D "-Djack=3Denabled,-Djack=3D=
disabled,jack,,,pipewire-jack"
PACKAGECONFIG[libcamera] =3D "-Dlibcamera=3Denabled,-Dlibcamera=3Ddisabl=
ed,libcamera libdrm"
PACKAGECONFIG[libcanberra] =3D "-Dlibcanberra=3Denabled,-Dlibcanberra=3D=
disabled,libcanberra"
PACKAGECONFIG[libusb] =3D "-Dlibusb=3Denabled,-Dlibusb=3Ddisabled,libusb=
"
-PACKAGECONFIG[media-session] =3D ",,,pipewire-media-session"
+PACKAGECONFIG[media-session] =3D ",,,pipewire-media-session,,wireplumber=
"
PACKAGECONFIG[pulseaudio] =3D "-Dlibpulse=3Denabled,-Dlibpulse=3Ddisable=
d,pulseaudio,,pipewire-pulse"
PACKAGECONFIG[pipewire-alsa] =3D "-Dpipewire-alsa=3Denabled,-Dpipewire-a=
lsa=3Ddisabled,alsa-lib"
-PACKAGECONFIG[pipewire-jack] =3D "-Dpipewire-jack=3Denabled -Dlibjack-pa=
th=3D${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=3Ddisabled,jack,,=
,jack"
+PACKAGECONFIG[pipewire-jack] =3D "-Dpipewire-jack=3Denabled -Dlibjack-pa=
th=3D${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=3Ddisabled,jack,,=
pipewire-jack,jack"
PACKAGECONFIG[pw-cat] =3D "-Dpw-cat=3Denabled,-Dpw-cat=3Ddisabled"
PACKAGECONFIG[raop] =3D "-Draop=3Denabled,-Draop=3Ddisabled,openssl"
PACKAGECONFIG[sdl2] =3D "-Dsdl2=3Denabled,-Dsdl2=3Ddisabled,libsdl2"
@@ -129,7 +129,7 @@ PACKAGECONFIG[v4l2] =3D "-Dv4l2=3Denabled,-Dv4l2=3Ddi=
sabled,udev"
PACKAGECONFIG[volume] =3D "-Dvolume=3Denabled,-Dvolume=3Ddisabled"
PACKAGECONFIG[vulkan] =3D "-Dvulkan=3Denabled,-Dvulkan=3Ddisabled,vulkan=
-headers vulkan-loader"
PACKAGECONFIG[webrtc-echo-cancelling] =3D "-Decho-cancel-webrtc=3Denable=
d,-Decho-cancel-webrtc=3Ddisabled,webrtc-audio-processing"
-PACKAGECONFIG[wireplumber] =3D ",,,wireplumber"
+PACKAGECONFIG[wireplumber] =3D ",,,wireplumber,,media-session"
=20
PACKAGESPLITFUNCS:prepend =3D " split_dynamic_packages "
PACKAGESPLITFUNCS:append =3D " set_dynamic_metapkg_rdepends "
--=20
2.34.1
