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

[libpng] Fix libpng for android #28018

Merged
merged 1 commit into from
Nov 30, 2022
Merged

Conversation

m-kuhn
Copy link
Contributor

@m-kuhn m-kuhn commented Nov 26, 2022

Describe the problem

check is only a valid value for arm architectures.

On arm64 this errors with

CMake Error at CMakeLists.txt:108 (message):
  PNG_ARM_NEON must be one of [on;off]

Describe the pull request

Only use check on arm

github-actions[bot]
github-actions bot previously approved these changes Nov 26, 2022
@Cheney-W Cheney-W changed the title Fix libpng for android [libpng] Fix libpng for android Nov 28, 2022
@Cheney-W Cheney-W added category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. category:port-bug The issue is with a library, which is something the port should already support labels Nov 28, 2022
@Cheney-W
Copy link
Contributor

The failures on CI are known and they are being fixed.

The default is on (with neon) which is the only configuration accepted by the latest ndk r25 which has dropped support for non neon devices.

Is this only implemented on top of the latest? So if it's not the latest, will your changes cause other errors?

@m-kuhn
Copy link
Contributor Author

m-kuhn commented Nov 28, 2022

Digging deeper... The upstream logic actually has a dependency on the target architecture:

https://github.com/glennrp/libpng/blob/libpng16/CMakeLists.txt#L95-L104

This should be updated to switch to check if VCPKG_TARGET_ARCHITECTURE STREQUAL "arm".

@dg0yt
Copy link
Contributor

dg0yt commented Nov 28, 2022

FTR a similar PR was reviewed in #27936.

@Cheney-W
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@m-kuhn
Copy link
Contributor Author

m-kuhn commented Nov 29, 2022

Should be fine now

@Cheney-W Cheney-W added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Nov 29, 2022
@JavierMatosD
Copy link
Contributor

Thank you!

@JavierMatosD JavierMatosD merged commit 05b6394 into microsoft:master Nov 30, 2022
@m-kuhn m-kuhn deleted the libpng_android branch November 30, 2022 17:52
@dg0yt dg0yt mentioned this pull request Dec 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. 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.

None yet

4 participants