package/upmpdcli: bump to version 0.8.2
Remove of uclibc and musl patches since they are upstream now. Signed-off-by: Jörg Krause <jkrause@posteo.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Jörg Krause
Peter Korsgaard
parent
c9737ee7f8
commit
aae96ccdff
@ -1,159 +0,0 @@
|
||||
From 722ffb8612631b9f11d888c737facdcb0580aaad Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <jkrause@posteo.de>
|
||||
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 <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Jörg Krause <jkrause@posteo.de>
|
||||
---
|
||||
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 <stdlib.h>
|
||||
+
|
||||
#include <string>
|
||||
#include <functional>
|
||||
|
||||
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 <stdlib.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <string>
|
||||
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 <stdlib.h>
|
||||
+
|
||||
#include <string>
|
||||
#include <functional>
|
||||
|
||||
Index: b/libupnpp/device/device.cxx
|
||||
===================================================================
|
||||
--- a/libupnpp/device/device.cxx
|
||||
+++ b/libupnpp/device/device.cxx
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <time.h>
|
||||
+#include <errno.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <iostream>
|
||||
Index: b/libupnpp/soaphelp.cxx
|
||||
===================================================================
|
||||
--- a/libupnpp/soaphelp.cxx
|
||||
+++ b/libupnpp/soaphelp.cxx
|
||||
@@ -16,6 +16,10 @@
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
+#include <string.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <stdio.h>
|
||||
+
|
||||
#include <iostream>
|
||||
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 <cstdio>
|
||||
#include <string>
|
||||
using namespace std;
|
||||
|
||||
Index: b/upmpd/upmpd.cxx
|
||||
===================================================================
|
||||
--- a/upmpd/upmpd.cxx
|
||||
+++ b/upmpd/upmpd.cxx
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <signal.h>
|
||||
#include <sys/types.h>
|
||||
#include <pwd.h>
|
||||
+#include <errno.h>
|
||||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
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 <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
@@ -31,6 +33,7 @@
|
||||
#include <regex.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
+#include <stdlib.h>
|
||||
#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 <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
+#include <errno.h>
|
||||
|
||||
#include <iostream>
|
||||
using namespace std;
|
||||
@ -1,40 +0,0 @@
|
||||
From bd1a8b6b547e06456cbede686d8c2f3cfdfa47d1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <jkrause@posteo.de>
|
||||
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 <jkrause@posteo.de>
|
||||
---
|
||||
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 <stdlib.h>
|
||||
#include <errno.h>
|
||||
+#include <sched.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <iostream>
|
||||
@@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user