Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ffmpeg] Fix build on windows #40420

Merged
merged 7 commits into from
Aug 19, 2024
Merged

[ffmpeg] Fix build on windows #40420

merged 7 commits into from
Aug 19, 2024

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Aug 13, 2024

Fixes #40401.
@dg0yt
[ffmpeg] Remove obsolete env hacks
b90fa21 
PKG_CONFIG_PATH is handled with z_vcpkg_setup_pkgconfig_path.
PROXY vars were originally add before a pacman command (973b0e5),
but this is gone (6390113), and no other network access is expected.
dg0yt
dg0yt commented Aug 13, 2024
View reviewed changes
ports/ffmpeg/portfile.cmake
if(VCPKG_HOST_IS_WINDOWS)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16)
set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe")
list(APPEND prog_env "${MSYS_ROOT}/usr/bin" "${MSYS_ROOT}/usr/share/automake-1.16")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: "${MSYS_ROOT}/usr/bin" wasn't in PATH before this change, and so build.sh would pick a non-matching cygpath, or none at all.
@dg0yt dg0yt marked this pull request as draft August 13, 2024 05:42
@Cheney-W Cheney-W added the category:port-bug The issue is with a library, which is something the port should already support label Aug 13, 2024
@dg0yt dg0yt force-pushed the ffmpeg branch 3 times, most recently from 50b4f76 to 49e5e61 Compare August 15, 2024 05:56
@dg0yt dg0yt marked this pull request as ready for review August 16, 2024 04:02
Cheney-W
Cheney-W previously approved these changes Aug 16, 2024
View reviewed changes
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Aug 16, 2024
@vicroms vicroms merged commit c2a2189 into microsoft:master Aug 19, 2024
16 checks passed
@dg0yt dg0yt deleted the ffmpeg branch August 19, 2024 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
3 participants
@dg0yt @Cheney-W @vicroms