mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

pipewire: Upgrade to 0.3.34

Browse Source 
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>
This commit is contained in:
Khem Raj
2021-09-01 08:16:30 -07:00
parent 103ca64203
commit 02de774615
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb → meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb
+6 -4
View File
@@ -11,7 +11,7 @@ SECTION = "multimedia"
DEPENDS = "dbus" DEPENDS = "dbus"
SRCREV = "c43dabcc96e2e072cdf08e5f094bb677d9017c6b" SRCREV = "1924c2c29824955b5e763f1def6967f68e403c7c"
SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -46,7 +46,6 @@ USERADD_PARAM:${PN} = "--system --home / --no-create-home \
EXTRA_OEMESON += " \ EXTRA_OEMESON += " \
-Daudiotestsrc=enabled \ -Daudiotestsrc=enabled \
-Devl=disabled \ -Devl=disabled \
-Dsystemd-user-service=disabled \
-Dtests=disabled \ -Dtests=disabled \
-Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \
-Dvideotestsrc=enabled \ -Dvideotestsrc=enabled \
@@ -59,7 +58,7 @@ EXTRA_OEMESON += " \
PACKAGECONFIG ??= "\ PACKAGECONFIG ??= "\
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa systemd', 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, # "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[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack"
PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2"
PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" 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[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev"
PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" 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" 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 \ ${bindir}/pipewire-media-session \
${datadir}/pipewire/media-session.d/* \ ${datadir}/pipewire/media-session.d/* \
${systemd_system_unitdir}/pipewire-media-session.service \ ${systemd_system_unitdir}/pipewire-media-session.service \
${systemd_user_unitdir}/pipewire-media-session.service \
" "
RPROVIDES:${PN}-media-session = "virtual-pipewire-sessionmanager" RPROVIDES:${PN}-media-session = "virtual-pipewire-sessionmanager"