diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-04-23 19:02:11 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-04-23 19:02:11 +0000 |
| commit | 5120a1e4e85699cb753313da1f743ac945681415 (patch) | |
| tree | e0a7f0431d517efa329688f07255bbf5b07aae92 /multimedia | |
| parent | 8f21bd3418a877ee17926e275ac2499dc2d2a9e9 (diff) | |
| download | ports-5120a1e4e85699cb753313da1f743ac945681415.tar.gz ports-5120a1e4e85699cb753313da1f743ac945681415.zip | |
Update to upstream releaser 9.1.0
Notes
Notes:
svn path=/head/; revision=413903
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mkvtoolnix/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp | 24 |
3 files changed, 15 insertions, 15 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 28e22c416282..9c6d2ebb4131 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 9.0.1 +PORTVERSION= 9.1.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 0769c07883fd..507ab228c55e 100644 --- a/multimedia/mkvtoolnix/distinfo +++ b/multimedia/mkvtoolnix/distinfo @@ -1,2 +1,2 @@ -SHA256 (mkvtoolnix-9.0.1.tar.xz) = 292504633d714c42f73f08474137e462827f6d8d570292005bbaebb8fee8e52e -SIZE (mkvtoolnix-9.0.1.tar.xz) = 3682892 +SHA256 (mkvtoolnix-9.1.0.tar.xz) = 1471370251ff8414f3c02a0e21ec41c644f9d54bf4f1f5253d0cd9406281ce60 +SIZE (mkvtoolnix-9.1.0.tar.xz) = 3702480 diff --git a/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp b/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp index cf7927665cc4..db97130ef713 100644 --- a/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp +++ b/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp @@ -1,8 +1,8 @@ ---- lib/nlohmann-json/src/json.hpp.orig 2015-12-31 12:23:52 UTC +--- lib/nlohmann-json/src/json.hpp.orig 2016-04-23 13:52:02 UTC +++ lib/nlohmann-json/src/json.hpp -@@ -5737,7 +5737,9 @@ class basic_json - /// use integer array index as key - case (value_t::array): +@@ -6224,7 +6224,9 @@ class basic_json + // use integer array index as key + case value_t::array: { - return std::to_string(array_index); + std::ostringstream TempStream; @@ -10,13 +10,13 @@ + return TempStream.str(); } - /// use key from the object -@@ -6902,7 +6904,7 @@ basic_json_parser_59: + // use key from the object +@@ -8204,7 +8206,7 @@ basic_json_parser_63: + */ + long double str_to_float_t(long double* /* type */, char** endptr) const { - // conversion - typename string_t::value_type* endptr; -- const auto float_val = std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), -+ const auto float_val = std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), - &endptr); +- return std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); ++ return std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); + } - // return float_val if the whole number was translated and NAN + /*! |