aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2018-03-24 16:49:43 +0800
committerThomas Zander <riggs@FreeBSD.org>2018-03-24 16:49:43 +0800
commit358603b206f013aef0f215a0337a6b01bdeae59a (patch)
tree9af349d659c58412f22a750da61b62bd91b71bd8
parent34500fa0dc67973bb385d02dbd9427d99c4c7b67 (diff)
downloadfreebsd-ports-358603b206f013aef0f215a0337a6b01bdeae59a.tar.gz
freebsd-ports-358603b206f013aef0f215a0337a6b01bdeae59a.tar.zst
freebsd-ports-358603b206f013aef0f215a0337a6b01bdeae59a.zip
Update to upstream version 21.0.0
Details: - Upstream changelog, see https://mkvtoolnix.download/doc/NEWS.md - mkvinfo is now command-line-only
Notes
Notes: svn path=/head/; revision=465436
-rw-r--r--multimedia/mkvtoolnix/Makefile2
-rw-r--r--multimedia/mkvtoolnix/distinfo6
-rw-r--r--multimedia/mkvtoolnix/files/patch-src_common_json.cpp11
-rw-r--r--multimedia/mkvtoolnix/pkg-plist1
4 files changed, 15 insertions, 5 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 34b8a6f28cfd..f07aea1f7442 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mkvtoolnix
-PORTVERSION= 20.0.0
+PORTVERSION= 21.0.0
CATEGORIES= multimedia audio
MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
https://mkvtoolnix.download/sources/
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index e314450322ca..66611c84b66b 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516400368
-SHA256 (mkvtoolnix-20.0.0.tar.xz) = 6f4b86a16af1f979ce2e83e64223b1bb8635ac8f81863d8ce46014a82c8bf500
-SIZE (mkvtoolnix-20.0.0.tar.xz) = 4670268
+TIMESTAMP = 1521806324
+SHA256 (mkvtoolnix-21.0.0.tar.xz) = ad6d1d0ba40b153c155d5b26425e88531b24bb9969bac0341040e48cbb77c391
+SIZE (mkvtoolnix-21.0.0.tar.xz) = 4682788
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_json.cpp b/multimedia/mkvtoolnix/files/patch-src_common_json.cpp
new file mode 100644
index 000000000000..a9501cb0a518
--- /dev/null
+++ b/multimedia/mkvtoolnix/files/patch-src_common_json.cpp
@@ -0,0 +1,11 @@
+--- 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())};
+ }
+
+ }
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index ffd5160acab2..88b710cd7b1e 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -53,7 +53,6 @@ man/man1/mkvpropedit.1.gz
%%MANTRANS%%man/zh_CN/man1/mkvmerge.1.gz
%%MANTRANS%%man/zh_CN/man1/mkvpropedit.1.gz
%%MANTRANS%%%%QT5%%man/zh_CN/man1/mkvtoolnix-gui.1.gz
-%%QT5%%share/applications/org.bunkus.mkvinfo.desktop
%%QT5%%share/applications/org.bunkus.mkvtoolnix-gui.desktop
%%QT5%%share/icons/hicolor/128x128/apps/mkvextract.png
%%QT5%%share/icons/hicolor/128x128/apps/mkvinfo.png