Skip to content

Commit

Permalink
Update gnutls to 3.8.4 to fix apple silicon compile
Browse files Browse the repository at this point in the history
  • Loading branch information
phunkyfish committed Mar 20, 2024
1 parent 7f74630 commit 60c31f6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
29 changes: 14 additions & 15 deletions depends/common/gnutls/0001-android-hackfix-fpending_c.patch
Original file line number Diff line number Diff line change
@@ -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;

2 changes: 1 addition & 1 deletion depends/common/gnutls/gnutls.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5
2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b
2 changes: 1 addition & 1 deletion depends/common/gnutls/gnutls.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 60c31f6

Please sign in to comment.