diff options
Diffstat (limited to 'tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch')
| -rw-r--r-- | tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch b/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch index 632cc55bfb..7896759375 100644 --- a/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch +++ b/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch @@ -1,6 +1,17 @@ +diff --git a/configure b/configure +index 34c2adb4a4..a2a2515525 100755 --- a/configure +++ b/configure -@@ -7197,6 +7197,9 @@ +@@ -6358,6 +6358,8 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP + check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || + check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || + check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || ++ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -ladvapi32 -luser32 || ++ check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 || + die "ERROR: openssl not found"; } + enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init + enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create && +@@ -7437,6 +7439,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ $CONFIG_EXTRA \ $ALL_COMPONENTS \ |