Skip to content

[libwebm] apply upstream changes to support Android NDK r15b and later#16398

Merged
ras0219-msft merged 9 commits intomicrosoft:masterfrom
jwtowner:libwebm-android
Feb 26, 2021
Merged

[libwebm] apply upstream changes to support Android NDK r15b and later#16398
ras0219-msft merged 9 commits intomicrosoft:masterfrom
jwtowner:libwebm-android

Conversation

@jwtowner
Copy link
Copy Markdown
Contributor

@jwtowner jwtowner commented Feb 24, 2021

This applies a minimal set of upstream changes from the master branch of libwebm to 1.0.0.27 in order to support building with Android NDK r15b and later up through Android NDK r23 beta. This was primarily tested with Android NDK r21e and Android NDK r22.

Commits taken from https://chromium.googlesource.com/webm/libwebm master branch:

0ae757087f5e6eb01dfea16cc09205b2425cfb74
Fix android build failure with NDK r15b.

90967863b2f67962f52595a26abb8e4fa4105d44
mkvparser: fix float conversion warning

EDIT: This PR allows building libwebm for the android community triplets.

This applies upstream changes from master to libwebm 1.0.0.27 to
support building with Android NDK r15b and later up through
Android NDK r23 beta.

Commits taken from https://chromium.googlesource.com/webm/libwebm
master branch:

0ae757087f5e6eb01dfea16cc09205b2425cfb74
Fix android build failure with NDK r15b.

90967863b2f67962f52595a26abb8e4fa4105d44
mkvparser: fix float conversion warning
@jwtowner jwtowner changed the title [libwebm] apply upstream changes to support Android NDK r15c and later [libwebm] apply upstream changes to support Android NDK r15b and later Feb 24, 2021
Copy link
Copy Markdown
Contributor

@NancyLi1013 NancyLi1013 left a comment

Choose a reason for hiding this comment

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

Could you please update

file(COPY ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebm)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebm/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/libwebm/copyright)

as

file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)?

@NancyLi1013 NancyLi1013 added category:port-bug The issue is with a library, which is something the port should already support requires:author-response labels Feb 25, 2021
jwtowner and others added 6 commits February 24, 2021 21:00
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@jwtowner
Copy link
Copy Markdown
Contributor Author

@NancyLi1013

Done! I've switched the portfile over to use file(INSTALL ... RENAME ...) when installing the copyright file as you've suggested.

@Hoikas
Copy link
Copy Markdown
Contributor

Hoikas commented Feb 25, 2021

Considering it's been a little over five years since the last release and that these patches came directly from upstream master, maybe it would be better to change this port to a live-at-head policy. Meaning, use a date based version-string and use the current HEAD in the portfile.

@jwtowner
Copy link
Copy Markdown
Contributor Author

jwtowner commented Feb 25, 2021

Considering it's been a little over five years since the last release and that these patches came directly from upstream master, maybe it would be better to change this port to a live-at-head policy. Meaning, use a date based version-string and use the current HEAD in the portfile.

Yeah, I agree, and I would be pleased to do the work for that. However, I'd like to do it after getting this PR merged if that's okay, so we at least have libwebm 1.0.0.27 to fallback to for a time in case we run into other problems or dependency issues, and for those using port versioning. With this PR, I at least have it working on Windows, UWP, Android, Linux, iOS and macOS targets at the current version.

@NancyLi1013 NancyLi1013 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Feb 26, 2021
@ras0219-msft ras0219-msft merged commit 82034db into microsoft:master Feb 26, 2021
@ras0219-msft
Copy link
Copy Markdown
Contributor

ras0219-msft commented Feb 26, 2021

Awesome PR, thanks for the history/summary, it really helps!

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:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants