Contribs: update upnp to 1.6.14

diff --git a/contrib/src/upnp/SHA512SUMS b/contrib/src/upnp/SHA512SUMS
index 087ffe756887dc1e2998e7ed9602193f3e5adc5e..5bce6525592df47edcff3864c14dc4190d84ec15 100644 (file)
--- a/contrib/src/upnp/SHA512SUMS
+++ b/contrib/src/upnp/SHA512SUMS
@@ -1 +1 @@
-b1eca8fd6a61790197a33c14e00b380126b99261a0568061967c5623264982a7e6ab68b39b7c4ed066a0c38ab927dc17d69799ea48701416f5a217c6fffe2ce1  libupnp-1.6.13.tar.bz2
+cd8344ba132e0dd8d6a338bfb67121f7f8b96e321bfccb5bb2a0337b618ccc65596ade110c281f31c311ff5b232f3e7e853ddcc74ea0c52c8dfdf77e42c5ca88  libupnp-1.6.14.tar.bz2

diff --git a/contrib/src/upnp/libupnp-win32.patch b/contrib/src/upnp/libupnp-win32.patch
index f26ba5bd01cbde7b7494f52433873a757bc456ef..686e3bae19c1da6fd74fb0fef455a6f71b9ab8a9 100644 (file)
--- a/contrib/src/upnp/libupnp-win32.patch
+++ b/contrib/src/upnp/libupnp-win32.patch
@@ -29,3 +29,17 @@
        #else
                #define max(a, b)   (((a)>(b))? (a):(b))
                #define min(a, b)   (((a)<(b))? (a):(b))
+--- upnp/upnp/inc/UpnpInet.h   2011-04-03 04:50:36.000000000 +0200
++++ upnp.neww/upnp/inc/UpnpInet.h      2011-11-18 01:54:45.418529337 +0100
+@@ -15,11 +15,6 @@
+ 
+ #ifdef WIN32
+       #include <stdarg.h>
+-      #ifndef UPNP_USE_MSVCPP
+-              /* Removed: not required (and cause compilation issues) */
+-              #include <winbase.h>
+-              #include <windef.h>
+-      #endif
+       #include <winsock2.h>
+       #include <iphlpapi.h>
+       #include <ws2tcpip.h>

diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index f42ec1a557337568bf35f73f83dd90548574a1a4..8c6184abc10a8b561af4eb83d602c36f16a00c4b 100644 (file)
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -1,5 +1,5 @@
 # UPNP
-UPNP_VERSION := 1.6.13
+UPNP_VERSION := 1.6.14
 UPNP_URL := $(SF)/pupnp/libupnp-$(UPNP_VERSION).tar.bz2
 
 PKGS += upnp