vlc/vlc-3.0 | branch: master | David Fuhrmann <[email protected]> | Sat Feb 16 00:02:24 2019 +0100| [27e0d370a7aaec7a4e4c1873ef7feca5cde1e6fe] | committer: Steve Lhomme
contrib: gnutls: Drop getentropy patch for macOS getentropy is correctly annotated since the macOS 10.13 SDK (at least), and the gnutls check includes the correct header on macOS. Therefore this patch is not needed anymore. This also fixes current build failure as it avoids touching configure.ac now. (cherry picked from commit 58d4ea7d6274be17dd8189406f506bd7e76ef81a) Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=27e0d370a7aaec7a4e4c1873ef7feca5cde1e6fe --- .../src/gnutls/gnutls-disable-getentropy-osx.patch | 20 -------------------- contrib/src/gnutls/rules.mak | 1 - 2 files changed, 21 deletions(-) diff --git a/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch b/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch deleted file mode 100644 index fee755c034..0000000000 --- a/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gnutls/configure.ac 2016-07-05 18:34:43.000000000 +0200 -+++ gnutls.new/configure.ac 2017-08-09 21:57:44.000000000 +0200 -@@ -175,6 +175,9 @@ - enable_getrandom=getrandom], - [AC_MSG_RESULT(no)]) - -+if test "$have_macosx" = "yes"; then -+AC_MSG_CHECKING([for getentropy disabled for OSX]) -+else - AC_MSG_CHECKING([for getentropy]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([ - #include <unistd.h>],[ -@@ -184,6 +187,7 @@ - AC_DEFINE([HAVE_GETENTROPY], 1, [Enable the OpenBSD getentropy function]) - enable_getrandom=getentropy], - [AC_MSG_RESULT(no)]) -+fi - - dnl Try the hooks.m4 - LIBGNUTLS_HOOKS diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 5bfb40b3b0..92a298c78e 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -27,7 +27,6 @@ ifdef HAVE_ANDROID $(APPLY) $(SRC)/gnutls/no-create-time-h.patch endif ifdef HAVE_MACOSX - $(APPLY) $(SRC)/gnutls/gnutls-disable-getentropy-osx.patch $(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch endif $(call pkg_static,"lib/gnutls.pc.in") _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
