* [Buildroot] [PATCH 2/5] package/shairport-sync: make libdaemon an optional dependency
2019-12-03 10:53 [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5 Jörg Krause
@ 2019-12-03 10:53 ` Jörg Krause
2019-12-08 22:23 ` Thomas Petazzoni
2019-12-03 10:53 ` [Buildroot] [PATCH 3/5] package/shairport-sync: add audio DSP convolution option Jörg Krause
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Jörg Krause @ 2019-12-03 10:53 UTC (permalink / raw)
To: buildroot
Since version 3.3 libdaemon is an optional dependency.
Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
---
package/shairport-sync/Config.in | 2 --
package/shairport-sync/shairport-sync.mk | 7 ++++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
index 5df4c194c0..085a9ec77d 100644
--- a/package/shairport-sync/Config.in
+++ b/package/shairport-sync/Config.in
@@ -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
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index d7c8baa30c..3d9e909879 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -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
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 2/5] package/shairport-sync: make libdaemon an optional dependency
2019-12-03 10:53 ` [Buildroot] [PATCH 2/5] package/shairport-sync: make libdaemon an optional dependency Jörg Krause
@ 2019-12-08 22:23 ` Thomas Petazzoni
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2019-12-08 22:23 UTC (permalink / raw)
To: buildroot
On Tue, 3 Dec 2019 11:53:38 +0100
J?rg Krause <joerg.krause@embedded.rocks> wrote:
> 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
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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/5] package/shairport-sync: add audio DSP convolution option
2019-12-03 10:53 [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5 Jörg Krause
2019-12-03 10:53 ` [Buildroot] [PATCH 2/5] package/shairport-sync: make libdaemon an optional dependency Jörg Krause
@ 2019-12-03 10:53 ` Jörg Krause
2019-12-08 22:23 ` Thomas Petazzoni
2019-12-03 10:53 ` [Buildroot] [PATCH 4/5] package/shairport-sync: add dbus option Jörg Krause
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Jörg Krause @ 2019-12-03 10:53 UTC (permalink / raw)
To: buildroot
Already in version 3.1, shairport-sync added audio DSP convolution support. This
optional feature requires the sndfile library.
Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
---
package/shairport-sync/Config.in | 6 ++++++
package/shairport-sync/shairport-sync.mk | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
index 085a9ec77d..87f38a940d 100644
--- a/package/shairport-sync/Config.in
+++ b/package/shairport-sync/Config.in
@@ -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
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index 3d9e909879..1ca56e9f0a 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -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
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 4/5] package/shairport-sync: add dbus option
2019-12-03 10:53 [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5 Jörg Krause
2019-12-03 10:53 ` [Buildroot] [PATCH 2/5] package/shairport-sync: make libdaemon an optional dependency Jörg Krause
2019-12-03 10:53 ` [Buildroot] [PATCH 3/5] package/shairport-sync: add audio DSP convolution option Jörg Krause
@ 2019-12-03 10:53 ` Jörg Krause
2019-12-08 22:24 ` Thomas Petazzoni
2019-12-03 10:53 ` [Buildroot] [PATCH 5/5] package/shairport-sync: add mqtt option Jörg Krause
2019-12-08 22:22 ` [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5 Thomas Petazzoni
4 siblings, 1 reply; 10+ messages in thread
From: Jörg Krause @ 2019-12-03 10:53 UTC (permalink / raw)
To: buildroot
Shairport Sync added DBus support in version 3.2.
Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
---
package/shairport-sync/Config.in | 11 +++++++++++
package/shairport-sync/shairport-sync.mk | 5 +++++
2 files changed, 16 insertions(+)
diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
index 87f38a940d..6325e9d30d 100644
--- a/package/shairport-sync/Config.in
+++ b/package/shairport-sync/Config.in
@@ -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
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index 1ca56e9f0a..a20570f915 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -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
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 4/5] package/shairport-sync: add dbus option
2019-12-03 10:53 ` [Buildroot] [PATCH 4/5] package/shairport-sync: add dbus option Jörg Krause
@ 2019-12-08 22:24 ` Thomas Petazzoni
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2019-12-08 22:24 UTC (permalink / raw)
To: buildroot
On Tue, 3 Dec 2019 11:53:40 +0100
J?rg Krause <joerg.krause@embedded.rocks> wrote:
> Shairport Sync added DBus support in version 3.2.
>
> Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
> ---
> package/shairport-sync/Config.in | 11 +++++++++++
> package/shairport-sync/shairport-sync.mk | 5 +++++
> 2 files changed, 16 insertions(+)
>
> diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
> index 87f38a940d..6325e9d30d 100644
> --- a/package/shairport-sync/Config.in
> +++ b/package/shairport-sync/Config.in
> @@ -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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 5/5] package/shairport-sync: add mqtt option
2019-12-03 10:53 [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5 Jörg Krause
` (2 preceding siblings ...)
2019-12-03 10:53 ` [Buildroot] [PATCH 4/5] package/shairport-sync: add dbus option Jörg Krause
@ 2019-12-03 10:53 ` Jörg Krause
2019-12-08 22:24 ` Thomas Petazzoni
2019-12-08 22:22 ` [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5 Thomas Petazzoni
4 siblings, 1 reply; 10+ messages in thread
From: Jörg Krause @ 2019-12-03 10:53 UTC (permalink / raw)
To: buildroot
Shairport Sync added support for the MQTT protocol in version 3.2. For
full MQTT support Avahi and DBus support are required.
Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
---
package/shairport-sync/Config.in | 11 +++++++++++
package/shairport-sync/shairport-sync.mk | 5 +++++
2 files changed, 16 insertions(+)
diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
index 6325e9d30d..185fb3cff1 100644
--- a/package/shairport-sync/Config.in
+++ b/package/shairport-sync/Config.in
@@ -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"
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index a20570f915..880a058909 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -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
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 5/5] package/shairport-sync: add mqtt option
2019-12-03 10:53 ` [Buildroot] [PATCH 5/5] package/shairport-sync: add mqtt option Jörg Krause
@ 2019-12-08 22:24 ` Thomas Petazzoni
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2019-12-08 22:24 UTC (permalink / raw)
To: buildroot
On Tue, 3 Dec 2019 11:53:41 +0100
J?rg Krause <joerg.krause@embedded.rocks> wrote:
> Shairport Sync added support for the MQTT protocol in version 3.2. For
> full MQTT support Avahi and DBus support are required.
>
> Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
> ---
> package/shairport-sync/Config.in | 11 +++++++++++
> package/shairport-sync/shairport-sync.mk | 5 +++++
> 2 files changed, 16 insertions(+)
>
> diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
> index 6325e9d30d..185fb3cff1 100644
> --- a/package/shairport-sync/Config.in
> +++ b/package/shairport-sync/Config.in
> @@ -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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5
2019-12-03 10:53 [Buildroot] [PATCH 1/5] package/shairport-sync: bump to version 3.3.5 Jörg Krause
` (3 preceding siblings ...)
2019-12-03 10:53 ` [Buildroot] [PATCH 5/5] package/shairport-sync: add mqtt option Jörg Krause
@ 2019-12-08 22:22 ` Thomas Petazzoni
4 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2019-12-08 22:22 UTC (permalink / raw)
To: buildroot
On Tue, 3 Dec 2019 11:53:37 +0100
J?rg Krause <joerg.krause@embedded.rocks> wrote:
> Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
> ---
> 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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 10+ messages in thread