Contribs: update gnutls to 3.2.21

[vlc] / contrib / src / gnutls / rules.mak

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 7c2c9625112a93b2b8a75c51daa62df1b109b3a3..5bd49b6fedb05fb26e397bc9037b9015a4da8e51 100644 (file)
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,12 +1,14 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.1.12
-GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
+GNUTLS_VERSION := 3.2.21
+GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK
+ifndef HAVE_DARWIN_OS
 PKGS += gnutls
 endif
-ifeq ($(call need_pkg,"gnutls >= 3.0.20"),)
+endif
+ifeq ($(call need_pkg,"gnutls >= 3.2.0"),)
 PKGS_FOUND += gnutls
 endif
 
@@ -25,7 +27,10 @@ ifdef HAVE_ANDROID
 endif
        $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
        $(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
-       $(APPLY) $(SRC)/gnutls/downgrade-automake-requirement.patch
+       $(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
+ifdef HAVE_MACOSX
+       $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
+endif
        $(call pkg_static,"lib/gnutls.pc.in")
        $(UPDATE_AUTOCONFIG)
        $(MOVE)
@@ -47,8 +52,8 @@ GNUTLS_CONF := \
 DEPS_gnutls = nettle $(DEPS_nettle)
 
 .gnutls: gnutls
-ifdef HAVE_ANDROID
        $(RECONF)
+ifdef HAVE_ANDROID
        cd $< && $(HOSTVARS) gl_cv_header_working_stdint_h=yes ./configure $(GNUTLS_CONF)
 else
        cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)