5 files changed, 86 insertions, 118 deletions

diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch
deleted file mode 100644
index ce381a78b3..0000000000
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b1d911fdab4a583f276d18395037d90bfc305109 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 20 May 2024 18:12:23 -0700
-Subject: [PATCH] module-suspend-on-idle: Include time.h for struct timespec
- decl
-
-This is flagged as error with gcc-14 on musl targets
-
-In file included from ../git/src/pipewire/loop.h:27,
-                 from ../git/src/pipewire/core.h:44,
-                 from ../git/src/modules/module-suspend-on-idle.c:26:
-../git/spa/include/spa/support/loop.h:184:37: warning: 'struct timespec' declared inside parameter list will not be visible outside of this definition or declaration
-  184 |                              struct timespec *value,
-      |                                     ^~~~~~~~
-../git/src/modules/module-suspend-on-idle.c: In function 'node_state_changed':
-../git/src/modules/module-suspend-on-idle.c:110:69: error: passing argument 2 of 'main_loop->utils->update_timer' from incompatible pointer type [-Wincompatible-pointer-types]
-  110 |                 pw_loop_update_timer(main_loop, info->idle_timeout, &value, NULL, false);
-      |                                                                     ^~~~~~
-      |                                                                     |
-      |                                                                     struct timespec *
-
-Upstream-Status: Inappropriate [Fixed in latest pipewire differently]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/modules/module-suspend-on-idle.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
-index e5c1fcb30..4dba3be71 100644
---- a/src/modules/module-suspend-on-idle.c
-+++ b/src/modules/module-suspend-on-idle.c
-@@ -20,6 +20,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <errno.h>
-+#include <time.h>
- 
- #include "config.h"
- 
--- 
-2.45.1
-
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb
deleted file mode 100644
index 7c8afd3d51..0000000000
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-SUMMARY = "Multimedia processing server for Linux"
-HOMEPAGE = "https://pipewire.org"
-SECTION = "multimedia"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \
-    file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-"
-DEPENDS = "alsa-lib dbus udev"
-SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
-PV = "0.2.7"
-
-SRC_URI = "git://github.com/PipeWire/pipewire;branch=master;protocol=https \
-           file://0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch \
-           "
-
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig systemd manpages
-
-PACKAGECONFIG ??= "\
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
-    gstreamer \
-"
-
-PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
-PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
-PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
-
-PACKAGES =+ "\
-    ${PN}-spa-plugins \
-    ${PN}-alsa \
-    ${PN}-config \
-    gstreamer1.0-${PN} \
-    lib${PN} \
-    lib${PN}-modules \
-"
-
-RDEPENDS:lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
-
-FILES:${PN} = "\
-    ${sysconfdir}/pipewire/pipewire.conf \
-    ${bindir}/pipewire* \
-    ${systemd_user_unitdir}/* \
-"
-FILES:lib${PN} = "\
-    ${libdir}/libpipewire-*.so.* \
-"
-FILES:lib${PN}-modules = "\
-    ${libdir}/pipewire-*/* \
-"
-FILES:${PN}-spa-plugins = "\
-    ${bindir}/spa-* \
-    ${libdir}/spa/* \
-"
-FILES:${PN}-alsa = "\
-    ${libdir}/alsa-lib/* \
-    ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \
-"
-FILES:gstreamer1.0-${PN} = "\
-    ${libdir}/gstreamer-1.0/* \
-"
-
-CONFFILES:${PN} = "\
-    ${sysconfdir}/pipewire/pipewire.conf \
-"
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session/0001-pass-right-types-to-methods.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session/0001-pass-right-types-to-methods.patch
new file mode 100644
index 0000000000..e7a3e52617
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session/0001-pass-right-types-to-methods.patch
@@ -0,0 +1,53 @@
+From 97e0d7646c873ea3badfa604b3f084ed6208af97 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 26 Nov 2024 13:37:06 +0100
+Subject: [PATCH] pass right types to methods
+
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/media-session/-/commit/e6243381cf2b7d0d33707627b4186f5580908752]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ src/access-flatpak.c | 2 +-
+ src/access-portal.c  | 2 +-
+ src/default-routes.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/access-flatpak.c b/src/access-flatpak.c
+index afe780b2d..dd802d6eb 100644
+--- a/src/access-flatpak.c
++++ b/src/access-flatpak.c
+@@ -114,7 +114,7 @@ static void object_update(void *data)
+                pw_log_info("%p: flatpak client %d granted 0x%08x permissions"
+                                , impl, client->id, perms);
+                permissions[0] = PW_PERMISSION_INIT(PW_ID_ANY, perms);
+-               pw_client_update_permissions(client->obj->obj.proxy,
++               pw_client_update_permissions((struct pw_client*)client->obj->obj.proxy,
+                                1, permissions);
+                client->active = true;
+        }
+diff --git a/src/access-portal.c b/src/access-portal.c
+index 92d95a26b..4e3a9f52a 100644
+--- a/src/access-portal.c
++++ b/src/access-portal.c
+@@ -265,7 +265,7 @@ set_global_permissions(void *data, struct sm_object *object)
+                permissions[n_permissions++] =
+                        PW_PERMISSION_INIT(object->id, allowed ? PW_PERM_ALL : 0);
+                pw_log_info("%p: object %d allowed:%d", impl, object->id, allowed);
+-               pw_client_update_permissions(client->obj->obj.proxy,
++               pw_client_update_permissions((struct pw_client*)client->obj->obj.proxy,
+                                n_permissions, permissions);
+        }
+        return 0;
+diff --git a/src/default-routes.c b/src/default-routes.c
+index 5a842faf7..86f9e217b 100644
+--- a/src/default-routes.c
++++ b/src/default-routes.c
+@@ -479,7 +479,7 @@ static int restore_route_params(struct device *dev, const char *val, const struc
+        if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
+                spa_debug_pod(2, NULL, param);
+ 
+-       pw_device_set_param((struct pw_node*)dev->obj->obj.proxy,
++       pw_device_set_param((struct pw_device*)dev->obj->obj.proxy,
+                        SPA_PARAM_Route, 0, param);
+ 
+        sm_media_session_schedule_rescan(dev->impl->session);
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.2.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.2.bb
index 8ae0624135..dde0039584 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.2.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.2.bb
@@ -10,9 +10,10 @@ DEPENDS = " \
         dbus \
 "
 
-SRC_URI = "git://gitlab.freedesktop.org/pipewire/media-session.git;protocol=https;branch=master"
+SRC_URI = "git://gitlab.freedesktop.org/pipewire/media-session.git;protocol=https;branch=master \
+           file://0001-pass-right-types-to-methods.patch \
+           "
 
-S = "${WORKDIR}/git"
 SRCREV = "80dae7e24bec02b2befe09a72fbac6e2b38ccb5c"
 
 inherit meson pkgconfig
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.5.bb
index 0c68cc4d28..e41cfd221c 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.5.bb
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "dbus ncurses"
 
-SRCREV = "59fe89d41a67f6daad086f8f3fe522935be77a3f"
-SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https"
+SRCREV = "83ada1e086f8fa49bf9652df2edd9ccee5efa48b"
+BRANCH = "${@oe.utils.trim_version('${PV}', 2)}"
+SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig systemd gettext useradd
 
@@ -72,6 +72,9 @@ EXTRA_OEMESON += " \
 # mode but it looks like clang still does
 CFLAGS:append = " -Wno-typedef-redefinition"
 
+# Specify linking with -latomic on architectures missing 64bit atomics.
+LDFLAGS += "${@bb.utils.contains_any('TUNE_FEATURES', 'riscv32 armv5 mips ppc32 m32', '-latomic', '', d)}"
+
 # According to wireplumber documentation only one session manager should be installed at a time
 # Possible options are media-session, which has fewer dependencies but is very simple,
 # or wireplumber, which is more powerful.
@@ -96,7 +99,7 @@ PACKAGECONFIG:class-target ??= " \
 # as being in conflict.
 PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-alsa pipewire-alsa-card-profile"
 PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi"
-PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc"
+PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc glib-2.0-native"
 PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac"
 PACKAGECONFIG[bluez-opus] = "-Dbluez5-codec-opus=enabled,-Dbluez5-codec-opus=disabled,libopus"
 PACKAGECONFIG[bluez-lc3] = "-Dbluez5-codec-lc3=enabled,-Dbluez5-codec-lc3=disabled,liblc3"
@@ -122,7 +125,7 @@ PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl"
 # Starting with version 0.3.60, readline usage can be turned off in pw-cli.
 # If it is disabled, getline() is used as a fallback.
 PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline"
-PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,libsdl2"
+PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2"
 PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1"
 PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
 PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=enabled,-Dsystemd-system-service=disabled,systemd"
@@ -135,7 +138,7 @@ PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev"
 PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev"
 PACKAGECONFIG[volume] = "-Dvolume=enabled,-Dvolume=disabled"
 PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers vulkan-loader"
-PACKAGECONFIG[webrtc-echo-cancelling] = "-Decho-cancel-webrtc=enabled,-Decho-cancel-webrtc=disabled,webrtc-audio-processing-1"
+PACKAGECONFIG[webrtc-echo-cancelling] = "-Decho-cancel-webrtc=enabled,-Decho-cancel-webrtc=disabled,webrtc-audio-processing-2"
 PACKAGECONFIG[wireplumber] = ",,,wireplumber,,media-session"
 
 PACKAGESPLITFUNCS:prepend = " split_dynamic_packages "
@@ -157,6 +160,14 @@ remove_unused_installed_files() {
     rm -f "${D}${datadir}/pipewire/minimal.conf"
 }
 
+do_install:append:class-target() {
+    # The pipewire-alsa plugin needs the following files in /etc/alsa/conf.d/ to
+    # be picked up by alsa.
+    install -d ${D}${sysconfdir}/alsa/conf.d
+    ln -sf ${datadir}/alsa/alsa.conf.d/50-pipewire.conf ${D}${sysconfdir}/alsa/conf.d/50-pipewire.conf
+    ln -sf ${datadir}/alsa/alsa.conf.d/99-pipewire-default.conf ${D}${sysconfdir}/alsa/conf.d/99-pipewire-default.conf
+}
+
 do_install[postfuncs] += "remove_unused_installed_files"
 
 python split_dynamic_packages () {
@@ -279,6 +290,7 @@ CONFFILES:libpipewire += "${datadir}/pipewire/client.conf"
 FILES:libpipewire = " \
     ${datadir}/pipewire/client.conf \
     ${libdir}/libpipewire-*.so.* \
+    ${libdir}/${SPA_SUBDIR}/libspa.so \
 "
 # Add the bare minimum modules and plugins required to be able
 # to use libpipewire. Without these, it is essentially unusable.
@@ -292,6 +304,7 @@ FILES:${PN}-tools = " \
     ${bindir}/pw-cat \
     ${bindir}/pw-cli \
     ${bindir}/pw-config \
+    ${bindir}/pw-container \
     ${bindir}/pw-dot \
     ${bindir}/pw-dsdplay \
     ${bindir}/pw-dump \
@@ -320,7 +333,9 @@ FILES:${PN}-pulse = " \
     ${systemd_user_unitdir}/pipewire-pulse.* \
     ${bindir}/pipewire-pulse \
 "
-RDEPENDS:${PN}-pulse += " \
+# This uses :append:class-target rather than += to avoid a dependency from
+# pipewire-native to pipewire.
+RDEPENDS:${PN}-pulse:append:class-target = " \
     ${PN}-modules-protocol-pulse \
 "
 
@@ -328,6 +343,8 @@ RDEPENDS:${PN}-pulse += " \
 FILES:${PN}-alsa = "\
     ${libdir}/alsa-lib/* \
     ${datadir}/alsa/alsa.conf.d/* \
+    ${sysconfdir}/alsa/conf.d/50-pipewire.conf \
+    ${sysconfdir}/alsa/conf.d/99-pipewire-default.conf \
 "
 
 # JACK drop-in libraries to redirect audio to pipewire.
@@ -386,3 +403,9 @@ FILES:gstreamer1.0-pipewire = " \
 "
 
 BBCLASSEXTEND = "native nativesdk"
+
+do_install:append() {
+  if ls ${D}${datadir}/doc/pipewire/html/dir_*html; then
+    sed -i "s,${WORKDIR},,g" ${D}${datadir}/doc/pipewire/html/dir_*html
+  fi
+}