From 82034dbd5ff7708ee1ccf5990ca0e15fb746587e Mon Sep 17 00:00:00 2001 From: Jesse Towner Date: Fri, 26 Feb 2021 13:16:38 -0800 Subject: [libwebm] apply upstream changes to support Android NDK r15b and later (#16398) * [libwebm] upstream changes for Android NDK r15b 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 * [libwebm] update control file * [libwebm] update versions * Update ports/libwebm/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/l-/libwebm.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libpx] use file INSTALL instead of COPY & RENAME * [libvpx] update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- versions/baseline.json | 4 ++-- versions/l-/libwebm.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'versions') diff --git a/versions/baseline.json b/versions/baseline.json index 6062b122b..07fa06c7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3521,8 +3521,8 @@ "port-version": 3 }, "libwebm": { - "baseline": "1.0.0.27-5", - "port-version": 0 + "baseline": "1.0.0.27", + "port-version": 6 }, "libwebp": { "baseline": "1.1.0", diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index 9e0626466..d24a3f5fe 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09eeb5a939e4dcb87f405fea40875b2a803cd381", + "version-string": "1.0.0.27", + "port-version": 6 + }, { "git-tree": "f0a6e61554dbc2b0682711214e704f8fc04275ae", "version-string": "1.0.0.27-5", -- cgit v1.2.3