* [Buildroot] [PATCH 2/3] package/shairport-sync: use without options
2021-08-04 20:59 [Buildroot] [PATCH 1/3] package/shairport-sync: bump to version 3.3.8 Fabrice Fontaine
@ 2021-08-04 20:59 ` Fabrice Fontaine
2021-08-04 20:59 ` [Buildroot] [PATCH 3/3] package/shairport-sync: fix static build with libsndfile Fabrice Fontaine
2021-08-04 21:27 ` [Buildroot] [PATCH 1/3] package/shairport-sync: bump to version 3.3.8 Arnout Vandecappelle
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-08-04 20:59 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Use wihtout options as they have been fixed since version 3.3.8
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/shairport-sync/shairport-sync.mk | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index adc584d554..ba8b44a621 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -28,14 +28,16 @@ SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)"
# libavahi-client.
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
SHAIRPORT_SYNC_DEPENDENCIES += avahi
-SHAIRPORT_SYNC_CONF_OPTS += --with-avahi
+SHAIRPORT_SYNC_CONF_OPTS += --with-avahi --without-tinysvcmdns
else
-SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns
+SHAIRPORT_SYNC_CONF_OPTS += --without-avahi --with-tinysvcmdns
endif
ifeq ($(BR2_PACKAGE_LIBDAEMON),y)
SHAIRPORT_SYNC_DEPENDENCIES += libdaemon
SHAIRPORT_SYNC_CONF_OPTS += --with-libdaemon
+else
+SHAIRPORT_SYNC_CONF_OPTS += --without-libdaemon
endif
# OpenSSL or mbedTLS
@@ -54,21 +56,29 @@ endif
ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION),y)
SHAIRPORT_SYNC_DEPENDENCIES += libsndfile
SHAIRPORT_SYNC_CONF_OPTS += --with-convolution
+else
+SHAIRPORT_SYNC_CONF_OPTS += --without-convolution
endif
ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y)
SHAIRPORT_SYNC_DEPENDENCIES += libglib2
SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface
+else
+SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface
endif
ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y)
SHAIRPORT_SYNC_DEPENDENCIES += libsoxr
SHAIRPORT_SYNC_CONF_OPTS += --with-soxr
+else
+SHAIRPORT_SYNC_CONF_OPTS += --without-soxr
endif
ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_MQTT),y)
SHAIRPORT_SYNC_DEPENDENCIES += avahi dbus mosquitto
SHAIRPORT_SYNC_CONF_OPTS += --with-mqtt-client
+else
+SHAIRPORT_SYNC_CONF_OPTS += --without-mqtt-client
endif
define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] package/shairport-sync: fix static build with libsndfile
2021-08-04 20:59 [Buildroot] [PATCH 1/3] package/shairport-sync: bump to version 3.3.8 Fabrice Fontaine
2021-08-04 20:59 ` [Buildroot] [PATCH 2/3] package/shairport-sync: use without options Fabrice Fontaine
@ 2021-08-04 20:59 ` Fabrice Fontaine
2021-08-04 21:27 ` [Buildroot] [PATCH 1/3] package/shairport-sync: bump to version 3.3.8 Arnout Vandecappelle
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-08-04 20:59 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Fix the following static build failure with libsndfile raise since
commit dbc6e9e9f385995eb10bbfb0bb08e7674100ce66:
/tmp/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /tmp/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libsndfile.a(libsndfile_la-flac.o): in function `flac_byterate':
flac.c:(.text+0xfc): undefined reference to `FLAC__StreamDecoderErrorStatusString'
Fixes:
- http://autobuild.buildroot.org/results/92ed30a6855ca11800b779718822bcba4a69c9a3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...e.ac-find-sndfile-through-pkg-config.patch | 43 +++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch
diff --git a/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch b/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch
new file mode 100644
index 0000000000..bd97ec0c3d
--- /dev/null
+++ b/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch
@@ -0,0 +1,43 @@
+From 900b1827c55cc6020b3242640075174c2e6b12a5 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 4 Aug 2021 22:16:40 +0200
+Subject: [PATCH] configure.ac: find sndfile through pkg-config
+
+Find sndfile through pkg-config to retrieve sndfile dependencies such as
+flac and avoid the following static build failure:
+
+/tmp/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /tmp/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libsndfile.a(libsndfile_la-flac.o): in function `flac_byterate':
+flac.c:(.text+0xfc): undefined reference to `FLAC__StreamDecoderErrorStatusString'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/92ed30a6855ca11800b779718822bcba4a69c9a3
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1263]
+---
+ configure.ac | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f77087c5..9b982c51 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -304,7 +304,14 @@ AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP
+ if test "x$with_convolution" = "xyes" ; then
+ AM_INIT_AUTOMAKE([subdir-objects])
+ AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.])
+- AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
++ if test "x${with_pkg_config}" = xyes ; then
++ PKG_CHECK_MODULES(
++ [sndfile], [sndfile],
++ [CFLAGS="${sndfile_CFLAGS} ${CFLAGS}"
++ LIBS="${sndfile_LIBS} ${LIBS}"], AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
++ else
++ AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
++ fi
+ fi
+ AM_CONDITIONAL([USE_CONVOLUTION], [test "x$with_convolution" = "xyes"])
+
+--
+2.30.2
+
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH 1/3] package/shairport-sync: bump to version 3.3.8
2021-08-04 20:59 [Buildroot] [PATCH 1/3] package/shairport-sync: bump to version 3.3.8 Fabrice Fontaine
2021-08-04 20:59 ` [Buildroot] [PATCH 2/3] package/shairport-sync: use without options Fabrice Fontaine
2021-08-04 20:59 ` [Buildroot] [PATCH 3/3] package/shairport-sync: fix static build with libsndfile Fabrice Fontaine
@ 2021-08-04 21:27 ` Arnout Vandecappelle
2 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-08-04 21:27 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
On 04/08/2021 22:59, Fabrice Fontaine wrote:
> Version 3.3.8 brings many bug fixes and enhancements and is recommended
> for all users.
Given that, I guess it's OK for master.
Series applied to master, thanks.
Regards,
Arnout
>
> https://github.com/mikebrady/shairport-sync/releases/tag/3.3.8
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/shairport-sync/shairport-sync.hash | 2 +-
> package/shairport-sync/shairport-sync.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash
> index c451edb933..ebc81dedc1 100644
> --- a/package/shairport-sync/shairport-sync.hash
> +++ b/package/shairport-sync/shairport-sync.hash
> @@ -1,3 +1,3 @@
> # Locally calculated
> -sha256 7f8d4ecec53f2f681a962467bf09205568fc936c8c31a9ee07b1bd72d3d95b12 shairport-sync-3.3.7.tar.gz
> +sha256 c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca shairport-sync-3.3.8.tar.gz
> sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES
> diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
> index 1a02186dc1..adc584d554 100644
> --- a/package/shairport-sync/shairport-sync.mk
> +++ b/package/shairport-sync/shairport-sync.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -SHAIRPORT_SYNC_VERSION = 3.3.7
> +SHAIRPORT_SYNC_VERSION = 3.3.8
> SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
>
> SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
>
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread