2 files changed, 3 insertions, 49 deletions

diff --git a/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch b/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch
deleted file mode 100644
index 9b05e9e4c3..0000000000
--- a/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0ca64277b317b4836beccaa3248ab9055526811c Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 30 Sep 2024 10:06:30 +0200
-Subject: [PATCH] spa: initialize all fields explicitly
-
-Patch by Petar Popovic
-
-Fixes #4325
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/0ca64277b317b4836beccaa3248ab9055526811c]
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- spa/include/spa/pod/builder.h | 2 +-
- spa/include/spa/pod/parser.h  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h
-index 0564d94ea2..6d3e9d54af 100644
---- a/spa/include/spa/pod/builder.h
-+++ b/spa/include/spa/pod/builder.h
-@@ -49,7 +49,7 @@ struct spa_pod_builder {
-        struct spa_callbacks callbacks;
- };
- 
--#define SPA_POD_BUILDER_INIT(buffer,size)  ((struct spa_pod_builder){ (buffer), (size), 0, {0}, {0} })
-+#define SPA_POD_BUILDER_INIT(buffer,size)  ((struct spa_pod_builder){ (buffer), (size), 0, {0,0,NULL},{NULL,NULL}})
- 
- static inline void
- spa_pod_builder_get_state(struct spa_pod_builder *builder, struct spa_pod_builder_state *state)
-diff --git a/spa/include/spa/pod/parser.h b/spa/include/spa/pod/parser.h
-index 083f911713..4c1e72acce 100644
---- a/spa/include/spa/pod/parser.h
-+++ b/spa/include/spa/pod/parser.h
-@@ -33,7 +33,7 @@ struct spa_pod_parser {
-        struct spa_pod_parser_state state;
- };
- 
--#define SPA_POD_PARSER_INIT(buffer,size)  ((struct spa_pod_parser){ (buffer), (size), 0, {0} })
-+#define SPA_POD_PARSER_INIT(buffer,size)  ((struct spa_pod_parser){ (buffer), (size), 0, {0,0,NULL}})
- 
- static inline void spa_pod_parser_init(struct spa_pod_parser *parser,
-                                       const void *data, uint32_t size)
--- 
-GitLab
-
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.7.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.0.bb
index 8c486b9c5e..d897ddb25d 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.7.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.0.bb
@@ -12,9 +12,8 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "dbus ncurses"
 
-SRCREV = "cc7439187f61dd73b81ca69f5dbccbb52ce970b2"
-SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.2;protocol=https"
-SRC_URI += "file://0ca64277b317b4836beccaa3248ab9055526811c.patch"
+SRCREV = "df1c36aec2aaf9e2eb1596b6b55e72c15fb2088a"
+SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
 
@@ -283,6 +282,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.