aboutsummaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-09-01 08:16:30 -0700
committerKhem Raj <raj.khem@gmail.com>2021-09-01 14:31:04 -0700
commit02de77461595e4ebbecf2d38d46bcb104b8730d4 (patch)
tree721ce6d00c5b4d682f4729cdce80de2a106e9a35 /meta-multimedia
parent103ca6420377f3e10aed7f463910ef6918f6726c (diff)
downloadmeta-openembedded-02de77461595e4ebbecf2d38d46bcb104b8730d4.tar.gz
pipewire: Upgrade to 0.3.34
Enable systemd user services as well as they are required for user pipewire sessions Turn pw-cat into a packageconfig Enable systemd-user-service only for systemd Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb (renamed from meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb)10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb
index 1c18ba0328..0fd41331f6 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb
@@ -11,7 +11,7 @@ SECTION = "multimedia"
DEPENDS = "dbus"
-SRCREV = "c43dabcc96e2e072cdf08e5f094bb677d9017c6b"
+SRCREV = "1924c2c29824955b5e763f1def6967f68e403c7c"
SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
@@ -46,7 +46,6 @@ USERADD_PARAM:${PN} = "--system --home / --no-create-home \
EXTRA_OEMESON += " \
-Daudiotestsrc=enabled \
-Devl=disabled \
- -Dsystemd-user-service=disabled \
-Dtests=disabled \
-Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \
-Dvideotestsrc=enabled \
@@ -59,7 +58,7 @@ EXTRA_OEMESON += " \
PACKAGECONFIG ??= "\
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa systemd', d)} \
- gstreamer jack v4l2 \
+ gstreamer jack sndfile pw-cat v4l2 \
"
# "jack" and "pipewire-jack" packageconfigs cannot be both enabled,
@@ -75,7 +74,9 @@ PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gs
PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack"
PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2"
PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1"
-PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd-system-service=enabled ,-Dsystemd=disabled -Dsystemd-system-service=disabled,systemd"
+PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd-system-service=enabled -Dsystemd-user-service=enabled,-Dsystemd=disabled -Dsystemd-system-service=disabled -Dsystemd-user-service=disabled,systemd"
+# pw-cat needs sndfile packageconfig to be enabled
+PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled"
PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev"
PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib"
PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,,jack"
@@ -250,6 +251,7 @@ FILES:${PN}-media-session = " \
${bindir}/pipewire-media-session \
${datadir}/pipewire/media-session.d/* \
${systemd_system_unitdir}/pipewire-media-session.service \
+ ${systemd_user_unitdir}/pipewire-media-session.service \
"
RPROVIDES:${PN}-media-session = "virtual-pipewire-sessionmanager"