Merge pull request #267 from phunkyfish/upgrade-deps

Add-on dependency updates with SSL 3 for Widows
xbmc · Jan 30, 2024 · c34a4cf · c34a4cf
2 parents 57fe4ac + 2e46499
commit c34a4cf
Show file tree

Hide file tree

Showing 65 changed files with 1,961 additions and 1,276 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,9 +116,9 @@ set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS "${FFMPEG_L
 
 if(CORE_SYSTEM_NAME STREQUAL windowsstore)
   # fix linking
-  set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib")
-  set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELEASE "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib")
-  set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_DEBUG "/LTCG /defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib")
+  set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib /defaultlib:onecore.lib")
+  set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELEASE "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib /defaultlib:onecore.lib")
+  set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_DEBUG "/LTCG /defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib /defaultlib:onecore.lib")
 endif()
 
 include(CPack)
diff --git a/depends/android/gmp/CMakeLists.txt b/depends/android/gmp/CMakeLists.txt
diff --git a/depends/android/gmp/gmp.sha256 b/depends/android/gmp/gmp.sha256
diff --git a/depends/android/gmp/gmp.txt b/depends/android/gmp/gmp.txt
diff --git a/depends/android/iconv/CMakeLists.txt b/depends/android/iconv/CMakeLists.txt
diff --git a/depends/android/iconv/iconv.sha256 b/depends/android/iconv/iconv.sha256
diff --git a/depends/android/iconv/iconv.txt b/depends/android/iconv/iconv.txt
diff --git a/depends/common/gmp/darwin_embedded-deps.txt b/depends/common/gmp/darwin_embedded-deps.txt
diff --git a/depends/android/gmp/deps.txt → depends/common/gmp/deps.txt b/depends/android/gmp/deps.txt → depends/common/gmp/deps.txt
diff --git a/depends/common/gmp/osx-deps.txt b/depends/common/gmp/osx-deps.txt
diff --git a/depends/common/gnutls/0001-android-hackfix-fpending_c.patch b/depends/common/gnutls/0001-android-hackfix-fpending_c.patch
@@ -0,0 +1,17 @@
+--- 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 */
diff --git a/depends/common/gnutls/01-size-max.patch b/depends/common/gnutls/01-size-max.patch
diff --git a/depends/common/gnutls/02-include-libdl-if-available.patch b/depends/common/gnutls/02-include-libdl-if-available.patch
diff --git a/depends/common/gnutls/03-undo-libtasn1-cisdigit.patch b/depends/common/gnutls/03-undo-libtasn1-cisdigit.patch
diff --git a/depends/common/gnutls/04-fix-arm-clang-build.patch b/depends/common/gnutls/04-fix-arm-clang-build.patch
diff --git a/depends/common/gnutls/gnutls.sha256 b/depends/common/gnutls/gnutls.sha256
@@ -1 +1 @@
-1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3
+0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5
diff --git a/depends/common/gnutls/gnutls.txt b/depends/common/gnutls/gnutls.txt
@@ -1 +1 @@
-gnutls http://mirrors.kodi.tv/build-deps/sources/gnutls-3.6.16.tar.xz
+gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3
		0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		gnutls http://mirrors.kodi.tv/build-deps/sources/gnutls-3.6.16.tar.xz
		gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz