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] soxr dependency fix #17299

Merged
merged 3 commits into from
May 4, 2021

Conversation

mcmtroffaes
Copy link
Contributor

Describe the pull request

  • What does your PR fix? Fixes [ffmpeg] fails to detect soxr #17270

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

    Triplets unchanged, baseline updated.

  • Does your PR follow the maintainer guide?

    Yes to the best of my knowledge.

  • 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

Wrong base branch. 😄 Rebasing...

@NancyLi1013 NancyLi1013 self-assigned this Apr 15, 2021
@NancyLi1013 NancyLi1013 added the category:port-bug The issue is with a library, which is something the port should already support label Apr 15, 2021
@mcmtroffaes mcmtroffaes force-pushed the feature/soxr-dependency-fix branch from fa4c78c to 030188d Compare April 15, 2021 08:53
@mcmtroffaes
Copy link
Contributor Author

Ok, should be good now.

@NancyLi1013
Copy link
Contributor

LGTM, let's wait for the CI checks.

@abique
Copy link
Contributor

abique commented Apr 15, 2021

@mcmtroffaes You are a rock star ;-)

@NancyLi1013
Copy link
Contributor

Seems to solve the conflicts @mcmtroffaes.

@mcmtroffaes
Copy link
Contributor Author

I'll wait for #17204 to get merged before solving the conflicts, if that's ok?

@NancyLi1013
Copy link
Contributor

I'll wait for #17204 to get merged before solving the conflicts, if that's ok?

Sure, No problem.

@NancyLi1013 NancyLi1013 added the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 16, 2021
@mcmtroffaes mcmtroffaes force-pushed the feature/soxr-dependency-fix branch from 030188d to a43d502 Compare April 25, 2021 18:41
@mcmtroffaes
Copy link
Contributor Author

Rebased.

@NancyLi1013 NancyLi1013 added info:reviewed Pull Request changes follow basic guidelines and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Apr 26, 2021
@mcmtroffaes mcmtroffaes force-pushed the feature/soxr-dependency-fix branch from a43d502 to 5e4148f Compare April 29, 2021 07:02
@mcmtroffaes
Copy link
Contributor Author

Rebased & conflicts resolved.

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mcmtroffaes mcmtroffaes force-pushed the feature/soxr-dependency-fix branch from 5e4148f to 298c120 Compare April 30, 2021 18:15
@mcmtroffaes
Copy link
Contributor Author

Rebased & resolved conflicts.

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dan-shaw dan-shaw merged commit e8dbfcf into microsoft:master May 4, 2021
@mcmtroffaes mcmtroffaes deleted the feature/soxr-dependency-fix branch May 4, 2021 08:48
sthagen added a commit to sthagen/microsoft-vcpkg that referenced this pull request May 4, 2021
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request May 4, 2021
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.

[ffmpeg] fails to detect soxr
5 participants