vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Sun May 13 18:07:34 2018 +0200| [27897c72fe49864260ef46c2cc7295cb3eb27575] | committer: Steve Lhomme
contrib: gnutls: don't use idn2 on Windows builds That's what the buildbot does and it's not compatible with idn2 in mingw64 which requires detection with pkg-config (cherry picked from commit 8c5044beef808c3c6fc461e8cd2664bf18a60f70) (rebased) rebased: - disabling acceleration for x64 was merged differently Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=27897c72fe49864260ef46c2cc7295cb3eb27575 --- contrib/src/gnutls/rules.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index e7b74e041e..1c60b7e501 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -69,6 +69,7 @@ ifeq ($(ARCH),x86_64) endif endif ifdef HAVE_WIN32 + GNUTLS_CONF += --without-libidn2 ifdef HAVE_CLANG ifeq ($(ARCH),aarch64) GNUTLS_CONF += --disable-hardware-acceleration _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
