vlc | branch: master | Konstantin Pavlov <[email protected]> | Tue May 29 10:40:33 2012 +0400| [330cedc777be8668a907493a9fdf9b1b78600f82] | committer: Konstantin Pavlov
Contribs: fix libupnp build under mingw32 with ipv6 enabled. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=330cedc777be8668a907493a9fdf9b1b78600f82 --- contrib/src/upnp/libupnp-ipv6.patch | 49 +++++++++++++++++++++++++++++++++++ contrib/src/upnp/rules.mak | 1 + 2 files changed, 50 insertions(+) diff --git a/contrib/src/upnp/libupnp-ipv6.patch b/contrib/src/upnp/libupnp-ipv6.patch new file mode 100644 index 0000000..7b89bc2 --- /dev/null +++ b/contrib/src/upnp/libupnp-ipv6.patch @@ -0,0 +1,49 @@ +From 438ace99538713fb1370411188e0f370069a1818 Mon Sep 17 00:00:00 2001 +From: Konstantin Pavlov <[email protected]> +Date: Tue, 29 May 2012 10:18:40 +0400 +Subject: [PATCH] Fix compile under mingw with IPv6 enabled. + +--- + upnp/src/genlib/miniserver/miniserver.c | 7 +++++++ + upnp/src/ssdp/ssdp_server.c | 7 +++++++ + 2 files changed, 14 insertions(+) + +diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c +index af310ca..1ae422f 100644 +--- a/upnp/src/genlib/miniserver/miniserver.c ++++ b/upnp/src/genlib/miniserver/miniserver.c +@@ -68,6 +68,13 @@ + /*! . */ + #define APPLICATION_LISTENING_PORT 49152 + ++/* IPV6_V6ONLY is missing from MinGW, hack taken from ++ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c ++ */ ++#ifndef IPV6_V6ONLY ++#define IPV6_V6ONLY 27 ++#endif ++ + struct mserv_request_t { + /*! Connection handle. */ + SOCKET connfd; +diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c +index 231c2c5..6a9c27f 100644 +--- a/upnp/src/ssdp/ssdp_server.c ++++ b/upnp/src/ssdp/ssdp_server.c +@@ -69,6 +69,13 @@ + #endif /* UPNP_ENABLE_IPV6 */ + #endif /* INCLUDE_CLIENT_APIS */ + ++/* IPV6_V6ONLY is missing from MinGW, hack taken from ++ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c ++ */ ++#ifndef IPV6_V6ONLY ++#define IPV6_V6ONLY 27 ++#endif ++ + void RequestHandler(); + + enum Listener { +-- +1.7.9.7 + diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak index 5e00cdc..d366a03 100644 --- a/contrib/src/upnp/rules.mak +++ b/contrib/src/upnp/rules.mak @@ -21,6 +21,7 @@ ifdef HAVE_WIN32 $(APPLY) $(SRC)/upnp/libupnp-win32.patch $(APPLY) $(SRC)/upnp/libupnp-win64.patch endif + $(APPLY) $(SRC)/upnp/libupnp-ipv6.patch $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux/ $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
