vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Dec 26 18:05:49 2017 +0100| [0754c30c49299b1b1c1fa1cf4882f6014d5289b7] | committer: Jean-Baptiste Kempf
Contribs: GnuTLS: do not use connectx for macOS It is only available since 10.11 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0754c30c49299b1b1c1fa1cf4882f6014d5289b7 --- contrib/src/gnutls/gnutls-disable-connectx-macos.patch | 12 ++++++++++++ contrib/src/gnutls/rules.mak | 1 + 2 files changed, 13 insertions(+) diff --git a/contrib/src/gnutls/gnutls-disable-connectx-macos.patch b/contrib/src/gnutls/gnutls-disable-connectx-macos.patch new file mode 100644 index 0000000000..47ca4226be --- /dev/null +++ b/contrib/src/gnutls/gnutls-disable-connectx-macos.patch @@ -0,0 +1,12 @@ +--- gnutls/lib/system/fastopen.c 2017-12-26 18:00:54.041282870 +0100 ++++ gnutls/lib/system/fastopen.c.new 2017-12-26 18:00:09.209281540 +0100 +@@ -36,7 +36,8 @@ + #endif + + /* TCP Fast Open on OSX behaves differently from Linux, so define these helpers */ +-#if defined __APPLE__ && defined __MACH__ && defined CONNECT_DATA_IDEMPOTENT && defined CONNECT_RESUME_ON_READ_WRITE ++#if 0 ++// defined __APPLE__ && defined __MACH__ && defined CONNECT_DATA_IDEMPOTENT && defined CONNECT_RESUME_ON_READ_WRITE + # define TCP_FASTOPEN_OSX + #elif defined TCP_FASTOPEN && defined MSG_FASTOPEN + # define TCP_FASTOPEN_LINUX diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 26b1d1ba03..e537d9d2f2 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -36,6 +36,7 @@ ifdef HAVE_MACOSX $(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch $(APPLY) $(SRC)/gnutls/gnutls-disable-getentropy-osx.patch + $(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch endif $(APPLY) $(SRC)/gnutls/gnutls-libidn.patch $(call pkg_static,"lib/gnutls.pc.in") _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
