From f6033cf84137403cf0a246cdccc1d37f1ad0a570 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 9 Aug 2019 19:30:10 -0700 Subject: [PATCH 1/2] libupnpp: Update to 0.17.1 Fixed up license information. Added PKG_BUILD_PARALLEL for faster compilation. Signed-off-by: Rosen Penev --- libs/libupnpp/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile index 8848404ad..fa788c10e 100644 --- a/libs/libupnpp/Makefile +++ b/libs/libupnpp/Makefile @@ -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 -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 From b2d016d3527d3e5cc1ccf2e147c49deb9e0bccf8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 9 Aug 2019 19:40:42 -0700 Subject: [PATCH 2/2] upmpdcli: Update to 1.4.2 Fixed license information. Added PKG_BUILD_PARALLEL for faster compilation. Removed upstreamed patch. Ran init script through shellcheck. Signed-off-by: Rosen Penev --- sound/upmpdcli/Makefile | 14 ++-- sound/upmpdcli/files/upmpdcli.init | 4 +- ...00-Use-uint64_t-instead-of-u_int64_t.patch | 68 ------------------- 3 files changed, 10 insertions(+), 76 deletions(-) delete mode 100644 sound/upmpdcli/patches/100-Use-uint64_t-instead-of-u_int64_t.patch diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile index 259e8c9c3..3d1a614a0 100644 --- a/sound/upmpdcli/Makefile +++ b/sound/upmpdcli/Makefile @@ -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 -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 diff --git a/sound/upmpdcli/files/upmpdcli.init b/sound/upmpdcli/files/upmpdcli.init index 6c69209c2..061628f94 100644 --- a/sound/upmpdcli/files/upmpdcli.init +++ b/sound/upmpdcli/files/upmpdcli.init @@ -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() { diff --git a/sound/upmpdcli/patches/100-Use-uint64_t-instead-of-u_int64_t.patch b/sound/upmpdcli/patches/100-Use-uint64_t-instead-of-u_int64_t.patch deleted file mode 100644 index de0da18bb..000000000 --- a/sound/upmpdcli/patches/100-Use-uint64_t-instead-of-u_int64_t.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 256394399f57ba6e3057ee2c981127a14e4623f8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -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 ``, whereas `u_intN_t` -is defined `` - -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 ``: - -``` -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 f) { -+ void setEOFetchCB(std::function f) { - eofcb = f; - } - // Called every time we get new data from the remote -- void setFetchBytesCB(std::function f) { -+ void setFetchBytesCB(std::function 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 *outqueue{nullptr}; - std::function buf1cb; -- std::function fbcb; -- std::function eofcb; -+ std::function fbcb; -+ std::function eofcb; - }; - - #endif /* _MEDIAFETCH_H_INCLUDED_ */ --- -2.11.0 -