diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2020-10-06 22:37:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 14:37:25 -0700 |
| commit | 19616d121b30e35805d9cb4c49766a8738aab5d3 (patch) | |
| tree | 67fd27ca358431c2127ee4098f22bedab0424cef | |
| parent | d8a4e6369059aeeaa76fdd6d5e53d22fe60d8244 (diff) | |
| download | vcpkg-19616d121b30e35805d9cb4c49766a8738aab5d3.tar.gz vcpkg-19616d121b30e35805d9cb4c49766a8738aab5d3.zip | |
[ffmpeg] fix zlib feature support on x64-linux (fixes #13768) (#13780)
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 3c87bfdfa..47b0068f2 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.2 -Port-Version: 25 +Port-Version: 26 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 941bcb5ce..5fd7fd05d 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -177,9 +177,7 @@ endif() if(@ENABLE_ZLIB@) find_dependency(ZLIB) - get_target_property(ZLIB_LIBRARY_RELEASE ZLIB::ZLIB IMPORTED_LOCATION_RELEASE) - get_target_property(ZLIB_LIBRARY_DEBUG ZLIB::ZLIB IMPORTED_LOCATION_DEBUG) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS "$<$<CONFIG:Debug>:${ZLIB_LIBRARY_DEBUG}>$<$<NOT:$<CONFIG:Debug>>:${ZLIB_LIBRARY_RELEASE}>") + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${ZLIB_LIBRARIES}) endif() # Platform dependent libraries required by FFMPEG |