diff options
| author | nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> | 2021-07-29 11:47:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 09:47:35 -0700 |
| commit | 5304f826b5736eea0aa4749ce49c84539badaf4a (patch) | |
| tree | 7107a64743a0c1d9b58c31351bfd6da0f18d4497 /ports/ffmpeg | |
| parent | 8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb (diff) | |
| download | vcpkg-5304f826b5736eea0aa4749ce49c84539badaf4a.tar.gz vcpkg-5304f826b5736eea0aa4749ce49c84539badaf4a.zip | |
[rollup] 2021-07-26 (#19157)
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)
[scripts-audit] vcpkg_copy_tools and friends
* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)
[vcpkg] Fix toolchain compatibility with cmake < 3.15
* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)
[cmake-guidelines] Minor update, for `if()`
* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)
[scripts-audit] vcpkg_check_linkage
* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)
[vcpkg.cmake] Fix variable case.
* [rollup:2021-07-26 6/6] PR #18839
[scripts-audit] z_vcpkg_get_cmake_vars
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 0ec2789d0..d4451b402 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -544,9 +544,8 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() -set(CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/vars.cmake") -vcpkg_internal_get_cmake_vars(OUTPUT_FILE CMAKE_VARS_FILE) -include("${CMAKE_VARS_FILE}") +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") if (VCPKG_TARGET_IS_OSX) # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 5a001e069..854bcaf1a 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 11, + "port-version": 12, "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." @@ -9,6 +9,10 @@ "homepage": "https://ffmpeg.org", "dependencies": [ { + "name": "vcpkg-cmake", + "host": true + }, + { "name": "vcpkg-pkgconfig-get-modules", "host": true } |