From patchwork Wed Apr 3 18:42:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 1076305 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44ZFMf57tQz9sPp for ; Thu, 4 Apr 2019 05:43:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 176912E0DF; Wed, 3 Apr 2019 18:43:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jwwZdNjfAxHP; Wed, 3 Apr 2019 18:43:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2580B26FBA; Wed, 3 Apr 2019 18:43:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7F39B1BF589 for ; Wed, 3 Apr 2019 18:42:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 79C6826FBA for ; Wed, 3 Apr 2019 18:42:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2hu3dYBmPufw for ; Wed, 3 Apr 2019 18:42:58 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by silver.osuosl.org (Postfix) with ESMTPS id 7134A253A7 for ; Wed, 3 Apr 2019 18:42:58 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 97F5B2400E5 for ; Wed, 3 Apr 2019 20:42:56 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 44ZFM40xzxz9rxH for ; Wed, 3 Apr 2019 20:42:56 +0200 (CEST) Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id aj3VfpsEAkpM; Wed, 3 Apr 2019 20:42:55 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-15-89.dynamic.qsc.de [92.195.15.89]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 3 Apr 2019 20:42:55 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Wed, 3 Apr 2019 20:42:53 +0200 Message-Id: <20190403184253.17934-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/upmpdcli: bump to version 1.4.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop upstream patch 0001, which is included in the new version. Signed-off-by: Jörg Krause --- ...01-Use-uint64_t-instead-of-u_int64_t.patch | 72 ------------------- package/upmpdcli/upmpdcli.hash | 4 +- package/upmpdcli/upmpdcli.mk | 2 +- 3 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch diff --git a/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch b/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch deleted file mode 100644 index 69e05827ce..0000000000 --- a/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch +++ /dev/null @@ -1,72 +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() { -``` - -Backported from: 256394399f57ba6e3057ee2c981127a14e4623f8 - -Signed-off-by: Jörg Krause ---- - 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.20.1 - diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index cbd12fe293..09df35491e 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,5 +1,5 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.0.tar.gz.sha256: -sha256 28742910fa16b72f0c4e5b7dc561f59aa7f1a5fdd3e8e4f72f359d2e4af90d35 upmpdcli-1.4.0.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.2.tar.gz.sha256: +sha256 1d4489e76416b9cff2e98a68243d56bf46303890752ac18db382be2859b62bc3 upmpdcli-1.4.2.tar.gz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 22a5bf2429..2241853fe1 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.4.0 +UPMPDCLI_VERSION = 1.4.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = LGPL-2.1+ UPMPDCLI_LICENSE_FILES = COPYING