From owner-svn-ports-all@freebsd.org Tue Jan 5 13:41:45 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A637DA611EB; Tue, 5 Jan 2016 13:41:45 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6732D1943; Tue, 5 Jan 2016 13:41:45 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05Dfird039144; Tue, 5 Jan 2016 13:41:44 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05DfiEH039141; Tue, 5 Jan 2016 13:41:44 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201601051341.u05DfiEH039141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 5 Jan 2016 13:41:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405290 - in head/multimedia/mkvtoolnix: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2016 13:41:45 -0000 Author: riggs Date: Tue Jan 5 13:41:44 2016 New Revision: 405290 URL: https://svnweb.freebsd.org/changeset/ports/405290 Log: Update to upstream version 8.7.0 ; Fix build failure on pre-10.x systems MFH: 2016Q1 Added: head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp (contents, props changed) Modified: head/multimedia/mkvtoolnix/Makefile head/multimedia/mkvtoolnix/distinfo Modified: head/multimedia/mkvtoolnix/Makefile ============================================================================== --- head/multimedia/mkvtoolnix/Makefile Tue Jan 5 13:30:52 2016 (r405289) +++ head/multimedia/mkvtoolnix/Makefile Tue Jan 5 13:41:44 2016 (r405290) @@ -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: head/multimedia/mkvtoolnix/distinfo ============================================================================== --- head/multimedia/mkvtoolnix/distinfo Tue Jan 5 13:30:52 2016 (r405289) +++ head/multimedia/mkvtoolnix/distinfo Tue Jan 5 13:41:44 2016 (r405290) @@ -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 Added: head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp Tue Jan 5 13:41:44 2016 (r405290) @@ -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(m_start), ++ const auto float_val = std::strtod(reinterpret_cast(m_start), + &endptr); + + // return float_val if the whole number was translated and NAN