-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from AlwinEsch/build-fixes
Bring in Windows and iOS support
- Loading branch information
Showing
106 changed files
with
2,554 additions
and
942 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #.rst: | ||
| # FindICONV | ||
| # -------- | ||
| # Finds the ICONV library | ||
| # | ||
| # This will define the following variables:: | ||
| # | ||
| # ICONV_FOUND - system has ICONV | ||
| # ICONV_INCLUDE_DIRS - the ICONV include directory | ||
| # ICONV_LIBRARIES - the ICONV libraries | ||
| # | ||
| # and the following imported targets:: | ||
| # | ||
| # ICONV::ICONV - The ICONV library | ||
|
|
||
| find_path(ICONV_INCLUDE_DIR NAMES iconv.h) | ||
|
|
||
| find_library(ICONV_LIBRARY NAMES iconv libiconv c) | ||
|
|
||
| set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) | ||
| include(CheckFunctionExists) | ||
| check_function_exists(iconv HAVE_ICONV_FUNCTION) | ||
| if(NOT HAVE_ICONV_FUNCTION) | ||
| check_function_exists(libiconv HAVE_LIBICONV_FUNCTION2) | ||
| set(HAVE_ICONV_FUNCTION ${HAVE_LIBICONV_FUNCTION2}) | ||
| unset(HAVE_LIBICONV_FUNCTION2) | ||
| endif() | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(Iconv | ||
| REQUIRED_VARS ICONV_LIBRARY ICONV_INCLUDE_DIR HAVE_ICONV_FUNCTION) | ||
|
|
||
| if(ICONV_FOUND) | ||
| set(ICONV_LIBRARIES ${ICONV_LIBRARY}) | ||
| set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR}) | ||
|
|
||
| if(NOT TARGET ICONV::ICONV) | ||
| add_library(ICONV::ICONV UNKNOWN IMPORTED) | ||
| set_target_properties(ICONV::ICONV PROPERTIES | ||
| IMPORTED_LOCATION "${ICONV_LIBRARY}" | ||
| INTERFACE_INCLUDE_DIRECTORIES "${ICONV_INCLUDE_DIR}") | ||
| endif() | ||
| endif() | ||
|
|
||
| mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARY HAVE_ICONV_FUNCTION) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| buildPlugin(version: "Matrix", deploy: ['android-aarch64', 'android-arm7', 'ios-aarch64', 'ios-arm7', 'osx-x86_64', 'ubuntu-ppa']) | ||
| buildPlugin(version: "Matrix") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| libzvbi http://mirrors.kodi.tv/build-deps/sources/zvbi-0.2.35.tar.bz2 |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
depends/common/ffmpeg/01-fix-build-test-with-this-as-static-on-ffmpeg.patch
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
depends/common/ffmpeg/02-ffmpeg-zlib-config-conflict.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -7197,6 +7197,9 @@ | ||
| $CONFIG_EXTRA \ | ||
| $ALL_COMPONENTS \ | ||
|
|
||
| +echo "#if defined(HAVE_UNISTD_H) && HAVE_UNISTD_H == 0" >> $TMPH | ||
| +echo "#undef HAVE_UNISTD_H" >> $TMPH | ||
| +echo "#endif" >> $TMPH | ||
| echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH | ||
| echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -5131,6 +5131,8 @@ | ||
| enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres | ||
| enabled x86_32 && check_ldflags -Wl,--large-address-aware | ||
| shlibdir_default="$bindir_default" | ||
| + LIBPREF="" | ||
| + LIBSUF=".lib" | ||
| SLIBPREF="" | ||
| SLIBSUF=".dll" | ||
| SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' | ||
| @@ -5180,6 +5182,8 @@ | ||
| fi | ||
| enabled x86_32 && check_ldflags -LARGEADDRESSAWARE | ||
| shlibdir_default="$bindir_default" | ||
| + LIBPREF="" | ||
| + LIBSUF=".lib" | ||
| SLIBPREF="" | ||
| SLIBSUF=".dll" | ||
| SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' |
34 changes: 34 additions & 0 deletions
34
depends/common/ffmpeg/05-ssl-support-both-pre-1.1.0-and-post-1.1.0-init.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From 4eae85a82f81fa2ff4c317797ca3d82caf35db86 Mon Sep 17 00:00:00 2001 | ||
| From: Jun Zhao <[email protected]> | ||
| Date: Tue, 10 Dec 2019 17:41:56 +0800 | ||
| Subject: [PATCH] lavf/tls_openssl: support both pre-1.1.0 and post-1.1.0 init | ||
|
|
||
| supporting both pre-1.1.0 and post-1.1.0 version of the OpenSSL | ||
| library as the link: | ||
| https://wiki.openssl.org/index.php/Library_Initialization | ||
|
|
||
| Signed-off-by: Jun Zhao <[email protected]> | ||
| --- | ||
| libavformat/tls_openssl.c | 7 +++++++ | ||
| 1 file changed, 7 insertions(+) | ||
|
|
||
| diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c | ||
| index 7ae71bdaf36..53f8363a12a 100644 | ||
| --- a/libavformat/tls_openssl.c | ||
| +++ b/libavformat/tls_openssl.c | ||
| @@ -70,8 +70,15 @@ int ff_openssl_init(void) | ||
| { | ||
| ff_lock_avformat(); | ||
| if (!openssl_init) { | ||
| + /* OpenSSL 1.0.2 or below, then you would use SSL_library_init. If you are | ||
| + * using OpenSSL 1.1.0 or above, then the library will initialize | ||
| + * itself automatically. | ||
| + * https://wiki.openssl.org/index.php/Library_Initialization | ||
| + */ | ||
| +#if OPENSSL_VERSION_NUMBER < 0x10100000L | ||
| SSL_library_init(); | ||
| SSL_load_error_strings(); | ||
| +#endif | ||
| #if HAVE_THREADS | ||
| if (!CRYPTO_get_locking_callback()) { | ||
| int i; |
Oops, something went wrong.