diff options
-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" | |||
11 | 11 | ||
12 | DEPENDS = "dbus" | 12 | DEPENDS = "dbus" |
13 | 13 | ||
14 | SRCREV = "c43dabcc96e2e072cdf08e5f094bb677d9017c6b" | 14 | SRCREV = "1924c2c29824955b5e763f1def6967f68e403c7c" |
15 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" | 15 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
@@ -46,7 +46,6 @@ USERADD_PARAM:${PN} = "--system --home / --no-create-home \ | |||
46 | EXTRA_OEMESON += " \ | 46 | EXTRA_OEMESON += " \ |
47 | -Daudiotestsrc=enabled \ | 47 | -Daudiotestsrc=enabled \ |
48 | -Devl=disabled \ | 48 | -Devl=disabled \ |
49 | -Dsystemd-user-service=disabled \ | ||
50 | -Dtests=disabled \ | 49 | -Dtests=disabled \ |
51 | -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ | 50 | -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ |
52 | -Dvideotestsrc=enabled \ | 51 | -Dvideotestsrc=enabled \ |
@@ -59,7 +58,7 @@ EXTRA_OEMESON += " \ | |||
59 | PACKAGECONFIG ??= "\ | 58 | PACKAGECONFIG ??= "\ |
60 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 59 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
61 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa systemd', d)} \ | 60 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa systemd', d)} \ |
62 | gstreamer jack v4l2 \ | 61 | gstreamer jack sndfile pw-cat v4l2 \ |
63 | " | 62 | " |
64 | 63 | ||
65 | # "jack" and "pipewire-jack" packageconfigs cannot be both enabled, | 64 | # "jack" and "pipewire-jack" packageconfigs cannot be both enabled, |
@@ -75,7 +74,9 @@ PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gs | |||
75 | PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" | 74 | PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" |
76 | PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" | 75 | PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" |
77 | PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" | 76 | PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" |
78 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd-system-service=enabled ,-Dsystemd=disabled -Dsystemd-system-service=disabled,systemd" | 77 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd-system-service=enabled -Dsystemd-user-service=enabled,-Dsystemd=disabled -Dsystemd-system-service=disabled -Dsystemd-user-service=disabled,systemd" |
78 | # pw-cat needs sndfile packageconfig to be enabled | ||
79 | PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" | ||
79 | PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev" | 80 | PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev" |
80 | PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" | 81 | PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" |
81 | PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,,jack" | 82 | 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 = " \ | |||
250 | ${bindir}/pipewire-media-session \ | 251 | ${bindir}/pipewire-media-session \ |
251 | ${datadir}/pipewire/media-session.d/* \ | 252 | ${datadir}/pipewire/media-session.d/* \ |
252 | ${systemd_system_unitdir}/pipewire-media-session.service \ | 253 | ${systemd_system_unitdir}/pipewire-media-session.service \ |
254 | ${systemd_user_unitdir}/pipewire-media-session.service \ | ||
253 | " | 255 | " |
254 | RPROVIDES:${PN}-media-session = "virtual-pipewire-sessionmanager" | 256 | RPROVIDES:${PN}-media-session = "virtual-pipewire-sessionmanager" |
255 | 257 | ||