Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[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>
This commit is contained in:
omartijn 2021-10-06 20:06:35 +02:00 committed by GitHub
parent ff5afbab34
commit d6245fc7d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/ffmpeg/portfile.cmake
View File

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

2
ports/ffmpeg/vcpkg.json
View File

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

2
versions/baseline.json
View File

@ -2102,7 +2102,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 14
"port-version": 15
},
"ffnvcodec": {
"baseline": "11.1.5.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "24cb6ddcd146248cb3758ec1aa4c038b28d4c0c5",
"version": "4.4",
"port-version": 15
},
{
"git-tree": "5d893a1c421f553fbdd9c1f79530a6a84bd0eb76",
"version": "4.4",