зеркало из https://github.com/microsoft/vcpkg.git
[ffmpeg] Fix android build on macOS host. (#33943)
ranlib from xcode, which is picked up by default by FFmpeg build system, breaks the .a files. Explicitly point to ranlib from NDK.
This commit is contained in:
Родитель
b9218c4523
Коммит
c67a3059bb
|
@ -155,10 +155,18 @@ if(VCPKG_DETECTED_CMAKE_AR)
|
|||
list(APPEND prog_env "${AR_path}")
|
||||
endif()
|
||||
|
||||
if(VCPKG_DETECTED_CMAKE_RANLIB)
|
||||
get_filename_component(RANLIB_path "${VCPKG_DETECTED_CMAKE_RANLIB}" DIRECTORY)
|
||||
get_filename_component(RANLIB_filename "${VCPKG_DETECTED_CMAKE_RANLIB}" NAME)
|
||||
set(ENV{RANLIB} "${RANLIB_filename}")
|
||||
string(APPEND OPTIONS " --ranlib=${RANLIB_filename}")
|
||||
list(APPEND prog_env "${RANLIB_path}")
|
||||
endif()
|
||||
|
||||
list(REMOVE_DUPLICATES prog_env)
|
||||
vcpkg_add_to_path(PREPEND ${prog_env})
|
||||
|
||||
# More? RANLIB OBJCC STRIP BIN2C
|
||||
# More? OBJCC STRIP BIN2C
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "ffmpeg",
|
||||
"version": "5.1.2",
|
||||
"port-version": 9,
|
||||
"port-version": 10,
|
||||
"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."
|
||||
|
|
|
@ -2522,7 +2522,7 @@
|
|||
},
|
||||
"ffmpeg": {
|
||||
"baseline": "5.1.2",
|
||||
"port-version": 9
|
||||
"port-version": 10
|
||||
},
|
||||
"ffnvcodec": {
|
||||
"baseline": "11.1.5.0",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "713c943d5cce36c51128eea921489e0770c28857",
|
||||
"version": "5.1.2",
|
||||
"port-version": 10
|
||||
},
|
||||
{
|
||||
"git-tree": "dfcd8db452a85e6e6a0ad751dd4610ff1b0e1662",
|
||||
"version": "5.1.2",
|
||||
|
|
Загрузка…
Ссылка в новой задаче