Browse Source

Merge pull request #9687 from neheb/libup

libupnpp and upmpdcli
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
a454b4b18a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 80 deletions
  1. +5
    -4
      libs/libupnpp/Makefile
  2. +7
    -7
      sound/upmpdcli/Makefile
  3. +3
    -1
      sound/upmpdcli/files/upmpdcli.init
  4. +0
    -68
      sound/upmpdcli/patches/100-Use-uint64_t-instead-of-u_int64_t.patch

+ 5
- 4
libs/libupnpp/Makefile View File

@ -8,18 +8,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libupnpp
PKG_VERSION:=0.17.0
PKG_VERSION:=0.17.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
PKG_HASH:=7035dda48207c254cbd8cd64e4e679a9e5f085a35d28c19bc2ddeba0deaff58b
PKG_HASH:=90403b55583e932a9a04905a01bf452016a56aecbeade5c9e1454a5fbb6f01b0
PKG_MAINTAINER:=Petko Bordjukov <bordjukov@gmail.com>
PKG_LICENSE:=GPL-2.0
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk


+ 7
- 7
sound/upmpdcli/Makefile View File

@ -8,19 +8,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=upmpdcli
PKG_VERSION:=1.4.0
PKG_VERSION:=1.4.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
PKG_HASH:=1d4489e76416b9cff2e98a68243d56bf46303890752ac18db382be2859b62bc3
PKG_MAINTAINER:=Petko Bordjukov <bordjukov@gmail.com>
PKG_LICENSE:=GPL-2.0
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=28742910fa16b72f0c4e5b7dc561f59aa7f1a5fdd3e8e4f72f359d2e4af90d35
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk


+ 3
- 1
sound/upmpdcli/files/upmpdcli.init View File

@ -16,7 +16,9 @@ append_arg() {
local val
config_get val "$cfg" "$var"
[ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
if [ -n "$val" ] || [ -n "$def" ]; then
procd_append_param command "$opt" "${val:-$def}"
fi
}
start_instance() {


+ 0
- 68
sound/upmpdcli/patches/100-Use-uint64_t-instead-of-u_int64_t.patch View File

@ -1,68 +0,0 @@
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() {
```
---
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.11.0

Loading…
Cancel
Save