mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 a8382affd25c473fa38ead5690148c6c3902098f359f9c881eefe139e1f49f49 shairport-sync-3.3.6.tar.gz
|
||||
sha256 17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795 shairport-sync-3.3.9.tar.gz
|
||||
sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SHAIRPORT_SYNC_VERSION = 3.3.6
|
||||
SHAIRPORT_SYNC_VERSION = 3.3.9
|
||||
SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
|
||||
|
||||
SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
|
||||
@@ -22,20 +22,18 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \
|
||||
SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)"
|
||||
|
||||
# Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns).
|
||||
# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
|
||||
# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
|
||||
# option yet, use the avahi-daemon and dbus congig symbols to check for
|
||||
# libavahi-client.
|
||||
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
|
||||
ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y)
|
||||
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 +52,37 @@ 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
|
||||
define SHAIRPORT_SYNC_INSTALL_DBUS
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(@D)/scripts/shairport-sync-dbus-policy.conf \
|
||||
$(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(@D)/scripts/shairport-sync-mpris-policy.conf \
|
||||
$(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf
|
||||
endef
|
||||
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
|
||||
@@ -76,6 +90,7 @@ define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS
|
||||
$(TARGET_DIR)/usr/bin/shairport-sync
|
||||
$(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \
|
||||
$(TARGET_DIR)/etc/shairport-sync.conf
|
||||
$(SHAIRPORT_SYNC_INSTALL_DBUS)
|
||||
endef
|
||||
|
||||
define SHAIRPORT_SYNC_INSTALL_INIT_SYSV
|
||||
|
||||
Reference in New Issue
Block a user