From e8fadbcbda7a23e775caa39d206092173f0c0934 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Sun, 3 Nov 2019 16:01:58 +0100
Subject: [PATCH] build: Fix build after recent PipeWire header changes

PipeWire headers were recently cleaned up to reduce the number of
included headers. This leads to a number of functions and types not
being included when needed in wireplumber.
---
 lib/wp/core.c                                           | 1 +
 lib/wp/monitor.c                                        | 3 +++
 lib/wp/proxy-node.c                                     | 1 +
 lib/wp/proxy-port.c                                     | 2 ++
 modules/module-pipewire/audio-softdsp-endpoint/stream.c | 2 ++
 tests/wp/proxy.c                                        | 1 +
 6 files changed, 10 insertions(+)

diff --git a/lib/wp/core.c b/lib/wp/core.c
index c41fde46..3d7902aa 100644
--- a/lib/wp/core.c
+++ b/lib/wp/core.c
@@ -11,6 +11,7 @@
 #include "wpenums.h"
 
 #include <pipewire/pipewire.h>
+#include <spa/utils/result.h>
 
 /*
  * Integration between the PipeWire main loop and GMainLoop
diff --git a/lib/wp/monitor.c b/lib/wp/monitor.c
index 98e5358a..4bf7fd6d 100644
--- a/lib/wp/monitor.c
+++ b/lib/wp/monitor.c
@@ -7,6 +7,9 @@
  */
 
 #include <spa/monitor/device.h>
+#include <spa/pod/builder.h>
+#include <spa/pod/iter.h>
+#include <spa/utils/result.h>
 #include <pipewire/pipewire.h>
 
 #include "monitor.h"
diff --git a/lib/wp/proxy-node.c b/lib/wp/proxy-node.c
index 9d263767..ac769c56 100644
--- a/lib/wp/proxy-node.c
+++ b/lib/wp/proxy-node.c
@@ -10,6 +10,7 @@
 #include "error.h"
 
 #include <pipewire/pipewire.h>
+#include <spa/pod/builder.h>
 
 struct _WpProxyNode
 {
diff --git a/lib/wp/proxy-port.c b/lib/wp/proxy-port.c
index 1e213bf8..3f1606a2 100644
--- a/lib/wp/proxy-port.c
+++ b/lib/wp/proxy-port.c
@@ -10,6 +10,8 @@
 #include "error.h"
 
 #include <pipewire/pipewire.h>
+#include <spa/pod/builder.h>
+#include <spa/pod/iter.h>
 
 struct _WpProxyPort
 {
diff --git a/modules/module-pipewire/audio-softdsp-endpoint/stream.c b/modules/module-pipewire/audio-softdsp-endpoint/stream.c
index f02edc20..8c62e954 100644
--- a/modules/module-pipewire/audio-softdsp-endpoint/stream.c
+++ b/modules/module-pipewire/audio-softdsp-endpoint/stream.c
@@ -9,6 +9,8 @@
 #include <spa/param/props.h>
 #include <pipewire/pipewire.h>
 #include <spa/debug/types.h>
+#include <spa/pod/builder.h>
+#include <spa/pod/iter.h>
 #include <spa/param/audio/type-info.h>
 
 #include "stream.h"
diff --git a/tests/wp/proxy.c b/tests/wp/proxy.c
index 60813754..fa843682 100644
--- a/tests/wp/proxy.c
+++ b/tests/wp/proxy.c
@@ -8,6 +8,7 @@
 
 #include <wp/wp.h>
 #include <pipewire/pipewire.h>
+#include <spa/pod/iter.h>
 
 #include "test-server.h"