[vcpkg-ci-ffmpeg, ffmpeg] Require CI pass on all triplets, fix dependencies#39703
[vcpkg-ci-ffmpeg, ffmpeg] Require CI pass on all triplets, fix dependencies#39703JavierMatosD merged 8 commits intomicrosoft:masterfrom
Conversation
|
arm64-android: Need |
|
thanks. It was very difficult for me to accept to add failures for ffmpeg in my pr just because it was silently broken on master. I will make mine depend on this |
6ac8414 to
e423c1a
Compare
| set(maybe_needed_libraries -lm) | ||
| separate_arguments(standard_libraries NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") | ||
| foreach(item IN LISTS standard_libraries) | ||
| if(item IN_LIST maybe_needed_libraries) | ||
| set(OPTIONS "${OPTIONS} \"--extra-libs=${item}\"") | ||
| endif() | ||
| endforeach() |
There was a problem hiding this comment.
Our android toolchains have -lm in standard libraries, so it isn't always passed as an "extra" requirement in exported configs (e.g. by libwebp). This section makes the ffmpeg build behave similar to cmake builds.
b27c128 to
21170b8
Compare
For improving portability of interaction with cmake based dependencies such as libwebp, apply standard libaries as cmake does: Use them for linking, but do not output them in exported config.
WangWeiLin-MV
left a comment
There was a problem hiding this comment.
The ports ffmpeg, libmodplug, libopenmpt installation tests pass with the following triplets:
- x64-windows
| 002-detect_sinf.patch | ||
| 003-use-static-cast-for-ctype.patch | ||
| 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 | ||
| 004-export-pkgconfig.patch |
There was a problem hiding this comment.
Since the content of the patch has changed, it is recommended to commit it to upstream for tracking.
There was a problem hiding this comment.
Basically yes. OTOH upstream didn'r accept the original PR in three years.
No description provided.