2 files changed, 17 insertions, 12 deletions

diff --git a/meta-multimedia/recipes-multimedia/pipewire/files/0001-parser.h-avoid-missing-field-intializers.patch b/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch
index daeff7e13a..9b05e9e4c3 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/files/0001-parser.h-avoid-missing-field-intializers.patch
+++ b/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch
@@ -1,17 +1,22 @@
-From a6d8d98845754b015e2e155c396091b0791a23c9 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sat, 28 Sep 2024 18:39:43 +0200
-Subject: [PATCH] fix zero initialization
+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>
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4325]
 ---
  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 0564d94ea..b0487bf48 100644
+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 {
@@ -19,12 +24,12 @@ index 0564d94ea..b0487bf48 100644
  };
  
 -#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, {}, {} })
++#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 083f91171..387298927 100644
+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 {
@@ -32,10 +37,10 @@ index 083f91171..387298927 100644
  };
  
 -#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, {} })
++#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)
 -- 
-2.46.0
+GitLab
 
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.5.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.6.bb
index a02c5de8c8..4ce047a2a6 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.5.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.6.bb
@@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "dbus ncurses"
 
-SRCREV = "71fac7fa818f21234da4c356de0b44e47e1a2ef2"
+SRCREV = "79eebcb72490484e25208971ca15b9e0ea25bd95"
 SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.2;protocol=https"
-SRC_URI += "file://0001-parser.h-avoid-missing-field-intializers.patch"
+SRC_URI += "file://0ca64277b317b4836beccaa3248ab9055526811c.patch"
 
 S = "${WORKDIR}/git"