diff options
Diffstat (limited to 'meta-pipewire/recipes-multimedia/pipewire')
| -rw-r--r-- | meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-pipewiresink-use-all-the-available-dest-memory-when-.patch | 33 | ||||
| -rw-r--r-- | meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-pipewiresink-release-manually-acquired-buffers-back-.patch | 52 | ||||
| -rw-r--r-- | meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bb (renamed from meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.27.bb) | 48 | ||||
| -rw-r--r-- | meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend (renamed from meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.27.bbappend) | 5 |
4 files changed, 30 insertions, 108 deletions
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-pipewiresink-use-all-the-available-dest-memory-when-.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-pipewiresink-use-all-the-available-dest-memory-when-.patch deleted file mode 100644 index a3bde14bc..000000000 --- a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-pipewiresink-use-all-the-available-dest-memory-when-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b86e5cabfae3ab354f350f8f7589b21a153a8a5d Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis <george.kiagiadakis@collabora.com> -Date: Mon, 10 May 2021 17:12:12 +0300 -Subject: pipewiresink: use all the available dest memory when copying buffer - -When pipewiresink needs to copy data, it has to resize the destination -buffer (to a smaller size) in order to send the correct data size to -pipewire. When this dest buffer is reused later, it will still have -this smaller size as its total size and the copy may discard data -from upstream if the new upstream buffer is bigger than the last one -that was copied on the same dest buffer. - -Upstream-Status: Backport [from master/0.3.28] ---- - src/gst/gstpipewiresink.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c -index 966b12c7..031b3ae0 100644 ---- a/src/gst/gstpipewiresink.c -+++ b/src/gst/gstpipewiresink.c -@@ -616,7 +616,7 @@ gst_pipewire_sink_render (GstBaseSink * bsink, GstBuffer * buffer) - goto done; - - gst_buffer_map (b, &info, GST_MAP_WRITE); -- gst_buffer_extract (buffer, 0, info.data, info.size); -+ gst_buffer_extract (buffer, 0, info.data, info.maxsize); - gst_buffer_unmap (b, &info); - gst_buffer_resize (b, 0, gst_buffer_get_size (buffer)); - buffer = b; --- -2.30.2 - diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-pipewiresink-release-manually-acquired-buffers-back-.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-pipewiresink-release-manually-acquired-buffers-back-.patch deleted file mode 100644 index aeafae616..000000000 --- a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-pipewiresink-release-manually-acquired-buffers-back-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8911e22793ed3713ceb78be5414eeb03ebde962e Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis <george.kiagiadakis@collabora.com> -Date: Mon, 10 May 2021 17:25:57 +0300 -Subject: pipewiresink: release manually acquired buffers back to the pool - -When we manually acquire buffers from the pool, we never release them. -But because gst_buffer_pool_acquire_buffer() adds a reference to the pool, -this leaks the pool eventually. - -To fix this, just unref the buffer after it has been sent. This releases -it back to the pool and unrefs the pool. - -This has no significant effect to the stream, since the underlying -pw buffers are actually pooled in the pw_stream. It just prevents leaking. - -Upstream-Status: Backport [from master/0.3.28] ---- - src/gst/gstpipewiresink.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c -index 031b3ae0..2f79a4f7 100644 ---- a/src/gst/gstpipewiresink.c -+++ b/src/gst/gstpipewiresink.c -@@ -578,6 +578,7 @@ gst_pipewire_sink_render (GstBaseSink * bsink, GstBuffer * buffer) - GstPipeWireSink *pwsink; - GstFlowReturn res = GST_FLOW_OK; - const char *error = NULL; -+ gboolean unref_buffer = FALSE; - - pwsink = GST_PIPEWIRE_SINK (bsink); - -@@ -620,6 +621,7 @@ gst_pipewire_sink_render (GstBaseSink * bsink, GstBuffer * buffer) - gst_buffer_unmap (b, &info); - gst_buffer_resize (b, 0, gst_buffer_get_size (buffer)); - buffer = b; -+ unref_buffer = TRUE; - - pw_thread_loop_lock (pwsink->core->loop); - if (pw_stream_get_state (pwsink->stream, &error) != PW_STREAM_STATE_STREAMING) -@@ -628,6 +630,8 @@ gst_pipewire_sink_render (GstBaseSink * bsink, GstBuffer * buffer) - - GST_DEBUG ("push buffer"); - do_send_buffer (pwsink, buffer); -+ if (unref_buffer) -+ gst_buffer_unref (buffer); - - done_unlock: - pw_thread_loop_unlock (pwsink->core->loop); --- -2.30.2 - diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.27.bb b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bb index 2757e9278..e52745a7d 100644 --- a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.27.bb +++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bb @@ -11,15 +11,19 @@ DESCRIPTION = "Linux server for handling and routing audio and video streams bet HOMEPAGE = "https://pipewire.org/" BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" LICENSE = "MIT" +LICENSE_${PN}-jack = "GPL-2.0-only" +LICENSE_${PN}-alsa-card-profile = "LGPL-2.1-or-later" +LICENSE_${PN}-spa-plugins-alsa = "LGPL-2.1-or-later" + LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://LICENSE;md5=2158739e172e58dc9ab1bdd2d6ec9c72 \ file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " SECTION = "multimedia" DEPENDS = "dbus" -SRCREV = "e598d0a42227c9dfa79dcb7583c054c5b2ec072d" +SRCREV = "e857856be7b64d562cdcc01c43933218a68b225e" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -38,14 +42,19 @@ USERADD_PARAM_${PN} = "--system --home / --no-create-home \ # For "EVL", look up https://evlproject.org/ . It involves # a specially prepared kernel, and is currently unavailable # in Yocto. +# # FFmpeg and Vulkan aren't really supported - at the current # stage (version 0.3.22), these are just experiments, not # actual features. +# # libcamera support currently does not build successfully. +# # systemd user service files are disabled because per-user # PipeWire instances aren't really something that makes # much sense in an embedded environment. A system-wide # instance does. +# +# manpage generation requires xmltoman, which is not available. EXTRA_OEMESON += " \ -Daudiotestsrc=enabled \ -Devl=disabled \ @@ -56,6 +65,7 @@ EXTRA_OEMESON += " \ -Dffmpeg=disabled \ -Dvulkan=disabled \ -Dlibcamera=disabled \ + -Dman=disabled \ " PACKAGECONFIG ??= "\ @@ -72,10 +82,9 @@ PACKAGECONFIG ??= "\ PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev" PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" -PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen" +PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native" PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" -PACKAGECONFIG[manpages] = "-Dman=enabled,-Dman=disabled,libxml-parser-perl-native" 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" @@ -94,7 +103,7 @@ remove_unused_installed_files() { # Remove it if pipewire-jack is not built to avoid creating the # pipewire-jack package. if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then - rm -f "${D}${sysconfdir}/pipewire/jack.conf" + rm -f "${D}${datadir}/pipewire/jack.conf" fi } @@ -192,10 +201,11 @@ PACKAGES =+ "\ PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" SYSTEMD_SERVICE_${PN} = "pipewire.service" -CONFFILES_${PN} += "${sysconfdir}/pipewire/pipewire.conf" +CONFFILES_${PN} += "${datadir}/pipewire/pipewire.conf" FILES_${PN} = " \ - ${sysconfdir}/pipewire/pipewire.conf \ - ${systemd_system_unitdir}/pipewire.* \ + ${datadir}/pipewire/pipewire.conf \ + ${datadir}/pipewire/filter-chain \ + ${systemd_user_unitdir}/pipewire.* \ ${bindir}/pipewire \ " @@ -203,9 +213,9 @@ FILES_${PN}-dev += " \ ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ " -CONFFILES_libpipewire += "${sysconfdir}/pipewire/client.conf" +CONFFILES_libpipewire += "${datadir}/pipewire/client.conf" FILES_libpipewire = " \ - ${sysconfdir}/pipewire/client.conf \ + ${datadir}/pipewire/client.conf \ ${libdir}/libpipewire-*.so.* \ " # Add the bare minimum modules and plugins required to be able @@ -223,9 +233,11 @@ FILES_${PN}-tools = " \ # This is a shim daemon that is intended to be used as a # drop-in PulseAudio replacement, providing a pulseaudio-compatible # socket that can be used by applications that use libpulse. -CONFFILES_${PN}-pulse += "${sysconfdir}/pipewire/pipewire-pulse.conf" +CONFFILES_${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf" + FILES_${PN}-pulse = " \ - ${sysconfdir}/pipewire/pipewire-pulse.conf \ + ${datadir}/pipewire/pipewire-pulse.conf \ + ${systemd_user_unitdir}/pipewire-pulse.* \ ${bindir}/pipewire-pulse \ " RDEPENDS_${PN}-pulse += " \ @@ -239,19 +251,19 @@ FILES_${PN}-alsa = "\ " # jack drop-in libraries to redirect audio to pipewire -CONFFILES_${PN}-jack = "${sysconfdir}/pipewire/jack.conf" +CONFFILES_${PN}-jack = "${datadir}/pipewire/jack.conf" FILES_${PN}-jack = "\ - ${sysconfdir}/pipewire/jack.conf \ + ${datadir}/pipewire/jack.conf \ ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ " # Example session manager. Not intended for use in production. +CONFFILES_${PN}-media-session = "${datadir}/pipewire/media-session.d/*" SYSTEMD_SERVICE_${PN}-media-session = "pipewire-media-session.service" -CONFFILES_${PN}-media-session = "${sysconfdir}/pipewire/media-session.d/*" FILES_${PN}-media-session = " \ ${bindir}/pipewire-media-session \ + ${datadir}/pipewire/media-session.d/* \ ${systemd_system_unitdir}/pipewire-media-session.service \ - ${sysconfdir}/pipewire/media-session.d/* \ " RPROVIDES_${PN}-media-session = "virtual/pipewire-sessionmanager" @@ -267,9 +279,9 @@ FILES_${PN}-spa-tools = " \ FILES_${PN}-modules = "" RRECOMMENDS_${PN}-modules += "${PN}-modules-meta" -CONFFILES_${PN}-modules-rtkit = "${sysconfdir}/pipewire/client-rt.conf" +CONFFILES_${PN}-modules-rtkit = "${datadir}/pipewire/client-rt.conf" FILES_${PN}-modules-rtkit += " \ - ${sysconfdir}/pipewire/client-rt.conf \ + ${datadir}/pipewire/client-rt.conf \ " FILES_${PN}-alsa-card-profile = " \ diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.27.bbappend b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend index 22700ae67..cc2308e95 100644 --- a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.27.bbappend +++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend @@ -5,8 +5,3 @@ PACKAGECONFIG = "\ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ gstreamer v4l2 \ " - -SRC_URI += "\ - file://0001-pipewiresink-use-all-the-available-dest-memory-when-.patch \ - file://0002-pipewiresink-release-manually-acquired-buffers-back-.patch \ -" |