Contribs: Upnp, update to 1.6.12

extras/contrib/src/Patches/libupnp-configure.patch

---- libupnp/configure.ac	2008-04-25 13:41:16.000000000 +0200
-+++ libupnp_new/configure.ac	2010-08-13 23:21:00.000000000 +0200
-@@ -286,7 +286,6 @@
+--- libupnp/configure.ac.orig	2011-02-09 00:55:44.000000000 +0100
++++ libupnp/configure.ac	2011-02-10 23:39:44.154929678 +0100
+@@ -397,7 +397,6 @@
  AC_PROG_MAKE_SET
  AC_PROG_EGREP
  
@@ -8,36 +8,7 @@
  # Default compilation flags
  #
  echo "--------------------- Default compilation flags -------------------------------"
-@@ -332,19 +331,13 @@
- # so just abort if a header file is not found.
- AC_CHECK_HEADERS(
- 	[ \
--	arpa/inet.h \
- 	fcntl.h \
- 	inttypes.h \
- 	limits.h \
--	netdb.h \
--	netinet/in.h \
- 	stdlib.h \
- 	string.h \
--	sys/ioctl.h \
--	sys/socket.h \
- 	sys/time.h \
- 	sys/timeb.h \
--	syslog.h \
- 	unistd.h \
- 	],
- 	[],
-@@ -355,7 +348,7 @@
- # Checks for typedefs, structures, and compiler characteristics
- #	
- AC_C_CONST
--TYPE_SOCKLEN_T
-+#TYPE_SOCKLEN_T
- 
- 
- #
-@@ -370,39 +363,46 @@
+@@ -531,39 +530,46 @@
  # Checks for POSIX Threads
  #
  echo "--------------------------- pthread stuff -------------------------------------"
@@ -109,13 +80,3 @@
  
  
  AC_CONFIG_FILES([
---- libupnp/libupnp.pc.in	2008-02-10 02:55:39.000000000 +0100
-+++ libupnp.new/libupnp.pc.in	2010-08-24 18:08:41.000000000 +0200
-@@ -6,6 +6,6 @@
- Name: libupnp
- Description: Linux SDK for UPnP Devices
- Version: @VERSION@
--Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
-+Libs: -L${libdir} -lupnp -lthreadutil -lixml @PTHREAD_LIBS@ 
- Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
- 

extras/contrib/src/Patches/libupnp-mingw.patch

---- libupnp.old/upnp/inc/upnp.h	2008-03-09 01:54:58.000000000 +0100
-+++ libupnp/upnp/inc/upnp.h	2010-08-11 12:40:37.000000000 +0200
-@@ -74,14 +74,16 @@
- 		typedef __int64 int64_t;
- 		#define PRId64 "I64d"
- 		#define PRIzu "lu"
--	#endif
--	#ifdef UPNP_USE_BCBPP
-+	#elif defined UPNP_USE_BCBPP
- 		/* define some things Borland Builder doesn't know */
- 		#define UPNP_INLINE inline
- 		typedef __int64 int64_t;
- #warning The Borland C compiler is probably broken on PRId64, please someone provide a proper fix here
- 		#define PRId64 "I64d"
- 		#define PRIzu "zu"
-+	#else
-+		#define UPNP_INLINE inline
-+		#define PRIzu "zu"
- 	#endif
- #else
- 	#define EXPORT_SPEC
---- libupnp.old/upnp/src/inc/unixutil.h	2008-02-10 02:55:34.000000000 +0100
-+++ libupnp/upnp/src/inc/unixutil.h	2010-08-11 12:48:37.000000000 +0200
-@@ -38,7 +38,15 @@
- #ifndef WIN32
- 	#include <sys/socket.h>
- #else
--	typedef int socklen_t;
-+	//typedef int socklen_t;
-+	#if !defined(UNDER_CE)
-+	#    define _NO_OLDNAMES 1
-+	#    include <io.h>
-+	#endif
-+	#include <winsock2.h>
-+	#include <ws2tcpip.h>
-+	#define ENETUNREACH WSAENETUNREACH
-+	#define net_errno (WSAGetLastError())
- 	#define EAFNOSUPPORT 97
- #endif
- 
-diff -ruN libupnp/threadutil/inc/ithread.h libupnp.new/threadutil/inc/ithread.h
---- libupnp/threadutil/inc/ithread.h	2008-03-22 17:36:03.000000000 +0100
-+++ libupnp.new/threadutil/inc/ithread.h	2010-11-02 15:33:43.544547707 +0100
-@@ -35,7 +35,7 @@
- extern "C" {
- #endif
- 
--
-+#undef HAVE_CONFIG_H
- #include <pthread.h>
- #ifndef WIN32
- 	#include <unistd.h>

extras/contrib/src/contrib-src.mak

@@ -2452,10 +2452,9 @@ libupnp-$(UPNP_VERSION).tar.bz2:
 
 libupnp: libupnp-$(UPNP_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p0 < Patches/libupnp-mingw.patch
 ifdef HAVE_WIN32
-	patch -p0 < Patches/libupnp-win32.patch
 	patch -p0 < Patches/libupnp-configure.patch
+	patch -p0 < Patches/libupnp-win32.patch
 	cd $@; libtoolize&& autoreconf
 endif
 

extras/contrib/src/packages.mak

@@ -189,8 +189,8 @@ PORTAUDIO_VERSION=19
 PORTAUDIO_URL=http://www.portaudio.com/archives/pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 CLINKCC_VERSION=171
 CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz
-UPNP_VERSION=1.6.6
-UPNP_URL=$(CONTRIB_VIDEOLAN)/libupnp-$(UPNP_VERSION).tar.bz2
+UPNP_VERSION=1.6.12
+UPNP_URL=$(SF)/pupnp/libupnp-$(UPNP_VERSION).tar.bz2
 EXPAT_VERSION=2.0.0
 EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
 PTHREADS_VERSION=2-8-0