vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Mon Nov 7 11:20:37 2016 +0100| [a230bc2356ff400427716a1f57c3a3266fbdb530] | committer: Hugo Beauzée-Luyssen
contribs: gnutls: Fix win32 build > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a230bc2356ff400427716a1f57c3a3266fbdb530 --- contrib/src/gnutls/gnutls-win32.patch | 4 ++-- contrib/src/gnutls/rules.mak | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/src/gnutls/gnutls-win32.patch b/contrib/src/gnutls/gnutls-win32.patch index 9138dc7..197476c 100644 --- a/contrib/src/gnutls/gnutls-win32.patch +++ b/contrib/src/gnutls/gnutls-win32.patch @@ -4,8 +4,8 @@ URL: http://www.gnutls.org/ Version: @VERSION@ Libs: -L${libdir} -lgnutls --Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ -lcrypt32 @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ +-Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @NETTLE_LIBS@ @LIBIDN_LIBS@ @HOGWEED_LIBS@ ++Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ -lcrypt32 @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @NETTLE_LIBS@ @LIBIDN_LIBS@ @HOGWEED_LIBS@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} --- gnutls.old/lib/includes/gnutls/gnutls.h.in 2016-07-01 22:44:49.319398504 +0200 diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 2b9ad03..02ab021 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -19,6 +19,7 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz: gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls $(UNPACK) + $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch ifdef HAVE_WIN32 $(APPLY) $(SRC)/gnutls/gnutls-win32.patch $(APPLY) $(SRC)/gnutls/gnutls-mingw64.patch @@ -38,7 +39,6 @@ ifdef HAVE_MACOSX $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch endif $(APPLY) $(SRC)/gnutls/gnutls-libidn.patch - $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch $(call pkg_static,"lib/gnutls.pc.in") $(UPDATE_AUTOCONFIG) $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
