Merge pull request #5 from phunkyfish/update-nettle-gnutls

Update nettle gnutls

CMakeLists.txt

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

depends/common/gnutls/02-patch-out-connectx-for-osx-as-less-than-10.11.patch

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

depends/common/gnutls/gnutls.sha256

@@ -1 +1 @@
-af443e86ba538d4d3e37c4732c00101a492fe4b56a55f4112ff0ab39dbe6579d
+fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8

depends/common/gnutls/gnutls.txt

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

depends/common/nettle/nettle.sha256

@@ -1 +1 @@
-ea4283def236413edab5a4cf9cf32adf540c8df1b9b67641cfc2302fca849d97
+75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419

depends/common/nettle/nettle.txt

@@ -1 +1 @@
-nettle http://mirrors.kodi.tv/build-deps/sources/nettle-3.2.tar.gz
+nettle https://ftp.gnu.org/gnu/nettle/nettle-3.5.1.tar.gz

inputstream.ffmpegdirect/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.ffmpegdirect"
-  version="1.2.1"
+  version="1.3.0"
   name="Inputstream FFmpeg Direct"
   provider-name="phunkyfish">
   <requires>@ADDON_DEPENDS@</requires>
@@ -17,6 +17,12 @@
     <description lang="en_GB">InputStream Client for streams that can be opened by FFmpeg's libavformat such as plain TS, HLS and DASH (without DRM) streams.&#10;    &#10;The addon also has support for Archive/Catchup services where there is a replay windows (usually in days) and can timeshift across that span.&#10;    &#10;For documenation visit: https://github.com/xbmc/inputstream.ffmpegdirect/blob/Matrix/README.md&#10;    </description>
     <platform>@PLATFORM@</platform>
     <news>
+v1.3.0
+- Added: Support for Windows and iOS
+- Update: To gmp-6.2.0
+- Update: To nettle-3.5.1
+- Update: To gnutls-6.3.11.1
+
 v1.2.1
 - Fixed: Support for XCode build with GCC via travis
 

inputstream.ffmpegdirect/changelog.txt

@@ -1,3 +1,9 @@
+v1.3.0
+- Added: Support for Windows and iOS
+- Update: To gmp-6.2.0
+- Update: To nettle-3.5.1
+- Update: To gnutls-6.3.11.1
+
 v1.2.1
 - Fixed: Support for XCode build with GCC via travis