From patchwork Sat Oct 11 21:56:34 2014 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: 398894 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 2E6CF1400F1 for ; Sun, 12 Oct 2014 08:56:46 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 636D2920F3; Sat, 11 Oct 2014 21:56:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6KPGRd0Bm0Lp; Sat, 11 Oct 2014 21:56:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 049EC920E7; Sat, 11 Oct 2014 21:56:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0BCC81C107A for ; Sat, 11 Oct 2014 21:56:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 08DBD9530E for ; Sat, 11 Oct 2014 21:56:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3AgNwNsIlw77 for ; Sat, 11 Oct 2014 21:56:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx02.posteo.de (mx02.posteo.de [89.146.194.165]) by hemlock.osuosl.org (Postfix) with ESMTPS id F045C955E7 for ; Sat, 11 Oct 2014 21:56:38 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mx02.posteo.de (Postfix) with ESMTP id C24C725AF50C for ; Sat, 11 Oct 2014 23:56:36 +0200 (CEST) X-Virus-Scanned: amavisd-new at posteo.de Received: from posteo.de ([10.125.125.178]) (using TLS) by localhost (amavis1.posteo.de [10.125.125.165]) (amavisd-new, port 10026) with ESMTPS id zWO4KNOJQFgS; Sat, 11 Oct 2014 23:56:35 +0200 (CEST) Received: from mail.posteo.de (localhost [127.0.0.1]) by mail.posteo.de (Postfix) with ESMTPSA id B4C282C0107; Sat, 11 Oct 2014 23:56:34 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Sat, 11 Oct 2014 23:56:34 +0200 Message-Id: <1413064597-28476-2-git-send-email-jkrause@posteo.de> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1413064597-28476-1-git-send-email-jkrause@posteo.de> References: <1413064597-28476-1-git-send-email-jkrause@posteo.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/upmpdcli: bump to version 0.8.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Signed-off-by: Jörg Krause --- package/upmpdcli/upmpdcli-0001-uclibc-fixes.patch | 159 ---------------------- package/upmpdcli/upmpdcli-0002-musl-fixes.patch | 40 ------ package/upmpdcli/upmpdcli.mk | 2 +- 3 files changed, 1 insertion(+), 200 deletions(-) delete mode 100644 package/upmpdcli/upmpdcli-0001-uclibc-fixes.patch delete mode 100644 package/upmpdcli/upmpdcli-0002-musl-fixes.patch diff --git a/package/upmpdcli/upmpdcli-0001-uclibc-fixes.patch b/package/upmpdcli/upmpdcli-0001-uclibc-fixes.patch deleted file mode 100644 index 2d46b94..0000000 --- a/package/upmpdcli/upmpdcli-0001-uclibc-fixes.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 722ffb8612631b9f11d888c737facdcb0580aaad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 1 Oct 2014 22:31:11 +0200 -Subject: [PATCH 1/1] uclibc fixes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add necessary fixes to build with uClibc - - - Missing #include of C library headers - - exp10 is not available in uClibc - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Jörg Krause ---- - libupnpp/control/avtransport.cxx | 2 ++ - libupnpp/control/ohplaylist.cxx | 1 + - libupnpp/control/renderingcontrol.cxx | 2 ++ - libupnpp/device/device.cxx | 1 + - libupnpp/soaphelp.cxx | 4 ++++ - libupnpp/upnpavutils.cxx | 1 + - upmpd/upmpd.cxx | 1 + - upmpd/upmpdutils.cxx | 7 +++++++ - 8 files changed, 19 insertions(+) - -Index: b/libupnpp/control/avtransport.cxx -=================================================================== ---- a/libupnpp/control/avtransport.cxx -+++ b/libupnpp/control/avtransport.cxx -@@ -15,6 +15,8 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include -+ - #include - #include - -Index: b/libupnpp/control/ohplaylist.cxx -=================================================================== ---- a/libupnpp/control/ohplaylist.cxx -+++ b/libupnpp/control/ohplaylist.cxx -@@ -14,6 +14,7 @@ - * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -+#include - #include - - #include -Index: b/libupnpp/control/renderingcontrol.cxx -=================================================================== ---- a/libupnpp/control/renderingcontrol.cxx -+++ b/libupnpp/control/renderingcontrol.cxx -@@ -15,6 +15,8 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include -+ - #include - #include - -Index: b/libupnpp/device/device.cxx -=================================================================== ---- a/libupnpp/device/device.cxx -+++ b/libupnpp/device/device.cxx -@@ -17,6 +17,7 @@ - #include "config.h" - - #include -+#include - #include - - #include -Index: b/libupnpp/soaphelp.cxx -=================================================================== ---- a/libupnpp/soaphelp.cxx -+++ b/libupnpp/soaphelp.cxx -@@ -16,6 +16,10 @@ - */ - #include "config.h" - -+#include -+#include -+#include -+ - #include - using namespace std; - -Index: b/libupnpp/upnpavutils.cxx -=================================================================== ---- a/libupnpp/upnpavutils.cxx -+++ b/libupnpp/upnpavutils.cxx -@@ -14,6 +14,7 @@ - * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -+#include - #include - using namespace std; - -Index: b/upmpd/upmpd.cxx -=================================================================== ---- a/upmpd/upmpd.cxx -+++ b/upmpd/upmpd.cxx -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include -Index: b/upmpd/upmpdutils.cxx -=================================================================== ---- a/upmpd/upmpdutils.cxx -+++ b/upmpd/upmpdutils.cxx -@@ -21,6 +21,8 @@ - // not linking to Qt or glib just to get path-concatenating - // functions... - -+#define _GNU_SOURCE -+ - #include - #include - #include -@@ -31,6 +33,7 @@ - #include - #include - #include -+#include - #ifndef O_STREAMING - #define O_STREAMING 0 - #endif -@@ -283,6 +286,10 @@ - #ifdef __APPLE__ - #define exp10 __exp10 - #endif -+#ifdef __UCLIBC__ -+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ -+#define exp10(x) (exp((x) * log(10))) -+#endif /* __UCLIBC__ */ - - // Translate VolumeDB to MPD 0-100 - int dbvaluetopercent(int dbvalue) -Index: b/upmpd/ohmetacache.cxx -=================================================================== ---- a/upmpd/ohmetacache.cxx -+++ b/upmpd/ohmetacache.cxx -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #include - using namespace std; diff --git a/package/upmpdcli/upmpdcli-0002-musl-fixes.patch b/package/upmpdcli/upmpdcli-0002-musl-fixes.patch deleted file mode 100644 index c744319..0000000 --- a/package/upmpdcli/upmpdcli-0002-musl-fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bd1a8b6b547e06456cbede686d8c2f3cfdfa47d1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 30 Sep 2014 00:07:26 +0200 -Subject: [PATCH 2/2] musl fixes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Instead of using the nonstandard pthread_yield call use the standardized -sched_yield. - -Signed-off-by: Jörg Krause ---- - libupnpp/control/discovery.cxx | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libupnpp/control/discovery.cxx b/libupnpp/control/discovery.cxx -index ac14a82..0a293c7 100644 ---- a/libupnpp/control/discovery.cxx -+++ b/libupnpp/control/discovery.cxx -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - - #include -@@ -297,7 +298,7 @@ UPnPDeviceDirectory::UPnPDeviceDirectory(time_t search_window) - m_reason = "Discover work queue start failed"; - return; - } -- pthread_yield(); -+ sched_yield(); - LibUPnP *lib = LibUPnP::getLibUPnP(); - if (lib == 0) { - m_reason = "Can't get lib"; --- -2.1.1 - diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 37d8581..0d18dc1 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 0.8.1 +UPMPDCLI_VERSION = 0.8.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING