From 68975c03367710176c786e32a046eedd733de692 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sun, 5 Mar 2023 22:57:05 +0100
Subject: [PATCH] update shairport-sync to v3.3.9

---
 cross/shairport-sync/Makefile | 14 ++++----------
 cross/shairport-sync/digests  |  6 +++---
 spk/shairport-sync/Makefile   | 10 +++++-----
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/cross/shairport-sync/Makefile b/cross/shairport-sync/Makefile
index d138cecf808..ff374c035dc 100644
--- a/cross/shairport-sync/Makefile
+++ b/cross/shairport-sync/Makefile
@@ -1,17 +1,16 @@
 PKG_NAME = shairport-sync
-PKG_VERS = 3.3.8
+PKG_VERS = 3.3.9
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/mikebrady/shairport-sync/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-OPTIONAL_DEPENDS = cross/libsndfile
-
 DEPENDS  = cross/libtool cross/libconfig cross/popt cross/libdaemon
 DEPENDS += cross/mbedtls
 DEPENDS += cross/alsa-lib
 DEPENDS += cross/soxr
+DEPENDS += cross/libsndfile
 
 HOMEPAGE = https://github.com/mikebrady/shairport-sync
 COMMENT  = AirPlay audio player. Shairport Sync adds multi-room capability with Audio Synchronisation. Requires USB soundcard or speakers.
@@ -29,16 +28,11 @@ CONFIGURE_ARGS += --with-alsa
 
 include ../../mk/spksrc.archs.mk
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS) $(ARMv5_ARCHS)),$(ARCH))
-# convolution filter is not supported by old compilers
-DEPENDS += cross/libsndfile
+# convolution filter requires -std=c++11
 CONFIGURE_ARGS += --with-convolution
 endif
 
-CONFIGURE_ARGS += ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes
-
-# force DSM 7 compatible sysconfdir
-# sysconfdir=/var/packages/{spk-name}/var - i.e. var as sibling instead of child of "target" folder
-CONFIGURE_ARGS += --sysconfdir=$(dir $(INSTALL_PREFIX))var
+CONFIGURE_ARGS += --sysconfdir=$(INSTALL_PREFIX_VAR)
 
 PRE_CONFIGURE_TARGET = shairport-sync_pre_configure
 
diff --git a/cross/shairport-sync/digests b/cross/shairport-sync/digests
index bdc9a0695b4..e02d858933f 100644
--- a/cross/shairport-sync/digests
+++ b/cross/shairport-sync/digests
@@ -1,3 +1,3 @@
-shairport-sync-3.3.8.tar.gz SHA1 f597caaefcac34b47423d523e335046b253b0e18
-shairport-sync-3.3.8.tar.gz SHA256 c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca
-shairport-sync-3.3.8.tar.gz MD5 b84a05dd6d81ef52b39b02f378e4462b
+shairport-sync-3.3.9.tar.gz SHA1 0c7dde82759059e73c184ce11c035303b9ce31c8
+shairport-sync-3.3.9.tar.gz SHA256 17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795
+shairport-sync-3.3.9.tar.gz MD5 ca1fa16eb03f8e0abbb4baf6b1e2c9be
diff --git a/spk/shairport-sync/Makefile b/spk/shairport-sync/Makefile
index 8e36945e449..edf9a72d3a3 100644
--- a/spk/shairport-sync/Makefile
+++ b/spk/shairport-sync/Makefile
@@ -1,14 +1,14 @@
 SPK_NAME = shairport-sync
-SPK_VERS = 3.3.8
+SPK_VERS = 3.3.9
 SPK_REV = 3
 SPK_ICON = src/shairport-sync.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/shairport-sync
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = AirPlay audio player. Shairport Sync adds multi-room capability with Audio Synchronisation. Requires USB soundcard or speakers.
 DISPLAY_NAME = Shairport Sync
-CHANGELOG = "1. Update to v3.3.8.<br/>2. Update for DSM 7 compatibility.<br/>3. Fix DSM 6 service installation.<br/>4. Add soxr support.<br/>5. Add convolution filter support except for limitted CPUs."
+CHANGELOG = "1. Update to v3.3.9.<br/>2. Update for DSM 7 compatibility.<br/>3. Fix DSM 6 service installation.<br/>4. Add soxr support.<br/>5. Add convolution filter support except for limitted CPUs."
 
 HOMEPAGE = https://github.com/mikebrady/shairport-sync
 LICENSE  = Please refer to the individual source files for licenses.
@@ -18,8 +18,8 @@ SERVICE_USER = auto
 FWPORTS = src/shairport-sync.sc
 
 # the path of the pid file must be configured in the configfile
-# (sessioncontrol.daemon_pid_dir) as "/var/packages/$(SPK_NAME)/var"
-SERVICE_COMMAND = $${SYNOPKG_PKGDEST}/bin/shairport-sync --daemon --configfile=/var/packages/$(SPK_NAME)/var/shairport-sync.conf
+# (sessioncontrol.daemon_pid_dir) as "/var/packages/shairport-sync/var"
+SERVICE_COMMAND = $${SYNOPKG_PKGDEST}/bin/shairport-sync --daemon --configfile=$${SYNOPKG_PKGVAR}/shairport-sync.conf
 
 POST_STRIP_TARGET = shairport_extra_install