Contribs: port libupnp to mingw and make it compile

[vlc] / extras / contrib / src / Patches / libupnp-configure.patch

diff --git a/extras/contrib/src/Patches/libupnp-configure.patch b/extras/contrib/src/Patches/libupnp-configure.patch
new file mode 100644 (file)
index 0000000..3d35558
--- /dev/null
+++ b/extras/contrib/src/Patches/libupnp-configure.patch
@@ -0,0 +1,100 @@
+--- libupnp.old/configure.ac   2008-04-25 13:41:16.000000000 +0200
++++ libupnp/configure.ac       2010-08-11 00:41:04.000000000 +0200
+@@ -332,19 +332,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 \
+       ],
+       [],
+@@ -370,39 +364,39 @@
+ # Checks for POSIX Threads
+ #
+ echo "--------------------------- pthread stuff -------------------------------------"
+-ACX_PTHREAD(
+-      [],
+-      [AC_MSG_ERROR([POSIX threads are required to build this program])])
++#ACX_PTHREAD(
++#     [],
++#     [AC_MSG_ERROR([POSIX threads are required to build this program])])
+ #
+ # Update environment variables for pthreads
+ #
+-CC="$PTHREAD_CC"
+-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+-LIBS="$PTHREAD_LIBS $LIBS"
++#CC="$PTHREAD_CC"
++#CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
++#LIBS="$PTHREAD_LIBS $LIBS"
+ #
+ # Determine if pthread_rwlock_t is available
+ #
+-echo "----------------------- pthread_rwlock_t stuff --------------------------------"
+-AC_MSG_CHECKING([if pthread_rwlock_t is available])
+-AC_LANG([C])
+-AC_COMPILE_IFELSE(
+-      [AC_LANG_PROGRAM(
+-              [#include <pthread.h>],
+-              [pthread_rwlock_t *x;])],
+-      [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
+-              AC_MSG_RESULT([yes, supported without any options])],
+-      [AC_COMPILE_IFELSE(
+-              [AC_LANG_PROGRAM(
+-                      [#define _GNU_SOURCE
+-                      #include <pthread.h>],
+-                      [pthread_rwlock_t *x;])],
+-              [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
+-                      CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+-                      AC_MSG_RESULT([yes, definition of _GNU_SOURCE required])],
+-              [AC_DEFINE([UPNP_USE_RWLOCK], [0], [Do not use pthread_rwlock_t])
+-                      AC_MSG_RESULT([no, needs to fallback to pthread_mutex])
+-                      AC_MSG_ERROR([pthread_rwlock_t not available])])])
+-echo "-------------------------------------------------------------------------------"
++#echo "----------------------- pthread_rwlock_t stuff --------------------------------"
++#AC_MSG_CHECKING([if pthread_rwlock_t is available])
++#AC_LANG([C])
++#AC_COMPILE_IFELSE(
++#     [AC_LANG_PROGRAM(
++#             [#include <pthread.h>],
++#             [pthread_rwlock_t *x;])],
++#     [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
++#             AC_MSG_RESULT([yes, supported without any options])],
++#     [AC_COMPILE_IFELSE(
++#             [AC_LANG_PROGRAM(
++#                     [#define _GNU_SOURCE
++#                     #include <pthread.h>],
++#                     [pthread_rwlock_t *x;])],
++#             [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
++#                     CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
++#                     AC_MSG_RESULT([yes, definition of _GNU_SOURCE required])],
++#             [AC_DEFINE([UPNP_USE_RWLOCK], [0], [Do not use pthread_rwlock_t])
++#                     AC_MSG_RESULT([no, needs to fallback to pthread_mutex])
++#                     AC_MSG_ERROR([pthread_rwlock_t not available])])])
++#echo "-------------------------------------------------------------------------------"
+ 
+ 
+ AC_CONFIG_FILES([
+--- libupnp.old/configure.ac   2010-08-11 00:41:04.000000000 +0200
++++ libupnp/configure.ac       2010-08-11 12:32:48.000000000 +0200
+@@ -349,7 +349,7 @@
+ # Checks for typedefs, structures, and compiler characteristics
+ #     
+ AC_C_CONST
+-TYPE_SOCKLEN_T
++#TYPE_SOCKLEN_T
+ 
+ 
+ #