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

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
bsp/buildroot/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch Normal file
View File

@@ -0,0 +1,72 @@
From 256394399f57ba6e3057ee2c981127a14e4623f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
Date: Tue, 22 Jan 2019 09:07:56 +0100
Subject: [PATCH] Use uint64_t instead of u_int64_t
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
`uintN_t` is standard C99 type available in `<stdint.h>`, whereas `u_intN_t`
is defined `<sys/types.h>`
As upmpdcli already uses the `uintN_t` type, replace the few existing
`u_intN_t` types, as it breaks build with the musl C library, which is
very strict, because of the missing `<sys/types.h>`:
```
src/mediaserver/cdplugins/netfetch.h:71:5: error: ‘u_int64_t’ does not name a type
u_int64_t datacount() {
```
Backported from: 256394399f57ba6e3057ee2c981127a14e4623f8
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
src/mediaserver/cdplugins/netfetch.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mediaserver/cdplugins/netfetch.h b/src/mediaserver/cdplugins/netfetch.h
index d7e9df4..d105e53 100644
--- a/src/mediaserver/cdplugins/netfetch.h
+++ b/src/mediaserver/cdplugins/netfetch.h
@@ -68,7 +68,7 @@ public:
/// Reset after transfer done, for retrying for exemple.
virtual bool reset() = 0;
- u_int64_t datacount() {
+ uint64_t datacount() {
return fetch_data_count;
}
@@ -84,11 +84,11 @@ public:
buf1cb = f;
}
// Called when the network transfer is done
- void setEOFetchCB(std::function<void(bool ok, u_int64_t count)> f) {
+ void setEOFetchCB(std::function<void(bool ok, uint64_t count)> f) {
eofcb = f;
}
// Called every time we get new data from the remote
- void setFetchBytesCB(std::function<void(u_int64_t count)> f) {
+ void setFetchBytesCB(std::function<void(uint64_t count)> f) {
fbcb = f;
}
@@ -98,11 +98,11 @@ protected:
std::string _url;
uint64_t startoffset;
int timeoutsecs{0};
- u_int64_t fetch_data_count{0};
+ uint64_t fetch_data_count{0};
BufXChange<ABuffer*> *outqueue{nullptr};
std::function<bool(std::string&, void *, int)> buf1cb;
- std::function<void(u_int64_t)> fbcb;
- std::function<void(bool, u_int64_t)> eofcb;
+ std::function<void(uint64_t)> fbcb;
+ std::function<void(bool, uint64_t)> eofcb;
};
#endif /* _MEDIAFETCH_H_INCLUDED_ */
--
2.20.1

8
bsp/buildroot/package/upmpdcli/Config.in
View File

@@ -2,7 +2,7 @@ config BR2_PACKAGE_UPMPDCLI
bool "upmpdcli"
depends on BR2_USE_MMU # fork()
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp, libmicrohttpd
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11, libupnpp
select BR2_PACKAGE_JSONCPP
select BR2_PACKAGE_LIBMICROHTTPD
@@ -15,6 +15,8 @@ config BR2_PACKAGE_UPMPDCLI
http://www.lesbonscomptes.com/upmpdcli/
comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.9"
comment "upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 4.9"
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

6
bsp/buildroot/package/upmpdcli/S99upmpdcli
View File

@@ -1,17 +1,13 @@
#!/bin/sh
NAME=upmpdcli
DAEMON=/usr/bin/$NAME
CONFFILE=/etc/$NAME.conf
PIDFILE=/var/run/$NAME.pid
DAEMON_ARGS="-D -c $CONFFILE"
# Sanity checks
test -f $DAEMON || exit 0
start() {
printf "Starting $NAME: "
start-stop-daemon --start --quiet --background --exec $DAEMON \
start-stop-daemon --start --quiet --background --exec /usr/bin/upmpdcli \
-- $DAEMON_ARGS \
&& echo "OK" || echo "FAIL"
}

6
bsp/buildroot/package/upmpdcli/upmpdcli.hash
View File

@@ -1,5 +1,5 @@
# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.15.tar.gz.sha256:
sha256 93d2b9cfd6cb8643c5a23d4115b44622d76c71abe15db9bb8d5b4d83f4d9b49c upmpdcli-1.2.15.tar.gz
# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.0.tar.gz.sha256:
sha256 28742910fa16b72f0c4e5b7dc561f59aa7f1a5fdd3e8e4f72f359d2e4af90d35 upmpdcli-1.4.0.tar.gz
# Hash for license file:
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING

9
bsp/buildroot/package/upmpdcli/upmpdcli.mk
View File

@@ -4,12 +4,17 @@
#
################################################################################
UPMPDCLI_VERSION = 1.2.15
UPMPDCLI_VERSION = 1.4.0
UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
UPMPDCLI_LICENSE = GPL-2.0+
UPMPDCLI_LICENSE = LGPL-2.1+
UPMPDCLI_LICENSE_FILES = COPYING
UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp
# Disable spotify plugin which requires dlfcn.h
ifeq ($(BR2_STATIC_LIBS),y)
UPMPDCLI_CONF_OPTS = --disable-spotify
endif
# Upmpdcli only runs if user upmpdcli exists
define UPMPDCLI_USERS
upmpdcli -1 upmpdcli -1 * - - audio Upmpdcli MPD UPnP Renderer Front-End