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.

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

[ffmpeg] fix optional X11 platform dependencies #17625

Merged
merged 12 commits into from
May 6, 2021

Conversation

mcmtroffaes
Copy link
Contributor

  • What does your PR fix?

    If X11 is not installed on the system, ffmpeg gets compiled without X11 support, however the FindFFMPEG script will still add X11 to the list of platform dependent libraries, leading to linking errors (see for instance here). This PR fixes that issue.

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    No changes, baseline not updated.

  • Does your PR follow the maintainer guide?

    Yes.

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes.

@mcmtroffaes
Copy link
Contributor Author

mcmtroffaes commented May 2, 2021

I forgot to mention this above, but whilst at it, I've also added Xext and Xv as dependent libraries, since these were listed in the ffmpeg configure script.

@JackBoosY JackBoosY self-assigned this May 2, 2021
@JackBoosY JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label May 2, 2021
@JackBoosY
Copy link
Contributor

Ping @cenit @Neumann-A for review this PR.

@cenit
Copy link
Contributor

cenit commented May 3, 2021

@mcmtroffaes is doing a wonderful job with ffmpeg port!
ok for me!

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label May 3, 2021
@cenit
Copy link
Contributor

cenit commented May 3, 2021

unrelated to this PR directly but still relevant for CI tests: opencv on uwp architectures (arm and x64) is now (again) a cascade failure.

Again, undetected, it has fallen to this status which means that PR can break it without noticing.... when did it happen??

luckily there is no x11 on uwp platform, but in principle the problem is again there and any pr can break it without any red mark (i keep opencv under strict control also because it's an ffmpeg consuming port, so it's useful to see regressions in FindFFMPEG.cmake)...

@BillyONeal

@BillyONeal
Copy link
Member

@cenit I still want to address that someday but having been load balanced elsewhere it's going to be a while before I have a chance to look. Starting to move things out of our wrapper powershell scripts (like analyze-test-results.ps1) and into vcpkg ci itself over in https://github.com/microsoft/vcpkg-tool would be helpful if anyone wants to help.

@cenit
Copy link
Contributor

cenit commented May 3, 2021

I will try my best if/when possible to help you on this front. Cannot promise anything

@mcmtroffaes
Copy link
Contributor Author

Conflicts resolved.

@strega-nil-ms
Copy link
Contributor

@mcmtroffaes you'll need to merge with latest please :)

@mcmtroffaes
Copy link
Contributor Author

Sure, merged again.

@strega-nil-ms
Copy link
Contributor

Awesome, thanks @mcmtroffaes :D

@strega-nil-ms strega-nil-ms merged commit 3739159 into microsoft:master May 6, 2021
@mcmtroffaes mcmtroffaes deleted the feature/ffmpeg-fix-xlib branch May 7, 2021 07:55
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants