Skip to content

Commit

Permalink
shairport-sync: update to v4.3.2
Browse files Browse the repository at this point in the history
- update mbedtls to v2.28.6
- adjust config (daemon_pid_dir is still required, despite it got removed in sample config)
  • Loading branch information
hgy59 committed Jan 21, 2024
1 parent 62f37cf commit 37c2932
Show file tree
Hide file tree
Showing 13 changed files with 147 additions and 48 deletions.
2 changes: 1 addition & 1 deletion cross/libdaemon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PKG_NAME = libdaemon
PKG_VERS = 0.14
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://0pointer.de/lennart/projects/$(PKG_NAME)
PKG_DIST_SITE = http://0pointer.de/lennart/projects/libdaemon
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =
Expand Down
3 changes: 1 addition & 2 deletions cross/libsndfile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.mega-nerd.com/libsndfile/files
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =
DEPENDS = cross/flac cross/libogg cross/libvorbis

HOMEPAGE = http://www.mega-nerd.com/libsndfile/
COMMENT = C library for reading and writing files containing sampled sound.
Expand All @@ -14,7 +14,6 @@ LICENSE = LGPL
GNU_CONFIGURE = 1

CONFIGURE_ARGS = --disable-static
# Avoid warning that _FORTIFY_SOURCE requires compiling with optimization
ADDITIONAL_CFLAGS = -O2

include ../../mk/spksrc.cross-cc.mk
2 changes: 1 addition & 1 deletion cross/mbedtls/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = mbedtls
PKG_VERS = 2.28.4
PKG_VERS = 2.28.6
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/ARMmbed/mbedtls/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/mbedtls/PLIST
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
lnk:lib/libmbedcrypto.so
lib:lib/libmbedcrypto.so.2.28.4
lib:lib/libmbedcrypto.so.2.28.6
lnk:lib/libmbedcrypto.so.7
lnk:lib/libmbedtls.so
lnk:lib/libmbedtls.so.14
lib:lib/libmbedtls.so.2.28.4
lib:lib/libmbedtls.so.2.28.6
lnk:lib/libmbedx509.so
lib:lib/libmbedx509.so.1
lib:lib/libmbedx509.so.2.28.4
lib:lib/libmbedx509.so.2.28.6
6 changes: 3 additions & 3 deletions cross/mbedtls/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mbedtls-2.28.4.tar.gz SHA1 6fdf9583f64c9944b764bf09dd369044ca8383d6
mbedtls-2.28.4.tar.gz SHA256 504bd29af6e7f9f3de1f0f7b7e16c73987a4194338681acd72b82383a49d55d5
mbedtls-2.28.4.tar.gz MD5 5fbc51c611b466530f24cf015eb0e129
mbedtls-2.28.6.tar.gz SHA1 bcf9e3e1877a8f951b7014fd5178ae041bc1177d
mbedtls-2.28.6.tar.gz SHA256 18cac49f4efef7269d233972bb09c57ace40d992229fa49804e7b10cf0debe43
mbedtls-2.28.6.tar.gz MD5 220cb91781b69d5b180d4acf3ed8286b
3 changes: 2 additions & 1 deletion cross/shairport-sync/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = shairport-sync
PKG_VERS = 3.3.9
PKG_VERS = 4.3.2
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/mikebrady/shairport-sync/archive
Expand All @@ -25,6 +25,7 @@ CONFIGURE_ARGS += --with-tinysvcmdns
CONFIGURE_ARGS += --with-external-mdns
CONFIGURE_ARGS += --with-soxr
CONFIGURE_ARGS += --with-alsa
CONFIGURE_ARGS += --with-piddir=$(INSTALL_DIR)/var

include ../../mk/spksrc.archs.mk
ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS) $(ARMv5_ARCHS)),$(ARCH))
Expand Down
6 changes: 3 additions & 3 deletions cross/shairport-sync/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
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
shairport-sync-4.3.2.tar.gz SHA1 4adfc9dc8c3c8c1dfc391df0b919c343170bf89d
shairport-sync-4.3.2.tar.gz SHA256 dfb485c0603398032a00e51f84b874749bbf155b257adda3d270d5989de08bfd
shairport-sync-4.3.2.tar.gz MD5 d3f9d3e1d031e7748a2697037218ece2
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# remove flag -Wno-psabi as it is not known by older compilers
#
--- Makefile.am.orig 2020-06-30 05:11:35.597469700 +0000
+++ Makefile.am 2020-06-30 05:13:02.237496785 +0000
@@ -15,11 +15,11 @@
--- Makefile.am.orig 2023-10-15 19:42:38.000000000 +0200
+++ Makefile.am 2024-01-21 12:29:19.170277164 +0100
@@ -29,11 +29,11 @@
AM_CFLAGS = -Wno-multichar -Wall -Wextra -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
else
if BUILD_FOR_OPENBSD
Expand All @@ -16,3 +16,4 @@
+ AM_CFLAGS = -fno-common -Wno-multichar -Wall -Wextra -Wno-clobbered -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
endif
endif
endif
30 changes: 30 additions & 0 deletions cross/sps-alsa-explore/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
PKG_NAME = sps-alsa-explore
PKG_VERS = 1.1
PKG_EXT = tar.gz
# git hash from February 17th 2023
PKG_GIT_HASH = defb2ab6ccda8c6bb0506b4c3f0d145ddc0d0bf0
PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/mikebrady/sps-alsa-explore/archive
PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)

DEPENDS = cross/alsa-lib

HOMEPAGE = https://github.com/mikebrady/sps-alsa-explore
COMMENT = A tool to scan ALSA devices for use by Shairport Sync.
LICENSE = GPLv2

GNU_CONFIGURE = 1
PRE_CONFIGURE_TARGET = sps-alsa-explore_pre_configure

include ../../mk/spksrc.archs.mk
ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
# take clock_gettime from librt
ADDITIONAL_LDFLAGS = -lrt
endif

include ../../mk/spksrc.cross-cc.mk

.PHONY: sps-alsa-explore_pre_configure
sps-alsa-explore_pre_configure:
@$(RUN) autoreconf -fi
1 change: 1 addition & 0 deletions cross/sps-alsa-explore/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin:bin/sps-alsa-explore
3 changes: 3 additions & 0 deletions cross/sps-alsa-explore/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sps-alsa-explore-gitdefb2ab6ccda8c6bb0506b4c3f0d145ddc0d0bf0.tar.gz SHA1 20f16965472b9a1d18c1ccd9fa9ec89d05972723
sps-alsa-explore-gitdefb2ab6ccda8c6bb0506b4c3f0d145ddc0d0bf0.tar.gz SHA256 f67cfc569a34fb5e91b678c42c719fb11fe65f77d4f4180973cf99abd1453e6f
sps-alsa-explore-gitdefb2ab6ccda8c6bb0506b4c3f0d145ddc0d0bf0.tar.gz MD5 5af3d8c410cc49c94f6f91443ac98f98
10 changes: 5 additions & 5 deletions spk/shairport-sync/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPK_NAME = shairport-sync
SPK_VERS = 3.3.9
SPK_VERS = 4.3.2
SPK_REV = 3
SPK_ICON = src/shairport-sync.png

Expand All @@ -8,7 +8,7 @@ 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.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."
CHANGELOG = "1. Update to v4.3.2.<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.
Expand All @@ -27,6 +27,6 @@ include ../../mk/spksrc.spk.mk

.PHONY: shairport_extra_install
shairport_extra_install:
install -m 755 -d $(STAGING_DIR)/var
install -m 644 src/alsa.conf $(STAGING_DIR)/share/alsa/alsa.conf
install -m 644 src/shairport-sync.conf $(STAGING_DIR)/var/shairport-sync.conf
@install -m 755 -d $(STAGING_DIR)/var
@install -m 644 src/alsa.conf $(STAGING_DIR)/share/alsa/alsa.conf
@install -m 644 src/shairport-sync.conf $(STAGING_DIR)/var/shairport-sync.conf
Loading

0 comments on commit 37c2932

Please sign in to comment.