Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add-on dependency updates #241

Closed
wants to merge 12 commits into from
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
17 changes: 0 additions & 17 deletions depends/android/gmp/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion depends/android/gmp/gmp.sha256

This file was deleted.

1 change: 0 additions & 1 deletion depends/android/gmp/gmp.txt

This file was deleted.

12 changes: 0 additions & 12 deletions depends/android/iconv/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion depends/android/iconv/iconv.sha256

This file was deleted.

1 change: 0 additions & 1 deletion depends/android/iconv/iconv.txt

This file was deleted.

30 changes: 0 additions & 30 deletions depends/android/libzvbi/01-zvbi-fix-clang-support.patch

This file was deleted.

18 changes: 0 additions & 18 deletions depends/android/libzvbi/03-zvbi-ioctl.patch

This file was deleted.

28 changes: 0 additions & 28 deletions depends/android/libzvbi/04-zvbi-ssize_max.patch

This file was deleted.

37 changes: 0 additions & 37 deletions depends/android/libzvbi/06-zvbi-android.patch

This file was deleted.

31 changes: 0 additions & 31 deletions depends/android/libzvbi/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion depends/android/libzvbi/deps.txt

This file was deleted.

1 change: 0 additions & 1 deletion depends/android/libzvbi/libzvbi.sha256

This file was deleted.

1 change: 0 additions & 1 deletion depends/android/libzvbi/libzvbi.txt

This file was deleted.

Empty file.
File renamed without changes.
Empty file added depends/common/gmp/osx-deps.txt
Empty file.
17 changes: 17 additions & 0 deletions depends/common/gnutls/0001-android-hackfix-fpending_c.patch
Original file line number Diff line number Diff line change
@@ -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 */
20 changes: 0 additions & 20 deletions depends/common/gnutls/01-size-max.patch

This file was deleted.

24 changes: 0 additions & 24 deletions depends/common/gnutls/02-include-libdl-if-available.patch

This file was deleted.