Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1590924855119160"
MIME-Version: 1.0
Date: Sun, 31 May 2020 11:34:15 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/multimedia/mkvtoolnix
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20200531113415.BA80CFB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1590924855119160
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="UTF-8"

Module Name:	pkgsrc
Committed By:	adam
Date:		Sun May 31 11:34:15 UTC 2020

Modified Files:
	pkgsrc/multimedia/mkvtoolnix: Makefile distinfo
	pkgsrc/multimedia/mkvtoolnix/patches: patch-src_common_locale.cpp

Log Message:
mkvtoolnix: updated to 47.0.0

Version 47.0.0 "Black Flag"

New features and enhancements

* mkvmerge: chapters: mkvmerge can now read chapters from DVDs if the user
  specifies the path to a DVD folder structure via the `--chapters …`
  parameter. By default chapters from the first title will be imported. This
  can be changed by append `:<title number>` to the file/directory name in the
  `--chapters …` argument, e.g. `--chapters /srv/dvds/BigBuckBunny/VIDEO_TS:3`
  This feature requires mkvmerge to have been built with the `libdvdread`
  library.
* mkvmerge: added `--engage append_and_split_flac` that enables mkvmerge to
  append and split FLAC tracks, restoring pre-v45 behavior.  The resulting
  tracks will be broken: the official FLAC tools will not be able to decode
  them and seeking will not work as expected.
* MKVToolNix GUI: multiplexer: added support for mkvmerge's new support for
  reading chapters from DVDs if both have been built with the `libdvdread`
  library.
* MKVToolNix GUI: multiplexer: when deriving languages from file names the GUI
  will now look for simplified language names instead of the full ones
  (e.g. instead of looking for "Greek, Modern (1453-)" it would simply look
  for "Greek").
* MKVToolNix GUI: multiplexer: the options in the "additional command-line
  options" dialog are now sorted alphabetically. Additionally the
  `--append-mode` option has been added as one of the only missing global
  options.
* MKVToolNix GUI: chapter editor: the chapter editor can now read chapters
  from DVDs if MKVToolNix has been build with the `libdvdread` library.
* MKVToolNix GUI: header editor: added an option in the preferences for
  displaying all date & time values in UTC instead of the local time
  zone.

Bug fixes

* all: fixed a crash when using the `MTX_LOGGER=file` syntax for logging debug
  messages without specifying a file name to log to. It will now log to a file
  called `mkvtoolnix-debug.log` in the system's default temporary directory,
  as initially intended.

Build system changes

* The [`libdvdread`](https://www.videolan.org/developers/libdvdnav.html)
  library will be used if found via `pkg-config`. If it is found, support for
  reading chapters from DVDs will be enabled in `mkvmerge` and the MKVToolNix
  GUI.
* Boost's Date/Time, Lexical Cast, Range, Range Adaptors, Tri-Bool, Variant
  libraries are not used anymore.
* MKVToolNix now requires a C++ compiler & standard library that support the
  following features of the C++17 standard: "`std::variant`", "`std::gcd`".
  For the GNU Compiler Collection (gcc) this means v7 or newer; for clang it
  means v4 or newer — the same versions required by earlier MKVToolNix
  versions.
* MKVToolNix now requires version 6.1.0 of fmtlib or later for the
  `fmt::to_string` function and bugfixes to the formatting of floating point
  numbers. If a system-wide version is installed that's older, the bundled
  copy will be used.
* The bundled version of fmtlib has been updated to release 6.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1590924855119160
Content-Disposition: inline
Content-Length: 3378
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.152 pkgsrc/multimedia/mkvtoolnix/Makefile:1.153
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.152	Wed May  6 14:04:53 2020
+++ pkgsrc/multimedia/mkvtoolnix/Makefile	Sun May 31 11:34:15 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2020/05/06 14:04:53 adam Exp $
+# $NetBSD: Makefile,v 1.153 2020/05/31 11:34:15 adam Exp $
 
-DISTNAME=	mkvtoolnix-46.0.0
-PKGREVISION=	1
+DISTNAME=	mkvtoolnix-47.0.0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.78 pkgsrc/multimedia/mkvtoolnix/distinfo:1.79
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.78	Sun May  3 11:33:03 2020
+++ pkgsrc/multimedia/mkvtoolnix/distinfo	Sun May 31 11:34:15 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.78 2020/05/03 11:33:03 adam Exp $
+$NetBSD: distinfo,v 1.79 2020/05/31 11:34:15 adam Exp $
 
-SHA1 (mkvtoolnix-46.0.0.tar.xz) = 0f10c0a5afe3db1f292c069443fcaba9ee128221
-RMD160 (mkvtoolnix-46.0.0.tar.xz) = 642288fcb3c0beafc42930f04709614e35cb9b78
-SHA512 (mkvtoolnix-46.0.0.tar.xz) = 8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c
-Size (mkvtoolnix-46.0.0.tar.xz) = 7505996 bytes
+SHA1 (mkvtoolnix-47.0.0.tar.xz) = 785906ca26d12105235bed2155689884cc36c92c
+RMD160 (mkvtoolnix-47.0.0.tar.xz) = d98253b41b71b078ea60b1b90a6f9c2f2d26d292
+SHA512 (mkvtoolnix-47.0.0.tar.xz) = dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
+Size (mkvtoolnix-47.0.0.tar.xz) = 7532248 bytes
 SHA1 (patch-Rakefile) = 94c0a9ae0443f652a87f91cec195fe0d7afb61ac
-SHA1 (patch-src_common_locale.cpp) = 46ba293fb0dee8af0e6e6fbe17c725a509101109
+SHA1 (patch-src_common_locale.cpp) = 2f3113c8c9171b87a421df447f6c421b1e4dc7e0

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp
diff -u pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp:1.1 pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp:1.2
--- pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp:1.1	Mon Dec  3 12:15:03 2018
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp	Sun May 31 11:34:15 2020
@@ -1,19 +1,19 @@
-$NetBSD: patch-src_common_locale.cpp,v 1.1 2018/12/03 12:15:03 jperkin Exp $
+$NetBSD: patch-src_common_locale.cpp,v 1.2 2020/05/31 11:34:15 adam Exp $
 
 Remove broken SunOS section that is no longer needed.
 https://gitlab.com/mbunkus/mkvtoolnix/issues/2450
 
---- src/common/locale.cpp.orig	2018-12-01 11:15:36.000000000 +0000
+--- src/common/locale.cpp.orig	2020-05-31 10:56:36.000000000 +0000
 +++ src/common/locale.cpp
-@@ -292,12 +292,6 @@ get_local_charset() {
+@@ -283,12 +283,6 @@ get_local_charset() {
    setlocale(LC_CTYPE, "");
  #if defined(COMP_MINGW) || defined(COMP_MSC)
-   lc_charset = "CP" + to_string(GetACP());
+   lc_charset = fmt::format("CP{0}", GetACP());
 -#elif defined(SYS_SOLARIS)
 -  int i;
 -
 -  lc_charset = nl_langinfo(CODESET);
--  if (parse_number(lc_charset, i))
+-  if (mtx::string::parse_number(lc_charset, i))
 -    lc_charset = "ISO"s + lc_charset + "-US"s;
  #elif HAVE_NL_LANGINFO
    lc_charset = nl_langinfo(CODESET);


--_----------=_1590924855119160--