Skip to content

[vcpkg-ci-ffmpeg, ffmpeg] Require CI pass on all triplets, fix dependencies#39703

Merged
JavierMatosD merged 8 commits intomicrosoft:masterfrom
dg0yt:ffmpeg
Jul 15, 2024
Merged

[vcpkg-ci-ffmpeg, ffmpeg] Require CI pass on all triplets, fix dependencies#39703
JavierMatosD merged 8 commits intomicrosoft:masterfrom
dg0yt:ffmpeg

Conversation

@dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Jul 5, 2024

No description provided.

@WangWeiLin-MV WangWeiLin-MV added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:infrastructure Pertaining to the CI/Testing infrastrucutre labels Jul 5, 2024
@dg0yt
Copy link
Contributor Author

dg0yt commented Jul 5, 2024

arm64-android: Need -lc++, but some deps still need work:
mpg123: -lstdc++
modplug: .../libstdc++
x265: .../libc++

@cenit
Copy link
Contributor

cenit commented Jul 5, 2024

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

@dg0yt dg0yt force-pushed the ffmpeg branch 2 times, most recently from 6ac8414 to e423c1a Compare July 6, 2024 13:52
@dg0yt dg0yt changed the title [vcpkg-ci-ffmpeg,sdl2,libwebp] Require CI pass on all triplets, fix dependencies [vcpkg-ci-ffmpeg, ffmpeg] Require CI pass on all triplets, fix dependencies Jul 6, 2024
Comment on lines +675 to +681
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()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@dg0yt dg0yt force-pushed the ffmpeg branch 2 times, most recently from b27c128 to 21170b8 Compare July 9, 2024 18:18
@cenit cenit mentioned this pull request Jul 12, 2024
7 tasks
Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the content of the patch has changed, it is recommended to commit it to upstream for tracking.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically yes. OTOH upstream didn'r accept the original PR in three years.

@WangWeiLin-MV WangWeiLin-MV added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jul 15, 2024
@JavierMatosD JavierMatosD merged commit f00e89a into microsoft:master Jul 15, 2024
@dg0yt dg0yt deleted the ffmpeg branch July 15, 2024 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:infrastructure Pertaining to the CI/Testing infrastrucutre category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants