diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2020-11-06 02:29:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 18:29:55 -0800 |
| commit | 193e348cf34c442c5499fbff5f5b6cc78faea6e3 (patch) | |
| tree | 109a0ca0db8e4b519d4c184be6ad95ca47b33dcc | |
| parent | 9d2f4a59b30a8b0730096ad3b63eff859437d6db (diff) | |
| download | vcpkg-193e348cf34c442c5499fbff5f5b6cc78faea6e3.tar.gz vcpkg-193e348cf34c442c5499fbff5f5b6cc78faea6e3.zip | |
[ffmpeg] use OPENSSL_LIBRARIES generated by upstream cmake FindOpenSSL script (fixes linux openssl linking) (#14388)
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 32520c8ed..4ea0d0400 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.1 -Port-Version: 6 +Port-Version: 7 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. FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations. diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 57e5315b8..a0b4d2005 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -112,11 +112,7 @@ endif() if(@ENABLE_OPENSSL@) find_dependency(OpenSSL) - select_library_configurations_from_targets(BASENAME SSL TARGETS OpenSSL::SSL OpenSSL::Crypto) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${SSL_LIBRARIES}) - if(WIN32 AND NOT CYGWIN) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS Crypt32) - endif() + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${OPENSSL_LIBRARIES}) endif() if(@ENABLE_OPUS@) |