videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-12 13:44:56 +02:00
Code Releases Activity

Contribs: GnuTLS: do not use connectx for macOS

Browse Source 
It is only available since 10.11

(cherry picked from commit 0754c30c49)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
Jean-Baptiste Kempf 2017-12-26 18:05:49 +01:00
parent 1660a712e8
commit 90ef80cc8e
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/src/gnutls/gnutls-disable-connectx-macos.patch Normal file
View File

@ -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

1
contrib/src/gnutls/rules.mak
View File

@ -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")