From 60c31f66affc5262227ad3ee212be1509dc25c74 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Wed, 20 Mar 2024 13:01:31 +0000 Subject: [PATCH] Update gnutls to 3.8.4 to fix apple silicon compile --- .../0001-android-hackfix-fpending_c.patch | 29 +++++++++---------- depends/common/gnutls/gnutls.sha256 | 2 +- depends/common/gnutls/gnutls.txt | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/depends/common/gnutls/0001-android-hackfix-fpending_c.patch b/depends/common/gnutls/0001-android-hackfix-fpending_c.patch index 9244e25a..5e365db5 100644 --- a/depends/common/gnutls/0001-android-hackfix-fpending_c.patch +++ b/depends/common/gnutls/0001-android-hackfix-fpending_c.patch @@ -1,17 +1,16 @@ --- a/src/gl/fpending.c +++ b/src/gl/fpending.c -@@ -40,8 +40,14 @@ __fpending (FILE *fp) - /* GNU libc, BeOS, Haiku, Linux libc5 */ - return fp->_IO_write_ptr - fp->_IO_write_base; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -+#if defined ANDROID && __ANDROID_API__ < 23 -+ /* Hack fix for Kodi as it still use Android API 21 */ -+ #warning "ANDROID API to low, no __fpending usable" -+ return 1; -+#else - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */ - return fp->_p - fp->_bf._base; -+#endif - #elif defined __EMX__ /* emx+gcc */ - return fp->_ptr - fp->_buffer; - #elif defined __minix /* Minix */ ++@@ -40,8 +40,14 @@ + /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +@@ -10,7 +10,7 @@ + + return 1; + +#else + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */ +- return fp->_p - fp->_bf._base; ++ return fp_->_p - fp_->_bf._base; + +#endif + #elif defined __EMX__ /* emx+gcc */ + return fp->_ptr - fp->_buffer; + diff --git a/depends/common/gnutls/gnutls.sha256 b/depends/common/gnutls/gnutls.sha256 index 2575b5e0..983d4a4a 100644 --- a/depends/common/gnutls/gnutls.sha256 +++ b/depends/common/gnutls/gnutls.sha256 @@ -1 +1 @@ -0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 +2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b diff --git a/depends/common/gnutls/gnutls.txt b/depends/common/gnutls/gnutls.txt index 70528558..a7104923 100644 --- a/depends/common/gnutls/gnutls.txt +++ b/depends/common/gnutls/gnutls.txt @@ -1 +1 @@ -gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz +gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.4.tar.xz