diff options
| author | omartijn <44672243+omartijn@users.noreply.github.com> | 2021-10-06 20:06:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 11:06:35 -0700 |
| commit | d6245fc7d991979c84370b33ef408ffe4a3442da (patch) | |
| tree | de1b2e8111c3d68d0c0738b2c37b45bb14094362 | |
| parent | ff5afbab34834eaf1aebba808c47fea4fd606276 (diff) | |
| download | vcpkg-d6245fc7d991979c84370b33ef408ffe4a3442da.tar.gz vcpkg-d6245fc7d991979c84370b33ef408ffe4a3442da.zip | |
[ffmpeg] Honor macosx deployment target for ffmpeg (#18460)
* Honor macosx deployment target for ffmpeg
* fixup! Honor macosx deployment target for ffmpeg
Co-authored-by: Martijn Otto <git@martijnotto.nl>
Co-authored-by: Martijn Otto <martijn@resolume.com>
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 15 insertions, 5 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index d4451b402..5f6b8d98a 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -220,6 +220,14 @@ else() set(SHELL /bin/sh) endif() +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +if(VCPKG_TARGET_IS_OSX AND VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET) + set(OPTIONS "--extra-cflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") + set(OPTIONS "--extra-ldflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") +endif() + set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}$ENV{${INCLUDE_VAR}}") set(_csc_PROJECT_PATH ffmpeg) @@ -544,9 +552,6 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() -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 if ("${VCPKG_OSX_SYSROOT}" STREQUAL "") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 29870bdc9..a83c6ea25 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 14, + "port-version": 15, "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/versions/baseline.json b/versions/baseline.json index 3aa7be4c8..ba8c37dbe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2102,7 +2102,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 14 + "port-version": 15 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 4fb6cbd41..35a46648b 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "24cb6ddcd146248cb3758ec1aa4c038b28d4c0c5", + "version": "4.4", + "port-version": 15 + }, + { "git-tree": "5d893a1c421f553fbdd9c1f79530a6a84bd0eb76", "version": "4.4", "port-version": 14 |