rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
bsp/buildroot/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch Normal file
View File

@@ -0,0 +1,63 @@
From 5101ab2d13e2b89ea3c1276df5fb7413634eeccd Mon Sep 17 00:00:00 2001
From: Mike Brady <mikebrady@eircom.net>
Date: Sat, 25 Aug 2018 13:08:37 +0100
Subject: [PATCH] Sometimes libsoxr is built to rely on libavutil. If libavutil
is detected, link to it when building libsoxr. Add pgk_config support to soxr
selection.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The Buildroot autobuilder detected a build issue [0] when building
shairport-sync statically:
```
arm-buildroot-linux-uclibcgnueabi/sysroot/usr//lib/libsoxr.a(soxr.c.o): In function `soxr_create':
soxr.c:(.text+0xd4c): undefined reference to `av_get_cpu_flags'
collect2: error: ld returned 1 exit status
```
A quick look at the soxr source code shows that `soxr_create()` might use
`av_get_cpu_flags()` depending on the architecture.
For the sake of simplicity link with `-lavutil` if it is found when using soxr.
Even better, as soxr provides a pkg-config file, this should be prefered.
[0] http://autobuild.buildroot.org/results/53d/53d21686780aa2485745b59e812b6280dd39f1c5
Upstream status: 5101ab2d13e2b89ea3c1276df5fb7413634eeccd
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
configure.ac | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 0c917a4..2b6fddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,20 @@ AC_ARG_WITH(ssl, [ choose --with-ssl=openssl, --with-ssl=mbedtls or --with-ssl=p
# Look for soxr flag
AC_ARG_WITH(soxr, [ --with-soxr = choose libsoxr for high-quality interpolation], [
AC_MSG_RESULT(>>Including support for soxr-based interpolation)
- AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))], )
+ if test "x${with_pkg_config}" = xyes ; then
+ PKG_CHECK_MODULES(
+ [SOXR], [soxr],
+ [LIBS="${SOXR_LIBS} ${LIBS}"])
+ else
+ AC_CHECK_LIB([avutil],[av_get_cpu_flags])
+ if test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then
+ # soxr may link against libavutil, depending on the architecture, but for the sake of simplicity link with it if it is found
+ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!), [-lavutil])
+ else
+ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))
+ fi
+ fi
+], )
# Look for metadata flag -- set flag for conditional compilation
AC_ARG_WITH(metadata, [ --with-metadata = include support for a metadata feed], [
--
2.18.0

35
bsp/buildroot/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch Normal file
View File

@@ -0,0 +1,35 @@
From cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 Mon Sep 17 00:00:00 2001
From: Mike Brady <mikebrady@eircom.net>
Date: Sat, 8 Sep 2018 15:06:18 +0100
Subject: [PATCH] Include a definition of HAVE_LIBSOXR with using pkg_config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit e047dee241fe0660d92311a124757065c6c4c93d adds an upstream patch
to fix a build issue with soxr. The patch also adds detecting soxr
using pkg-config. Upstream detected a config issue [1], where the
resulting binary lacks soxr support, although libsoxr was correctly
detected.
Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index ceec4af..690a774 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,7 @@ AC_ARG_WITH(soxr, [ --with-soxr = choose libsoxr for high-quality interpolation
PKG_CHECK_MODULES(
[SOXR], [soxr],
[LIBS="${SOXR_LIBS} ${LIBS}"])
+ AC_DEFINE([HAVE_LIBSOXR],[1],[Define to 1 if you are including support for soxr interpolation])
else
AC_CHECK_LIB([avutil],[av_get_cpu_flags])
if test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then
--
2.18.0

28
bsp/buildroot/package/shairport-sync/Config.in
View File

@@ -2,18 +2,20 @@ 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_POLARSSL if !BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
select BR2_PACKAGE_POPT
help
Shairport Sync emulates an AirPort Express for the purpose of
streaming audio from iTunes, iPods, iPhones, iPads and AppleTVs.
Audio played by a Shairport Sync-powered device stays in synchrony
with the source and thus with other devices that are playing the same
source synchronously. Thus, for example, synchronised multi-room
Shairport Sync emulates an AirPort Express for the purpose
of streaming audio from iTunes, iPods, iPhones, iPads and
AppleTVs. Audio played by a Shairport Sync-powered device
stays in synchrony with the source and thus with other
devices that are playing the same source
synchronously. Thus, for example, synchronised multi-room
audio is possible without difficulty.
https://github.com/mikebrady/shairport-sync
@@ -26,14 +28,14 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR
help
Enable support for libsoxr, the SoX Resampler library.
Briefly, Shairport Sync keeps in step with the audio source by
deleting or inserting frames of audio into the stream as needed. This
"interpolation" is normally inaudible, but it can be heard in some
circumstances. Libsoxr allows this interpolation to be done much more
smoothly and subtly.
Briefly, Shairport Sync keeps in step with the audio source
by deleting or inserting frames of audio into the stream as
needed. This "interpolation" is normally inaudible, but it
can be heard in some circumstances. Libsoxr allows this
interpolation to be done much more smoothly and subtly.
endif
comment "shairport-sync needs a toolchain w/ NPTL"
comment "shairport-sync needs a toolchain w/ C++, NPTL"
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL

2
bsp/buildroot/package/shairport-sync/shairport-sync.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 2e73416ac8fdda1657034afaa143f1710852ebed06e0aa43dafc2b7dc5eb653d shairport-sync-2.8.6.tar.gz
sha256 90555f1a5e05bd777741147d5c0104543d0f26d4f95b9bfd44143c818a6f50f1 shairport-sync-3.1.6.tar.gz

16
bsp/buildroot/package/shairport-sync/shairport-sync.mk
View File

@@ -4,10 +4,10 @@
#
################################################################################
SHAIRPORT_SYNC_VERSION = 2.8.6
SHAIRPORT_SYNC_VERSION = 3.1.6
SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c
SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
SHAIRPORT_SYNC_LICENSE_FILES = LICENSES
SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
@@ -19,6 +19,8 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \
--with-pipe \
--with-stdout
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
@@ -31,13 +33,17 @@ else
SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns
endif
# OpenSSL or PolarSSL
# OpenSSL or mbedTLS
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SHAIRPORT_SYNC_DEPENDENCIES += openssl
SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=openssl
else
SHAIRPORT_SYNC_DEPENDENCIES += polarssl
SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=polarssl
SHAIRPORT_SYNC_DEPENDENCIES += mbedtls
SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=mbedtls
SHAIRPORT_SYNC_CONF_LIBS += -lmbedx509 -lmbedcrypto
ifeq ($(BR2_PACKAGE_MBEDTLS_COMPRESSION),y)
SHAIRPORT_SYNC_CONF_LIBS += -lz
endif
endif
ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y)