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

[openh264] only build shared or static library #17592

Merged
merged 3 commits into from
May 18, 2021

Conversation

mcmtroffaes
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

    Currently, when installing openh264, both the static and shared library get built and potentially installed, even though only a static or shared one is requested by vcpkg. For example, on x64-linux:

    # before patch
    $ ./vcpkg install openh264
    $ ls installed/x64-linux/lib/
    libopenh264.a  libopenh264.so  libopenh264.so.2.1.0  libopenh264.so.6  pkgconfig
    # after patch
    $ ./vcpkg install openh264
    $ ls installed/x64-linux/lib/
    libopenh264.a  pkgconfig

    This PR incorporates an upstream patch from meson: Use pkg-config generator and some cleanups cisco/openh264#3351 to ensure that openh264 respects meson's default_library option, resolving this issue (since this is the mechanism also used by vcpkg to request either the static or shared library).

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

    No changes.

  • 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

My CI has fully cycled now and I can now confirm that this PR also fixes the following error on osx:

https://travis-ci.com/github/mcmtroffaes/ffmpeg-msvc-build/jobs/501838063#L371

Reason is that the FindFFMPEG script picks up the dynamic library instead of the static library:

https://travis-ci.com/github/mcmtroffaes/ffmpeg-msvc-build/jobs/501838063#L317

@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
@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label May 7, 2021
@NancyLi1013
Copy link
Contributor

Thanks for your fixing @mcmtroffaes.

@dan-shaw dan-shaw merged commit d77e767 into microsoft:master May 18, 2021
@mcmtroffaes mcmtroffaes deleted the feature/openh264-library-fix branch May 18, 2021 07:50
@mcmtroffaes
Copy link
Contributor Author

Thanks for merging!

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.

4 participants