Date: Tue, 5 Jan 2016 16:24:37 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r405301 - in branches/2016Q1/multimedia/mkvtoolnix: . files Message-ID: <201601051624.u05GObsl087515@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Tue Jan 5 16:24:36 2016 New Revision: 405301 URL: https://svnweb.freebsd.org/changeset/ports/405301 Log: MFH: r405290 Update to upstream version 8.7.0 ; Fix build failure on pre-10.x systems Approved by: ports-secteam (feld) Added: branches/2016Q1/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp - copied unchanged from r405290, head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp Modified: branches/2016Q1/multimedia/mkvtoolnix/Makefile branches/2016Q1/multimedia/mkvtoolnix/distinfo Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/multimedia/mkvtoolnix/Makefile ============================================================================== --- branches/2016Q1/multimedia/mkvtoolnix/Makefile Tue Jan 5 16:12:36 2016 (r405300) +++ branches/2016Q1/multimedia/mkvtoolnix/Makefile Tue Jan 5 16:24:36 2016 (r405301) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 8.6.1 +PORTVERSION= 8.7.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ LOCAL/ehaupt @@ -81,6 +81,8 @@ post-patch: ${WRKSRC}/src/output/p_mpeg4_p10.cpp \ ${WRKSRC}/src/output/p_tta.cpp \ ${WRKSRC}/src/output/p_wavpack.cpp + @${REINPLACE_CMD} -e 's|std::lround|lround|g' \ + ${WRKSRC}/src/propedit/tag_target.cpp .endif ${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \ ${WRKSRC}/configure Modified: branches/2016Q1/multimedia/mkvtoolnix/distinfo ============================================================================== --- branches/2016Q1/multimedia/mkvtoolnix/distinfo Tue Jan 5 16:12:36 2016 (r405300) +++ branches/2016Q1/multimedia/mkvtoolnix/distinfo Tue Jan 5 16:24:36 2016 (r405301) @@ -1,2 +1,2 @@ -SHA256 (mkvtoolnix-8.6.1.tar.xz) = 815d8355b6a83af01c957543cee8716f1dad53e03b2ecf58b821099cd3c8fa77 -SIZE (mkvtoolnix-8.6.1.tar.xz) = 3242840 +SHA256 (mkvtoolnix-8.7.0.tar.xz) = 33502efa9a44ad561e89753d9224b7eac95b2a887812ea3d8aa2051ff3f5c15a +SIZE (mkvtoolnix-8.7.0.tar.xz) = 3273484 Copied: branches/2016Q1/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp (from r405290, head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp Tue Jan 5 16:24:36 2016 (r405301, copy of r405290, head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp) @@ -0,0 +1,22 @@ +--- lib/nlohmann-json/src/json.hpp.orig 2015-12-31 12:23:52 UTC ++++ lib/nlohmann-json/src/json.hpp +@@ -5737,7 +5737,9 @@ class basic_json + /// use integer array index as key + case (value_t::array): + { +- return std::to_string(array_index); ++ std::ostringstream TempStream; ++ TempStream << array_index; ++ return TempStream.str(); + } + + /// use key from the object +@@ -6902,7 +6904,7 @@ basic_json_parser_59: + { + // 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 float_val if the whole number was translated and NAN
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601051624.u05GObsl087515>