diff options
| -rw-r--r-- | ports/libwebm/0003-fix-android-ndk-r22.patch | 25 | ||||
| -rw-r--r-- | ports/libwebm/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libwebm/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/l-/libwebm.json | 5 |
5 files changed, 36 insertions, 5 deletions
diff --git a/ports/libwebm/0003-fix-android-ndk-r22.patch b/ports/libwebm/0003-fix-android-ndk-r22.patch new file mode 100644 index 000000000..b08168ade --- /dev/null +++ b/ports/libwebm/0003-fix-android-ndk-r22.patch @@ -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) diff --git a/ports/libwebm/CONTROL b/ports/libwebm/CONTROL index c2d9d878f..243a220c5 100644 --- a/ports/libwebm/CONTROL +++ b/ports/libwebm/CONTROL @@ -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 diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index 9e8d4c907..a461ae0cb 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -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) 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,6 +1,11 @@ { "versions": [ { + "git-tree": "09eeb5a939e4dcb87f405fea40875b2a803cd381", + "version-string": "1.0.0.27", + "port-version": 6 + }, + { "git-tree": "f0a6e61554dbc2b0682711214e704f8fc04275ae", "version-string": "1.0.0.27-5", "port-version": 0 |