diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-01-16 20:23:49 +0100 |
|---|---|---|
| committer | nicole mazzuca <mazzucan@outlook.com> | 2020-01-16 11:23:49 -0800 |
| commit | 529edbb3a4a4d9045b280d1de54205f085159abc (patch) | |
| tree | 528dd5f929b6d25f3628e5cedecf9607c391648a | |
| parent | 526f9375800f846b113989fc3d566af7b8c79408 (diff) | |
| download | vcpkg-529edbb3a4a4d9045b280d1de54205f085159abc.tar.gz vcpkg-529edbb3a4a4d9045b280d1de54205f085159abc.zip | |
[ffmpeg] fix openssl detection (#9695)
| -rw-r--r-- | ports/ffmpeg/0002-detect-openssl.patch | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/ffmpeg/0002-detect-openssl.patch b/ports/ffmpeg/0002-detect-openssl.patch index 87a7656c8..a095af6b1 100644 --- a/ports/ffmpeg/0002-detect-openssl.patch +++ b/ports/ffmpeg/0002-detect-openssl.patch @@ -7,7 +7,7 @@ index 1c8008a..bd2de34 100755 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 || - die "ERROR: openssl not found"; } -+ check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 || ++ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -lcrypt32 || + 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 && diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index faebf0d86..1699baf23 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-2 +Version: 4.2-3 Build-Depends: zlib Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. |