Skip to content

Commit

Permalink
update gnutls to 3.6.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
phunkyfish committed Jan 28, 2020
1 parent eec19d1 commit 254d63f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 21 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ if(CORE_SYSTEM_NAME STREQUAL osx OR
find_library(COREFOUNDATION CoreFoundation)
find_library(COREMEDIA CoreMedia)
find_library(VIDEOTOOLBOX VideoToolbox)
find_library(SECURITY Security)

include_directories(${AVFOUNDATION}
${COCOA}
Expand All @@ -104,9 +105,10 @@ if(CORE_SYSTEM_NAME STREQUAL osx OR
${COREVIDEO}
${COREMEDIAIO}
${VIDEOTOOLBOX}
${SECURITY}
${COCOA})

list(APPEND DEPLIBS ${AUDIOTOOLBOX} ${COREFOUNDATION} ${COREMEDIA} ${VIDEOTOOLBOX})
list(APPEND DEPLIBS ${AUDIOTOOLBOX} ${COREFOUNDATION} ${COREMEDIA} ${VIDEOTOOLBOX} ${SECURITY})
endif()

addon_version(inputstream.ffmpegdirect CATCHUP)
Expand Down
18 changes: 0 additions & 18 deletions depends/common/gnutls/02-darwin-getentropy.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -ur gnutls/lib/system/fastopen.c gnutls-patch/lib/system/fastopen.c
--- gnutls/lib/system/fastopen.c 2020-01-27 20:24:23.000000000 +0000
+++ gnutls-patch/lib/system/fastopen.c 2020-01-28 07:52:10.000000000 +0000
@@ -38,7 +38,7 @@

/* 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
-# define TCP_FASTOPEN_OSX
+# define TCP_FASTOPEN_OSX_DISABLED // This patch simply disables fastopen on osx as we want to be able to run on osx versions < 10.11
#elif defined TCP_FASTOPEN && defined MSG_FASTOPEN
# define TCP_FASTOPEN_LINUX
#endif
2 changes: 1 addition & 1 deletion depends/common/gnutls/gnutls.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
af443e86ba538d4d3e37c4732c00101a492fe4b56a55f4112ff0ab39dbe6579d
fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8
2 changes: 1 addition & 1 deletion depends/common/gnutls/gnutls.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gnutls http://mirrors.kodi.tv/build-deps/sources/gnutls-3.5.10.tar.xz
gnutls http://mirrors.kodi.tv/build-deps/sources/gnutls-3.6.11.1.tar.xz

0 comments on commit 254d63f

Please sign in to comment.