mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 20:23:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ffmpeg] fix zlib feature support on x64-linux (fixes #13768) (#13780)

Browse Source
This commit is contained in:
Matthias C. M. Troffaes 2020-10-06 22:37:25 +01:00 committed by GitHub
parent d8a4e63690
commit 19616d121b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ffmpeg/CONTROL
View File

@ -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.

4
ports/ffmpeg/FindFFMPEG.cmake.in
View File

@ -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