svn commit: r413903 - in head/multimedia/mkvtoolnix: . files

[Thomas Zander]

Author: riggs
Date: Sat Apr 23 19:02:11 2016
New Revision: 413903
URL: https://svnweb.freebsd.org/changeset/ports/413903

Log:
  Update to upstream releaser 9.1.0

Modified:
  head/multimedia/mkvtoolnix/Makefile
  head/multimedia/mkvtoolnix/distinfo
  head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp

Modified: head/multimedia/mkvtoolnix/Makefile
==============================================================================
--- head/multimedia/mkvtoolnix/Makefile	Sat Apr 23 19:01:18 2016	(r413902)
+++ head/multimedia/mkvtoolnix/Makefile	Sat Apr 23 19:02:11 2016	(r413903)
@@ -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/

Modified: head/multimedia/mkvtoolnix/distinfo
==============================================================================
--- head/multimedia/mkvtoolnix/distinfo	Sat Apr 23 19:01:18 2016	(r413902)
+++ head/multimedia/mkvtoolnix/distinfo	Sat Apr 23 19:02:11 2016	(r413903)
@@ -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

Modified: head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp
==============================================================================
--- head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp	Sat Apr 23 19:01:18 2016	(r413902)
+++ head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp	Sat Apr 23 19:02:11 2016	(r413903)
@@ -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
+         /*!