mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 03:09:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* [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>
This commit is contained in:
Jesse Towner 2021-02-26 13:16:38 -08:00 committed by GitHub
parent b5e6d68c20
commit 82034dbd5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ports/libwebm/0003-fix-android-ndk-r22.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/mkvmuxerutil.cpp b/mkvmuxerutil.cpp
index 27ab15d..8949c85 100644
--- a/mkvmuxerutil.cpp
+++ b/mkvmuxerutil.cpp
@@ -10,6 +10,7 @@
#ifdef __ANDROID__
#include <fcntl.h>
+#include <unistd.h>
#endif
#include <cassert>
diff --git a/mkvparser.cpp b/mkvparser.cpp
index 4f20148..9cc6971 100644
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -4034,7 +4034,7 @@ long SegmentInfo::Parse() {
}
const double rollover_check = m_duration * m_timecodeScale;
- if (rollover_check > LLONG_MAX)
+ if (rollover_check > static_cast<double>(LLONG_MAX))
return E_FILE_FORMAT_INVALID;
if (pos != stop)

3
ports/libwebm/CONTROL
View File

@ -1,4 +1,5 @@
Source: libwebm
Version: 1.0.0.27-5
Version: 1.0.0.27
Port-Version: 6
Homepage: https://github.com/webmproject/libwebm
Description: WebM File Parser

4
ports/libwebm/portfile.cmake
View File

@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
0001-fix-cmake.patch
no-samples.patch
0003-fix-android-ndk-r22.patch
)
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
@ -28,5 +29,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
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)
file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

4
versions/baseline.json
View File

@ -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",

5
versions/l-/libwebm.json
View File

@ -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",