vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue May 10 13:37:03 2016 +0200| [51c0fb2d5a63c65000c982fa5d64995fb6ee90e9] | committer: Hugo Beauzée-Luyssen
contribs: upnp: Fix winrt build > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=51c0fb2d5a63c65000c982fa5d64995fb6ee90e9 --- contrib/src/upnp/no-getifinfo.patch | 18 ++++++++++++++++++ contrib/src/upnp/rules.mak | 4 ++++ contrib/src/upnp/winrt-dont-force-win32-winnt.patch | 10 ++++++++++ 3 files changed, 32 insertions(+) diff --git a/contrib/src/upnp/no-getifinfo.patch b/contrib/src/upnp/no-getifinfo.patch new file mode 100644 index 0000000..63a101d --- /dev/null +++ b/contrib/src/upnp/no-getifinfo.patch @@ -0,0 +1,18 @@ +--- upnp/upnp/src/api/upnpapi.c.orig 2016-05-10 10:39:59.757852761 +0200 ++++ upnp/upnp/src/api/upnpapi.c 2016-05-10 10:40:24.885603353 +0200 +@@ -3205,6 +3205,7 @@ + } + + ++#ifdef UPNP_ENABLE_IPV6 + int UpnpGetIfInfo(const char *IfName) + { + #ifdef WIN32 +@@ -3587,6 +3588,7 @@ + + return UPNP_E_SUCCESS; + } ++#endif + + + /*! diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak index d4c8de1..c56ed8c 100644 --- a/contrib/src/upnp/rules.mak +++ b/contrib/src/upnp/rules.mak @@ -28,6 +28,10 @@ ifdef HAVE_WIN32 $(APPLY) $(SRC)/upnp/libupnp-win32.patch $(APPLY) $(SRC)/upnp/libupnp-win64.patch $(APPLY) $(SRC)/upnp/windows-random.patch + $(APPLY) $(SRC)/upnp/no-getifinfo.patch +ifdef HAVE_WINRT + $(APPLY) $(SRC)/upnp/winrt-dont-force-win32-winnt.patch +endif endif $(APPLY) $(SRC)/upnp/libupnp-ipv6.patch $(APPLY) $(SRC)/upnp/miniserver.patch diff --git a/contrib/src/upnp/winrt-dont-force-win32-winnt.patch b/contrib/src/upnp/winrt-dont-force-win32-winnt.patch new file mode 100644 index 0000000..bee75a0 --- /dev/null +++ b/contrib/src/upnp/winrt-dont-force-win32-winnt.patch @@ -0,0 +1,10 @@ +--- upnp/configure.ac.orig 2016-05-10 11:28:35.866723477 +0200 ++++ upnp/configure.ac 2016-05-10 11:28:58.186564849 +0200 +@@ -676,7 +676,6 @@ + AC_SUBST(PTHREAD_CFLAGS) + AC_SUBST(PTHREAD_CC) + +-AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.]) + # + # Determine if pthread_rwlock_t is available + # _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
