From 7571dcc880b8000d920f1eef27a3224a4a08f6e0 Mon Sep 17 00:00:00 2001
From: Patrick Gaskin <patrick@pgaskin.net>
Date: Wed, 4 Aug 2021 05:03:08 -0400
Subject: [PATCH] pulseaudio: Update to
 freedesktop/pulseaudio@6329a2498eb038f8a9537888280a62b00a93f68e

New patches:
- build-sys: meson: Fix building without GIO
---
 src/Dockerfile                                |  7 +++--
 ...le-auto-connect-localhost-by-default.patch |  2 +-
 ...02-system.pa-Tweaks-for-custom-build.patch |  2 +-
 ...s-for-custom-build-with-unix-sockets.patch |  2 +-
 ...d-sys-meson-Fix-building-without-GIO.patch | 28 +++++++++++++++++++
 5 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 src/pulseaudio/0004-build-sys-meson-Fix-building-without-GIO.patch

diff --git a/src/Dockerfile b/src/Dockerfile
index fc4ae22..8f8277e 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -4,7 +4,7 @@ FROM opensuse/tumbleweed AS mingw32
 RUN zypper --non-interactive addrepo https://download.opensuse.org/repositories/windows:mingw:win32/openSUSE_Tumbleweed/windows:mingw:win32.repo && \
     zypper --non-interactive --gpg-auto-import-keys refresh
 RUN zypper --non-interactive install \
-        wget m4 git-core meson bsdtar gzip xmlstarlet \
+        wget m4 git-core meson bsdtar gzip xmlstarlet findutils \
         mingw32-filesystem mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-cross-binutils mingw32-cross-pkgconf && \
     zypper clean
 RUN mkdir -p /usr/local/share/meson/cross && \
@@ -83,7 +83,7 @@ RUN mkdir -p /src
 RUN git init /src/pulseaudio && \
     git -C /src/pulseaudio remote add origin https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git && \
     git -C /src/pulseaudio fetch origin && \
-    git -C /src/pulseaudio checkout ce962563eba7ee18ad4641f700d097adbea6b6d7
+    git -C /src/pulseaudio checkout 6329a2498eb038f8a9537888280a62b00a93f68e
 COPY ./pulseaudio/* /src/
 RUN git -C /src/pulseaudio apply /src/*.patch
 ARG PAW32_VERSION=unknown
@@ -94,11 +94,12 @@ RUN meson setup \
         --cross-file mingw32 \
         -Dtests=false \
         -Ddatabase=simple \
+        -Ddoxygen=false \
         -Drunning-from-build-tree=false \
         -Dlegacy-database-entry-format=false \
         -Dprefix=/pulseaudio \
         -Dmodlibexecdir=/pulseaudio/bin \
-        -Dbluez5=false \
+        -Dbluez5=disabled \
         # _WIN32_WINNT=_WIN32_WINNT_WIN7
         -Dc_args="-D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601" \
         /build/pulseaudio /src/pulseaudio
diff --git a/src/pulseaudio/0001-client-conf-Enable-auto-connect-localhost-by-default.patch b/src/pulseaudio/0001-client-conf-Enable-auto-connect-localhost-by-default.patch
index a42df99..f22b06d 100644
--- a/src/pulseaudio/0001-client-conf-Enable-auto-connect-localhost-by-default.patch
+++ b/src/pulseaudio/0001-client-conf-Enable-auto-connect-localhost-by-default.patch
@@ -1,4 +1,4 @@
-From 7a058556c96f59104ca8a87b2cea12c1ed653522 Mon Sep 17 00:00:00 2001
+From 5115f7a2be212825f056a1f619ee5762730f2b9a Mon Sep 17 00:00:00 2001
 From: Patrick Gaskin <patrick@pgaskin.net>
 Date: Thu, 31 Dec 2020 06:38:28 -0500
 Subject: [PATCH] client-conf: Enable auto-connect-localhost by default
diff --git a/src/pulseaudio/0002-system.pa-Tweaks-for-custom-build.patch b/src/pulseaudio/0002-system.pa-Tweaks-for-custom-build.patch
index 9bc978c..37a32a4 100644
--- a/src/pulseaudio/0002-system.pa-Tweaks-for-custom-build.patch
+++ b/src/pulseaudio/0002-system.pa-Tweaks-for-custom-build.patch
@@ -1,4 +1,4 @@
-From 94ed041de040e4e7530dc5f2df52dddd9c906f89 Mon Sep 17 00:00:00 2001
+From 784a2a9242a048f989b7db20ff527f53f008bde5 Mon Sep 17 00:00:00 2001
 From: Patrick Gaskin <patrick@pgaskin.net>
 Date: Thu, 31 Dec 2020 20:43:42 -0500
 Subject: [PATCH] system.pa: Tweaks for custom build
diff --git a/src/pulseaudio/0003-system.pa-Tweaks-for-custom-build-with-unix-sockets.patch b/src/pulseaudio/0003-system.pa-Tweaks-for-custom-build-with-unix-sockets.patch
index 75fdf0e..3a915bd 100644
--- a/src/pulseaudio/0003-system.pa-Tweaks-for-custom-build-with-unix-sockets.patch
+++ b/src/pulseaudio/0003-system.pa-Tweaks-for-custom-build-with-unix-sockets.patch
@@ -1,4 +1,4 @@
-From f92125ff8bdfc6d65298711e7bafccae56e981c4 Mon Sep 17 00:00:00 2001
+From eec511f76538a9e254f2b166898861eb75fa7e05 Mon Sep 17 00:00:00 2001
 From: Patrick Gaskin <patrick@pgaskin.net>
 Date: Thu, 22 Apr 2021 08:11:11 -0400
 Subject: [PATCH] system.pa: Tweaks for custom build with unix sockets
diff --git a/src/pulseaudio/0004-build-sys-meson-Fix-building-without-GIO.patch b/src/pulseaudio/0004-build-sys-meson-Fix-building-without-GIO.patch
new file mode 100644
index 0000000..3031d42
--- /dev/null
+++ b/src/pulseaudio/0004-build-sys-meson-Fix-building-without-GIO.patch
@@ -0,0 +1,28 @@
+From 74469f4b25ad5d31be01b3c721da4a580f876de8 Mon Sep 17 00:00:00 2001
+From: Patrick Gaskin <patrick@pgaskin.net>
+Date: Wed, 4 Aug 2021 04:44:23 -0400
+Subject: [PATCH] build-sys: meson: Fix building without GIO
+
+GIO is only needed for GSettings and GStreamer.
+
+Fixes a regression in 58052e0e04ee1b5fdb1027ebc19717e7766825ec.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index d7e468cab..dfc184679 100644
+--- a/meson.build
++++ b/meson.build
+@@ -614,7 +614,7 @@ if dbus_dep.found()
+   cdata.set('HAVE_DBUS', 1)
+ endif
+ 
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
++gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required: false) # checked later on where needed by gsettings and gstreamer
+ if get_option('gsettings').enabled()
+   assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
+   cdata.set('HAVE_GSETTINGS', 1)
+-- 
+2.31.1
+