[vlc-commits] contrib: upnp: Remove mingw ipv6 patch

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Thu Mar 26 09:30:29 2020 +0100| [6b94b96754978787e62dc2ffee6469efbd62ae06] | committer: Marvin Scholz

contrib: upnp: Remove mingw ipv6 patch

VLC needs Mingw-w64 v5.0 or higher , the define mentioned in the patch
was added in v3.0.0

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

 contrib/src/upnp/libupnp-ipv6.patch | 49 -------------------------------------
 contrib/src/upnp/rules.mak          |  1 -
 2 files changed, 50 deletions(-)

diff --git a/contrib/src/upnp/libupnp-ipv6.patch b/contrib/src/upnp/libupnp-ipv6.patch
deleted file mode 100644
index 7b89bc2688..0000000000
--- a/contrib/src/upnp/libupnp-ipv6.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 438ace99538713fb1370411188e0f370069a1818 Mon Sep 17 00:00:00 2001
-From: Konstantin Pavlov <thresh at videolan.org>
-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 869de8b0ba..7290056904 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -43,7 +43,6 @@ ifdef HAVE_WINSTORE
 endif
 endif
 	$(APPLY) $(SRC)/upnp/libpthread.patch
-	$(APPLY) $(SRC)/upnp/libupnp-ipv6.patch
 	$(APPLY) $(SRC)/upnp/miniserver.patch
 	$(APPLY) $(SRC)/upnp/missing_win32.patch
 	$(APPLY) $(SRC)/upnp/fix_infinite_loop.patch