From b2998369c2369fb280d1149fe10f9e38be72b24a Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 6 Jan 2020 15:15:52 +0100
Subject: [PATCH] MycroftOS: Initial start of implementing Airplay support.

---
 buildroot-external/configs/rpi3_defconfig     |  2 +-
 buildroot-external/configs/rpi4_defconfig     |  2 +-
 .../rootfs-overlay/etc/shairport-sync.conf    |  4 ++
 ...irport-sync-and-build-for-PulseAudio.patch | 44 +++++++++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 buildroot-external/rootfs-overlay/etc/shairport-sync.conf
 create mode 100644 buildroot-patches/0030-Bump-shairport-sync-and-build-for-PulseAudio.patch

diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig
index 370364a7..e66ddfec 100644
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -218,7 +218,6 @@ BR2_PACKAGE_GNUTLS_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBOPENSSL_ENGINES=y
-BR2_PACKAGE_LIBCONFIG=y
 BR2_PACKAGE_LIBNFS=y
 BR2_PACKAGE_LIBRSVG=y
 BR2_PACKAGE_LIBGUDEV=y
@@ -266,6 +265,7 @@ BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
 BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_SHAIRPORT_SYNC=y
 BR2_PACKAGE_WGET=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig
index 2abb4448..42af01eb 100644
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -219,7 +219,6 @@ BR2_PACKAGE_GNUTLS_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBOPENSSL_ENGINES=y
-BR2_PACKAGE_LIBCONFIG=y
 BR2_PACKAGE_LIBNFS=y
 BR2_PACKAGE_LIBRSVG=y
 BR2_PACKAGE_LIBGUDEV=y
@@ -267,6 +266,7 @@ BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
 BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_SHAIRPORT_SYNC=y
 BR2_PACKAGE_WGET=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
diff --git a/buildroot-external/rootfs-overlay/etc/shairport-sync.conf b/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
new file mode 100644
index 00000000..d8f99118
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
@@ -0,0 +1,4 @@
+general = {
+  name = "MycroftOS - Airplay";
+  output_backend = "pa";
+};
diff --git a/buildroot-patches/0030-Bump-shairport-sync-and-build-for-PulseAudio.patch b/buildroot-patches/0030-Bump-shairport-sync-and-build-for-PulseAudio.patch
new file mode 100644
index 00000000..65f828dd
--- /dev/null
+++ b/buildroot-patches/0030-Bump-shairport-sync-and-build-for-PulseAudio.patch
@@ -0,0 +1,44 @@
+From 794b1584ce54f64c0a940a80121417dc4bc42d2a Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Mon, 6 Jan 2020 14:42:23 +0100
+Subject: [PATCH 1/1] Bump shairport-sync and build for PulseAudio.
+
+---
+ package/shairport-sync/shairport-sync.hash | 2 +-
+ package/shairport-sync/shairport-sync.mk   | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash
+index 6f73d109e4..b072fad045 100644
+--- a/package/shairport-sync/shairport-sync.hash
++++ b/package/shairport-sync/shairport-sync.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256  4f1ee142b887842727ae0c310e21c83ea2386518e841a25c7ddb015d08b54eba  shairport-sync-3.2.2.tar.gz
++sha256  9757dd7f19c0bc28cb06a6753305c3ed89da2d271d069b36d1b12173309c1459  shairport-sync-3.3.5.tar.gz
+ sha256  1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f  LICENSES
+diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
+index 5f93f1b8ea..7520f367cf 100644
+--- a/package/shairport-sync/shairport-sync.mk
++++ b/package/shairport-sync/shairport-sync.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-SHAIRPORT_SYNC_VERSION = 3.2.2
++SHAIRPORT_SYNC_VERSION = 3.3.5
+ SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
+ 
+ SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
+@@ -14,7 +14,7 @@ SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
+ # git clone, no configure
+ SHAIRPORT_SYNC_AUTORECONF = YES
+ 
+-SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \
++SHAIRPORT_SYNC_CONF_OPTS = --with-pa \
+ 	--with-metadata \
+ 	--with-pipe \
+ 	--with-stdout
+-- 
+2.24.0.rc1
+