From 9dae317a40bfc5021d7a0517357a4d2daa236c5d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 15 Jan 2021 00:54:10 +0000
Subject: [PATCH] extra/pulseaudio to 14.1-2

---
 extra/pulseaudio/PKGBUILD | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 631330c81..297ed1ba4 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse alsa-card-profiles pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp})
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=14.1
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
@@ -32,6 +32,17 @@ prepare() {
   # Freeze version before patching
   ./git-version-gen doesnt-exist >.tarball-version
 
+  # Pick some ACP updates required by pipewire
+  git cherry-pick -n \
+    a28f2e7293a055588f7bba568b5049ff91b3aad0 \
+    69ba5a2b58ad6e98c8899aa297afd8276dbbe052 \
+    05c373d939506f31f96e58d8390b92e737e12afc \
+    a73ec2a3f4f03829575761dc17546cf3226861c7 \
+    71aa4720a4194e9602271634d9042b8e56a8217f \
+    7ec6ee4725a72b42ddcb38550efc968a06e6be2f \
+    836ba89c4a3cd15efa33f9e70ed8e4764bcb3793 \
+    19e34d8d5bb9380ed70607b3f661c26df6d4836c
+
   if [[ $CARCH != "aarch64" ]]; then
     patch -p1 -i ../0001-disable-neon.patch
   fi