[vlc-commits] Contribs: update upnp to 1.6.14

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Nov 18 02:17:20 2011 +0100| [449010e5cf8172aafa956ab25d75d39af976a550] | committer: Jean-Baptiste Kempf

Contribs: update upnp to 1.6.14

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=449010e5cf8172aafa956ab25d75d39af976a550
---

 contrib/src/upnp/SHA512SUMS          |    2 +-
 contrib/src/upnp/libupnp-win32.patch |   14 ++++++++++++++
 contrib/src/upnp/rules.mak           |    2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/contrib/src/upnp/SHA512SUMS b/contrib/src/upnp/SHA512SUMS
index 087ffe7..5bce652 100644
--- 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 f26ba5b..686e3ba 100644
--- 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 f42ec1a..8c6184a 100644
--- 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