Update to libupnp-1.6.17
"if it works, go ahead" ajacoutot@
This commit is contained in:
dcoppa
parent
9f04d57292
commit
c3230c30a6
@ -1,16 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2012/03/30 06:48:01 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2012/11/06 11:48:28 dcoppa Exp $
|
||||
|
||||
COMMENT= Universal Plug and Play SDK
|
||||
|
||||
DISTNAME= libupnp-1.6.6
|
||||
DISTNAME= libupnp-1.6.17
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= net devel
|
||||
|
||||
SHARED_LIBS += ixml 0.0 # .2.4
|
||||
SHARED_LIBS += threadutil 0.0 # .4.3
|
||||
SHARED_LIBS += upnp 0.0 # .3.5
|
||||
SHARED_LIBS += ixml 0.1 # .2.7
|
||||
SHARED_LIBS += threadutil 1.0 # .6.2
|
||||
SHARED_LIBS += upnp 1.0 # .9.1
|
||||
|
||||
HOMEPAGE= http://pupnp.sourceforge.net/
|
||||
|
||||
@ -22,6 +21,8 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pupnp/}
|
||||
|
||||
WANTLIB = pthread
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
MD5 (libupnp-1.6.6.tar.bz2) = iRjc90KM0RnQyCdXZf8oMw==
|
||||
RMD160 (libupnp-1.6.6.tar.bz2) = Jf8DkHk8+kjMoyozW01jMoOx/mQ=
|
||||
SHA1 (libupnp-1.6.6.tar.bz2) = JMLDSctS7T1iEh+9riBcjZ3A9fo=
|
||||
SHA256 (libupnp-1.6.6.tar.bz2) = WNfKvsKyHIDiik5QkLupSoSajwJFDibBuYUxijawu7M=
|
||||
SIZE (libupnp-1.6.6.tar.bz2) = 1146854
|
||||
SHA256 (libupnp-1.6.17.tar.bz2) = ouDZqfGntni82+92EK3siVpsjLj5Zw1eH8ljz1HN0hk=
|
||||
SIZE (libupnp-1.6.17.tar.bz2) = 1187499
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-threadutil_inc_ithread_h,v 1.1.1.1 2010/03/22 22:25:50 ajacoutot Exp $
|
||||
--- threadutil/inc/ithread.h.orig Tue Feb 9 12:17:14 2010
|
||||
+++ threadutil/inc/ithread.h Tue Feb 9 12:17:42 2010
|
||||
@@ -41,7 +41,7 @@ extern "C" {
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
-#ifdef __FreeBSD__
|
||||
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
|
||||
#endif
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-threadutil_src_ThreadPool_c,v 1.1.1.1 2010/03/22 22:25:50 ajacoutot Exp $
|
||||
--- threadutil/src/ThreadPool.c.orig Tue Feb 9 12:15:59 2010
|
||||
+++ threadutil/src/ThreadPool.c Tue Feb 9 12:17:04 2010
|
||||
@@ -389,7 +389,7 @@ static void SetSeed()
|
||||
gettimeofday(&t, NULL);
|
||||
#if defined(WIN32)
|
||||
srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
|
||||
-#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
|
||||
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__OSX__) || defined(__APPLE__)
|
||||
srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
|
||||
#elif defined(__linux__) || defined(__sun)
|
||||
srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );
|
||||
@@ -1514,7 +1514,7 @@ void ThreadPoolPrintStats(ThreadPoolStats *stats)
|
||||
return;
|
||||
}
|
||||
|
||||
-#ifdef __FreeBSD__
|
||||
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
printf("ThreadPoolStats at Time: %d\n", StatsTime(NULL));
|
||||
#else /* __FreeBSD__ */
|
||||
printf("ThreadPoolStats at Time: %ld\n", StatsTime(NULL));
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-upnp_src_api_upnpapi_c,v 1.1.1.1 2010/03/22 22:25:50 ajacoutot Exp $
|
||||
--- upnp/src/api/upnpapi.c.orig Tue Feb 9 12:20:34 2010
|
||||
+++ upnp/src/api/upnpapi.c Tue Feb 9 12:20:57 2010
|
||||
@@ -44,11 +44,11 @@
|
||||
|
||||
#ifndef WIN32
|
||||
#include <arpa/inet.h>
|
||||
+ #include <sys/socket.h>
|
||||
#include <net/if.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/param.h>
|
||||
- #include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/utsname.h>
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-upnp_src_inc_config_h,v 1.1 2012/03/30 06:48:01 ajacoutot Exp $
|
||||
$OpenBSD: patch-upnp_src_inc_config_h,v 1.2 2012/11/06 11:48:28 dcoppa Exp $
|
||||
|
||||
http://lifewithushare.blogspot.fr/2008/01/simultaneous-streaming-to-multiple.html
|
||||
|
||||
--- upnp/src/inc/config.h.orig Fri Mar 30 08:44:07 2012
|
||||
+++ upnp/src/inc/config.h Fri Mar 30 08:44:18 2012
|
||||
@@ -78,7 +78,7 @@
|
||||
--- upnp/src/inc/config.h.orig Fri Nov 2 15:18:39 2012
|
||||
+++ upnp/src/inc/config.h Fri Nov 2 15:18:54 2012
|
||||
@@ -90,7 +90,7 @@
|
||||
*
|
||||
* @{
|
||||
*/
|
||||
|
||||
//@{
|
||||
-#define MIN_THREADS 2
|
||||
+#define MIN_THREADS 6
|
||||
//@}
|
||||
/* @} */
|
||||
|
||||
|
||||
/** @name MAX_THREADS
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-upnp_src_ssdp_ssdp_server_c,v 1.1.1.1 2010/03/22 22:25:50 ajacoutot Exp $
|
||||
--- upnp/src/ssdp/ssdp_server.c.orig Tue Feb 9 12:17:50 2010
|
||||
+++ upnp/src/ssdp/ssdp_server.c Tue Feb 9 12:18:15 2010
|
||||
@@ -915,7 +915,7 @@ get_ssdp_sockets( MiniServerSockArray * out )
|
||||
return UPNP_E_SOCKET_ERROR;
|
||||
}
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
|
||||
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__OSX__) || defined(__APPLE__)
|
||||
ret = setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
|
||||
(char *)&onOff, sizeof (onOff) );
|
||||
if ( ret == -1 ) {
|
||||
@ -1,12 +1,19 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/03/22 22:25:50 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2012/11/06 11:48:28 dcoppa Exp $
|
||||
%%SHARED%%
|
||||
include/upnp/
|
||||
include/upnp/FreeList.h
|
||||
include/upnp/LinkedList.h
|
||||
include/upnp/ThreadPool.h
|
||||
include/upnp/TimerThread.h
|
||||
include/upnp/UpnpGlobal.h
|
||||
include/upnp/UpnpInet.h
|
||||
include/upnp/UpnpIntTypes.h
|
||||
include/upnp/UpnpStdInt.h
|
||||
include/upnp/UpnpString.h
|
||||
include/upnp/UpnpUniStd.h
|
||||
include/upnp/ithread.h
|
||||
include/upnp/ixml.h
|
||||
include/upnp/ixmldebug.h
|
||||
include/upnp/upnp.h
|
||||
include/upnp/upnpconfig.h
|
||||
include/upnp/upnpdebug.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user