diff options
| author | Todor Prokopov <koprok@users.noreply.github.com> | 2020-02-12 03:30:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 17:30:03 -0800 |
| commit | f478be7479f4a418d46c34156bb34ae4f87656af (patch) | |
| tree | aebf211e460ef405e7e5cd6787d5732b9dd4bc62 /ports/ffmpeg | |
| parent | 5f12ffae8d6444383ed6d88da08ee32876726ebc (diff) | |
| download | vcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.tar.gz vcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.zip | |
[many ports] Support building with MinGW toolchain (#8940)
* Some package fixes necessary to build with MinGW toolchain
* [libraqm] Fix build error caused by trying to write to source directory
* [tmxparser] Fix build failure when tmx port is intalled before tmxparser port
System include path was added first on compiler command line. This leads to
build failure when there is a tmx.h header file in system include path.
* [qt5-base][angle] Trigger CI rebuild
* [kd-soap] Fix build error
* Update ci.baseline
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index fee79a66a..769995497 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-4 +Version: 4.2-5 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. diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 1562fff05..bb4706985 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -51,7 +51,7 @@ endif() # Platform dependent libraries required by FFMPEG if(WIN32) if(NOT CYGWIN) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 Secur32 bcrypt) + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 secur32 bcrypt) endif() else() list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS m) |