contrib: dvdread: remove patch applied upstream

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

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 5da6fec9488035ff3ecce129491a23d3f70c25db..8881a4ad8249805638752e851261fb78597eca93 100644 (file)
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,7 +1,7 @@
 # GnuTLS
 
-GNUTLS_VERSION := 2.12.7
-GNUTLS_URL := http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
+GNUTLS_VERSION := 2.12.23
+GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/gnutls-$(GNUTLS_VERSION).tar.bz2
 
 PKGS += gnutls
 ifeq ($(call need_pkg,"gnutls >= 2.0.0"),)
@@ -15,12 +15,22 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.bz2:
 
 gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls
        $(UNPACK)
+ifdef HAVE_WIN32
        $(APPLY) $(SRC)/gnutls/gnutls-win32.patch
+endif
+ifdef HAVE_ANDROID
+       $(APPLY) $(SRC)/gnutls/no-create-time-h.patch
+endif
        $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
+       $(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
+       $(call pkg_static,"lib/gnutls.pc.in")
+       $(call pkg_static,"libextra/gnutls-extra.pc.in")
+       $(UPDATE_AUTOCONFIG)
        $(MOVE)
 
 GNUTLS_CONF := \
        --disable-gtk-doc \
+       --without-p11-kit \
        --disable-cxx \
        --disable-srp-authentication \
        --disable-psk-authentication-FIXME \
@@ -39,6 +49,9 @@ endif
 ifdef HAVE_MACOSX
 USE_GCRYPT=1
 endif
+ifdef HAVE_ANDROID
+USE_GCRYPT=1
+endif
 
 ifeq (1,$(USE_GCRYPT))
 GNUTLS_CONF += --with-libgcrypt
@@ -48,7 +61,11 @@ DEPS_gnutls = nettle $(DEPS_nettle)
 endif
 
 .gnutls: gnutls
-       cd $< && automake
+ifdef HAVE_ANDROID
+       $(RECONF)
+       cd $< && $(HOSTVARS) gl_cv_header_working_stdint_h=yes ./configure $(GNUTLS_CONF)
+else
        cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
+endif
        cd $</lib && $(MAKE) install
        touch $@