Skip to contentSkip to conversation

package/shairport-sync: bump to version 3.3.5

PATCH New Jörg Krause 2 participants 10 messages Dec 3, 2019 – Dec 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 package/shairport-sync: bump to version 3.3.5

---
 package/shairport-sync/shairport-sync.hash | 2 +-
 package/shairport-sync/shairport-sync.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/shairport-sync/shairport-sync.hash +1 -1
index 9b5611af16..b072fad045 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  a8f580fa8eb71172f6237c0cdbf23287b27f41f5399f5addf8cd0115a47a4b2b  shairport-sync-3.3.2.tar.gz
+sha256  9757dd7f19c0bc28cb06a6753305c3ed89da2d271d069b36d1b12173309c1459  shairport-sync-3.3.5.tar.gz
 sha256  1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f  LICENSES
package/shairport-sync/shairport-sync.mk +1 -1
index b5f57faac1..d7c8baa30c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SHAIRPORT_SYNC_VERSION = 3.3.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
Signature · 1 line
2.24.0
#1 lore raw

PATCH 2/5 package/shairport-sync: make libdaemon an optional dependency

Since version 3.3 libdaemon is an optional dependency.

---
 package/shairport-sync/Config.in         | 2 --
 package/shairport-sync/shairport-sync.mk | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
package/shairport-sync/Config.in +0 -2
index 5df4c194c0..085a9ec77d 100644
@@ -1,12 +1,10 @@
 config BR2_PACKAGE_SHAIRPORT_SYNC
 	bool "shairport-sync"
-	depends on BR2_USE_MMU # libdaemon
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_MIXER
 	select BR2_PACKAGE_LIBCONFIG
-	select BR2_PACKAGE_LIBDAEMON
 	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
 	select BR2_PACKAGE_POPT
 	help
package/shairport-sync/shairport-sync.mk +6 -1
index d7c8baa30c..3d9e909879 100644
@@ -9,7 +9,7 @@ SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VE
 
 SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
 SHAIRPORT_SYNC_LICENSE_FILES = LICENSES
-SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
+SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig popt host-pkgconf
 
 # git clone, no configure
 SHAIRPORT_SYNC_AUTORECONF = YES
@@ -33,6 +33,11 @@ else
 SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDAEMON),y)
+SHAIRPORT_SYNC_DEPENDENCIES += libdaemon
+SHAIRPORT_SYNC_CONF_OPTS += --with-libdaemon
+endif
+
 # OpenSSL or mbedTLS
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SHAIRPORT_SYNC_DEPENDENCIES += openssl
Signature · 1 line
2.24.0
#2 lore raw

PATCH 2/5 package/shairport-sync: make libdaemon an optional dependency

Quoted 8 lines · On Tue, 3 Dec 2019 11:53:38 +0100 J?rg Krause <[email protected]>…

SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
SHAIRPORT_SYNC_LICENSE_FILES = LICENSES

package/shairport-sync/shairport-sync.mk +1 -1
-SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
+SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig popt host-pkgconf
 
 # git clone, no configure
 SHAIRPORT_SYNC_AUTORECONF = YES

package/shairport-sync/shairport-sync.mk else · line 39

Quoted 7 lines
package/shairport-sync/shairport-sync.mk +4 -0
@@ -33,6 +33,11 @@ else
 SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDAEMON),y)
+SHAIRPORT_SYNC_DEPENDENCIES += libdaemon
+SHAIRPORT_SYNC_CONF_OPTS += --with-libdaemon
+endif

I've applied, but it would be nice to make shairport-sync follow the same convention as other packages: explicitly pass --without-<foo> when the relevant dependencies are not available (not just for --with-libdaemon, but similarly for other features).

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 3/5 package/shairport-sync: add audio DSP convolution option

In reply to Jörg Krause

Already in version 3.1, shairport-sync added audio DSP convolution support. This optional feature requires the sndfile library.

---
 package/shairport-sync/Config.in         | 6 ++++++
 package/shairport-sync/shairport-sync.mk | 5 +++++
 2 files changed, 11 insertions(+)
package/shairport-sync/Config.in +6 -0
index 085a9ec77d..87f38a940d 100644
@@ -20,6 +20,12 @@ config BR2_PACKAGE_SHAIRPORT_SYNC
 
 if BR2_PACKAGE_SHAIRPORT_SYNC
 
+config BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION
+	bool "convolution support"
+	select BR2_PACKAGE_LIBSNDFILE
+	help
+	  Enable audio DSP convolution support.
+
 config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR
 	bool "libsoxr support"
 	select BR2_PACKAGE_LIBSOXR
package/shairport-sync/shairport-sync.mk +5 -0
index 3d9e909879..1ca56e9f0a 100644
@@ -51,6 +51,11 @@ SHAIRPORT_SYNC_CONF_LIBS += -lz
 endif
 endif
 
+ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION),y)
+SHAIRPORT_SYNC_DEPENDENCIES += libsndfile
+SHAIRPORT_SYNC_CONF_OPTS += --with-convolution
+endif
+
 ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y)
 SHAIRPORT_SYNC_DEPENDENCIES += libsoxr
 SHAIRPORT_SYNC_CONF_OPTS += --with-soxr
Signature · 1 line
2.24.0
#4 lore raw

PATCH 3/5 package/shairport-sync: add audio DSP convolution option

Quoted 8 lines · On Tue, 3 Dec 2019 11:53:39 +0100 J?rg Krause <[email protected]>…

Already in version 3.1, shairport-sync added audio DSP convolution support. This optional feature requires the sndfile library.

---
 package/shairport-sync/Config.in         | 6 ++++++
 package/shairport-sync/shairport-sync.mk | 5 +++++
 2 files changed, 11 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 4/5 package/shairport-sync: add dbus option

In reply to Jörg Krause

Shairport Sync added DBus support in version 3.2.

---
 package/shairport-sync/Config.in         | 11 +++++++++++
 package/shairport-sync/shairport-sync.mk |  5 +++++
 2 files changed, 16 insertions(+)
package/shairport-sync/Config.in +11 -0
index 87f38a940d..6325e9d30d 100644
@@ -26,6 +26,17 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION
 	help
 	  Enable audio DSP convolution support.
 
+config BR2_PACKAGE_SHAIRPORT_SYNC_DBUS
+	bool "dbus support"
+	depends on BR2_USE_WCHAR # libglib2 -> gettext
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  Enable support for support for the MPRIS and native
+	  Shairport Sync D-Bus interface.
+
+comment "shairport-sync dbus support needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
+
 config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR
 	bool "libsoxr support"
 	select BR2_PACKAGE_LIBSOXR
package/shairport-sync/shairport-sync.mk +5 -0
index 1ca56e9f0a..a20570f915 100644
@@ -56,6 +56,11 @@ SHAIRPORT_SYNC_DEPENDENCIES += libsndfile
 SHAIRPORT_SYNC_CONF_OPTS += --with-convolution
 endif
 
+ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y)
+SHAIRPORT_SYNC_DEPENDENCIES += libglib2
+SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface
+endif
+
 ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y)
 SHAIRPORT_SYNC_DEPENDENCIES += libsoxr
 SHAIRPORT_SYNC_CONF_OPTS += --with-soxr
Signature · 1 line
2.24.0
#6 lore raw

PATCH 4/5 package/shairport-sync: add dbus option

Quoted 13 lines · On Tue, 3 Dec 2019 11:53:40 +0100 J?rg Krause <[email protected]>…

Shairport Sync added DBus support in version 3.2.

---
 package/shairport-sync/Config.in         | 11 +++++++++++
 package/shairport-sync/shairport-sync.mk |  5 +++++
 2 files changed, 16 insertions(+)
package/shairport-sync/Config.in +0 -0
index 87f38a940d..6325e9d30d 100644

package/shairport-sync/Config.in config BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION · line 31

Quoted 6 lines
package/shairport-sync/Config.in +3 -0
@@ -26,6 +26,17 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION
 	help
 	  Enable audio DSP convolution support.
 
+config BR2_PACKAGE_SHAIRPORT_SYNC_DBUS
+	bool "dbus support"
+	depends on BR2_USE_WCHAR # libglib2 -> gettext

No need to repeat the full comment, just "# libglib2" is sufficient.

However, you forgot the other dependencies from libglib2: yes the thread dependency was already implied by the dependency of shairport-sync on NPTL, but the BR2_USE_MMU dependency was missing. So I've replicated both, to keep things simple.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH 5/5 package/shairport-sync: add mqtt option

In reply to Jörg Krause

Shairport Sync added support for the MQTT protocol in version 3.2. For full MQTT support Avahi and DBus support are required.

---
 package/shairport-sync/Config.in         | 11 +++++++++++
 package/shairport-sync/shairport-sync.mk |  5 +++++
 2 files changed, 16 insertions(+)
package/shairport-sync/Config.in +11 -0
index 6325e9d30d..185fb3cff1 100644
@@ -49,6 +49,17 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR
 	  can be heard in some circumstances. Libsoxr allows this
 	  interpolation to be done much more smoothly and subtly.
 
+config BR2_PACKAGE_SHAIRPORT_SYNC_MQTT
+	bool "mqtt support"
+	depends on !BR2_STATIC_LIBS # avahi
+	select BR2_PACKAGE_AVAHI
+	select BR2_PACKAGE_AVAHI_DAEMON
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_MOSQUITTO
+	help
+	  Enable support for the MQTT, the Message Queuing Telemetry
+	  Transport protocol.
+
 endif
 
 comment "shairport-sync needs a toolchain w/ C++, NPTL"
package/shairport-sync/shairport-sync.mk +5 -0
index a20570f915..880a058909 100644
@@ -66,6 +66,11 @@ SHAIRPORT_SYNC_DEPENDENCIES += libsoxr
 SHAIRPORT_SYNC_CONF_OPTS += --with-soxr
 endif
 
+ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_MQTT),y)
+SHAIRPORT_SYNC_DEPENDENCIES += avahi dbus mosquitto
+SHAIRPORT_SYNC_CONF_OPTS += --with-mqtt-client
+endif
+
 define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/shairport-sync \
 		$(TARGET_DIR)/usr/bin/shairport-sync
Signature · 1 line
2.24.0
#8 lore raw

PATCH 5/5 package/shairport-sync: add mqtt option

Quoted 14 lines · On Tue, 3 Dec 2019 11:53:41 +0100 J?rg Krause <[email protected]>…

Shairport Sync added support for the MQTT protocol in version 3.2. For full MQTT support Avahi and DBus support are required.

---
 package/shairport-sync/Config.in         | 11 +++++++++++
 package/shairport-sync/shairport-sync.mk |  5 +++++
 2 files changed, 16 insertions(+)
package/shairport-sync/Config.in +0 -0
index 6325e9d30d..185fb3cff1 100644

package/shairport-sync/Config.in config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR · line 54

Quoted 6 lines
package/shairport-sync/Config.in +3 -0
@@ -49,6 +49,17 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR
 	  can be heard in some circumstances. Libsoxr allows this
 	  interpolation to be done much more smoothly and subtly.
 
+config BR2_PACKAGE_SHAIRPORT_SYNC_MQTT
+	bool "mqtt support"
+	depends on !BR2_STATIC_LIBS # avahi

Ditto, some dependencies from avahi were missing, such as the BR2_USE_MMU dependency.

Applied after fixing this. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

PATCH 1/5 package/shairport-sync: bump to version 3.3.5

In reply to Jörg Krause
Quoted 5 lines · On Tue, 3 Dec 2019 11:53:37 +0100 J?rg Krause <[email protected]>…
---
 package/shairport-sync/shairport-sync.hash | 2 +-
 package/shairport-sync/shairport-sync.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com