diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2020-11-02 21:57:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 13:57:18 -0800 |
| commit | 4ec138faea541ae743ac14a894fb8c287edfe9c7 (patch) | |
| tree | 1a08d4248993cb2e90313c77f2985e2c7fe5f119 | |
| parent | a20ed340987d996e0da067cdc8282a4c1fd01b4b (diff) | |
| download | vcpkg-4ec138faea541ae743ac14a894fb8c287edfe9c7.tar.gz vcpkg-4ec138faea541ae743ac14a894fb8c287edfe9c7.zip | |
[ffmpeg] fix x264 feature linking on x64-linux (#14330)
* [ffmpeg] fix x264 feature linking on x64-linux
* [ffmpeg] increment port version
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 1577bd72e..3a42c7807 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.1 -Port-Version: 4 +Port-Version: 5 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 d7cca261f..03dfcea0f 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -177,6 +177,9 @@ endif() if(@ENABLE_X264@) select_library_configurations_from_names(BASENAME X264 NAMES x264 libx264) list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${X264_LIBRARIES}) + if(UNIX) + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS dl) + endif() endif() if(@ENABLE_X265@) |