Contrib: fix upnp compilation on win64

diff --git a/contrib/src/upnp/libupnp-win64.patch b/contrib/src/upnp/libupnp-win64.patch
new file mode 100644 (file)
index 0000000..880d33d
--- /dev/null
+++ b/contrib/src/upnp/libupnp-win64.patch
@@ -0,0 +1,40 @@
+--- libupnp/upnp/inc/upnp.h    2011-03-15 22:59:38.000000000 +0100
++++ libupnp.new/upnp/inc/upnp.h        2011-09-23 01:39:55.000000000 +0200
+@@ -57,6 +57,19 @@
+       /* Other systems ??? */
+ #endif
+
++#   if defined( __MINGW32__ )
++#       if !defined( _OFF_T_ )
++            typedef long long _off_t;
++            typedef _off_t off_t;
++#           define _OFF_T_
++#       else
++#           ifdef off_t
++#               undef off_t
++#           endif
++#           define off_t long long
++#       endif
++#   endif
++
+ #define LINE_SIZE  180
+ #define NAME_SIZE  256
+ #define MNFT_NAME_SIZE  64
+--- libupnp/threadutil/inc/ThreadPool.h        2011-01-20 07:46:57.000000000 +0100
++++ libupnp.new/threadutil/inc/ThreadPool.h    2011-09-23 01:36:12.000000000 +0200
+@@ -45,6 +45,7 @@
+ #include <errno.h>
+
+ #ifdef WIN32
++      #ifndef _TIMEZONE_DEFINED
+       #include <time.h>
+       struct timezone
+       {
+@@ -52,6 +53,7 @@
+               int  tz_dsttime;     /* type of dst correction */
+       };
+       int gettimeofday(struct timeval *tv, struct timezone *tz);
++      #endif
+ #else /* WIN32 */
+       #include <sys/param.h>
+       #include <sys/time.h> /* for gettimeofday() */

diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 39b0d9f161ccbb9e97c06f38f0e884a03d62607c..f2d4ee156ecc85d42477be09eb5cae8ae2142464 100644 (file)
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -17,6 +17,7 @@ upnp: libupnp-$(UPNP_VERSION).tar.bz2 .sum-upnp
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/upnp/libupnp-configure.patch
        $(APPLY) $(SRC)/upnp/libupnp-win32.patch
+       $(APPLY) $(SRC)/upnp/libupnp-win64.patch
 endif
        $(MOVE)
 

diff --git a/extras/contrib/src/Patches/libupnp-win64.patch b/extras/contrib/src/Patches/libupnp-win64.patch
new file mode 100644 (file)
index 0000000..880d33d
--- /dev/null
+++ b/extras/contrib/src/Patches/libupnp-win64.patch
@@ -0,0 +1,40 @@
+--- libupnp/upnp/inc/upnp.h    2011-03-15 22:59:38.000000000 +0100
++++ libupnp.new/upnp/inc/upnp.h        2011-09-23 01:39:55.000000000 +0200
+@@ -57,6 +57,19 @@
+       /* Other systems ??? */
+ #endif
+
++#   if defined( __MINGW32__ )
++#       if !defined( _OFF_T_ )
++            typedef long long _off_t;
++            typedef _off_t off_t;
++#           define _OFF_T_
++#       else
++#           ifdef off_t
++#               undef off_t
++#           endif
++#           define off_t long long
++#       endif
++#   endif
++
+ #define LINE_SIZE  180
+ #define NAME_SIZE  256
+ #define MNFT_NAME_SIZE  64
+--- libupnp/threadutil/inc/ThreadPool.h        2011-01-20 07:46:57.000000000 +0100
++++ libupnp.new/threadutil/inc/ThreadPool.h    2011-09-23 01:36:12.000000000 +0200
+@@ -45,6 +45,7 @@
+ #include <errno.h>
+
+ #ifdef WIN32
++      #ifndef _TIMEZONE_DEFINED
+       #include <time.h>
+       struct timezone
+       {
+@@ -52,6 +53,7 @@
+               int  tz_dsttime;     /* type of dst correction */
+       };
+       int gettimeofday(struct timeval *tv, struct timezone *tz);
++      #endif
+ #else /* WIN32 */
+       #include <sys/param.h>
+       #include <sys/time.h> /* for gettimeofday() */

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index d68fc38e7db29b84e404508d883a0a21b49798a0..2a28a7dfb4303ebc67b39f20f32269a87333621c 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2457,6 +2457,7 @@ libupnp: libupnp-$(UPNP_VERSION).tar.bz2
 ifdef HAVE_WIN32
        patch -p0 < Patches/libupnp-configure.patch
        patch -p0 < Patches/libupnp-win32.patch
+       patch -p0 < Patches/libupnp-win64.patch
 endif
        cd $@; libtoolize && autoreconf