MFH: r466227

Update to upstream version 22.0.0

Approved by:	ports-secteam (riggs)
This commit is contained in:
Thomas Zander 2018-04-02 13:40:29 +00:00
parent 92b3155811
commit 5ef7f2f344
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=466228
3 changed files with 4 additions and 15 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mkvtoolnix
PORTVERSION= 21.0.0
PORTVERSION= 22.0.0
CATEGORIES= multimedia audio
MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
https://mkvtoolnix.download/sources/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1521806324
SHA256 (mkvtoolnix-21.0.0.tar.xz) = ad6d1d0ba40b153c155d5b26425e88531b24bb9969bac0341040e48cbb77c391
SIZE (mkvtoolnix-21.0.0.tar.xz) = 4682788
TIMESTAMP = 1522666530
SHA256 (mkvtoolnix-22.0.0.tar.xz) = 88c5074d6731b65d5c2ddd02113ae064373eb83ef3e6e00a04876f88c0be7f67
SIZE (mkvtoolnix-22.0.0.tar.xz) = 4714712

View File

@ -1,11 +0,0 @@
--- src/common/json.cpp.orig 2018-02-24 09:41:56 UTC
+++ src/common/json.cpp
@@ -96,7 +96,7 @@ strip_comments(nlohmann::json::string_t
} catch (mtx::mm_io::exception &) {
}
- return std::string{reinterpret_cast<char *>(out.get_buffer()), out.getFilePointer()};
+ return std::string{reinterpret_cast<char *>(out.get_buffer()), static_cast<std::string::size_type>(out.getFilePointer())};
}
}