vlc/vlc-3.0 | branch: master | Thomas Guillem <[email protected]> | Fri Sep 4 10:04:53 2020 +0200| [878c7da88a0973d2421d1d366fe3538d00a996b8] | committer: Alexandre Janniaux
contrib: gnutls: remove unused patch on ANDROID The Makefile.am modification caused a reconf that could fail with recent automake version (>= 1.16.2). Partial revert of bead358b379601eb4be6d9914bd3379ff73b50ba Cherry-picked from db1d02522d4bfdbee679bf7b52c2e4a5ef180b42. Signed-off-by: Alexandre Janniaux <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=878c7da88a0973d2421d1d366fe3538d00a996b8 --- contrib/src/gnutls/no-create-time-h.patch | 11 ----------- contrib/src/gnutls/rules.mak | 3 --- 2 files changed, 14 deletions(-) diff --git a/contrib/src/gnutls/no-create-time-h.patch b/contrib/src/gnutls/no-create-time-h.patch deleted file mode 100644 index d355c7cc6b..0000000000 --- a/contrib/src/gnutls/no-create-time-h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls/gl/Makefile.am 2011-04-07 17:30:44.000000000 -0700 -+++ gnutls/gl/Makefile.am 2012-03-02 19:51:53.576555217 -0800 -@@ -891,7 +891,7 @@ EXTRA_DIST += sys_stat.in.h - - ## begin gnulib module time - --BUILT_SOURCES += time.h -+#BUILT_SOURCES += time.h - - # We need the following in order to create <time.h> when the system - # doesn't have one that works with the given compiler. diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index b85a986d7d..e425f5f9a6 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -34,9 +34,6 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls # disable the dllimport in static linking (pkg-config --static doesn't handle Cflags.private) cd $(UNPACK_DIR) && sed -i.orig -e s/"_SYM_EXPORT __declspec(dllimport)"/"_SYM_EXPORT"/g lib/includes/gnutls/gnutls.h.in -ifdef HAVE_ANDROID - $(APPLY) $(SRC)/gnutls/no-create-time-h.patch -endif $(call pkg_static,"lib/gnutls.pc.in") $(UPDATE_AUTOCONFIG) $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
