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.diff -r1.152 -r1.153 pkgsrc/multimedia/mkvtoolnix/Makefile
(adam)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.152 2020/05/06 14:04:53 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.153 2020/05/31 11:34:15 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= mkvtoolnix-46.0.0 | 3 | DISTNAME= mkvtoolnix-47.0.0 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= multimedia | 4 | CATEGORIES= multimedia | |
6 | MASTER_SITES= https://mkvtoolnix.download/sources/ | 5 | MASTER_SITES= https://mkvtoolnix.download/sources/ | |
7 | EXTRACT_SUFX= .tar.xz | 6 | EXTRACT_SUFX= .tar.xz | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://mkvtoolnix.download/ | 9 | HOMEPAGE= https://mkvtoolnix.download/ | |
11 | COMMENT= Set of tools to create, alter and inspect Matroska files | 10 | COMMENT= Set of tools to create, alter and inspect Matroska files | |
12 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
13 | 12 | |||
14 | BUILD_DEPENDS+= docbook-xsl>=1.79.1nb5:../../textproc/docbook-xsl | 13 | BUILD_DEPENDS+= docbook-xsl>=1.79.1nb5:../../textproc/docbook-xsl | |
15 | BUILD_DEPENDS+= po4a-[0-9]*:../../textproc/po4a | 14 | BUILD_DEPENDS+= po4a-[0-9]*:../../textproc/po4a | |
16 | BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} | 15 | BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} | |
17 | 16 |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.78 2020/05/03 11:33:03 adam Exp $ | 1 | $NetBSD: distinfo,v 1.79 2020/05/31 11:34:15 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (mkvtoolnix-46.0.0.tar.xz) = 0f10c0a5afe3db1f292c069443fcaba9ee128221 | 3 | SHA1 (mkvtoolnix-47.0.0.tar.xz) = 785906ca26d12105235bed2155689884cc36c92c | |
4 | RMD160 (mkvtoolnix-46.0.0.tar.xz) = 642288fcb3c0beafc42930f04709614e35cb9b78 | 4 | RMD160 (mkvtoolnix-47.0.0.tar.xz) = d98253b41b71b078ea60b1b90a6f9c2f2d26d292 | |
5 | SHA512 (mkvtoolnix-46.0.0.tar.xz) = 8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c | 5 | SHA512 (mkvtoolnix-47.0.0.tar.xz) = dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d | |
6 | Size (mkvtoolnix-46.0.0.tar.xz) = 7505996 bytes | 6 | Size (mkvtoolnix-47.0.0.tar.xz) = 7532248 bytes | |
7 | SHA1 (patch-Rakefile) = 94c0a9ae0443f652a87f91cec195fe0d7afb61ac | 7 | SHA1 (patch-Rakefile) = 94c0a9ae0443f652a87f91cec195fe0d7afb61ac | |
8 | SHA1 (patch-src_common_locale.cpp) = 46ba293fb0dee8af0e6e6fbe17c725a509101109 | 8 | SHA1 (patch-src_common_locale.cpp) = 2f3113c8c9171b87a421df447f6c421b1e4dc7e0 |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-src_common_locale.cpp,v 1.1 2018/12/03 12:15:03 jperkin Exp $ | 1 | $NetBSD: patch-src_common_locale.cpp,v 1.2 2020/05/31 11:34:15 adam Exp $ | |
2 | 2 | |||
3 | Remove broken SunOS section that is no longer needed. | 3 | Remove broken SunOS section that is no longer needed. | |
4 | https://gitlab.com/mbunkus/mkvtoolnix/issues/2450 | 4 | https://gitlab.com/mbunkus/mkvtoolnix/issues/2450 | |
5 | 5 | |||
6 | --- src/common/locale.cpp.orig 2018-12-01 11:15:36.000000000 +0000 | 6 | --- src/common/locale.cpp.orig 2020-05-31 10:56:36.000000000 +0000 | |
7 | +++ src/common/locale.cpp | 7 | +++ src/common/locale.cpp | |
8 | @@ -292,12 +292,6 @@ get_local_charset() { | 8 | @@ -283,12 +283,6 @@ get_local_charset() { | |
9 | setlocale(LC_CTYPE, ""); | 9 | setlocale(LC_CTYPE, ""); | |
10 | #if defined(COMP_MINGW) || defined(COMP_MSC) | 10 | #if defined(COMP_MINGW) || defined(COMP_MSC) | |
11 | lc_charset = "CP" + to_string(GetACP()); | 11 | lc_charset = fmt::format("CP{0}", GetACP()); | |
12 | -#elif defined(SYS_SOLARIS) | 12 | -#elif defined(SYS_SOLARIS) | |
13 | - int i; | 13 | - int i; | |
14 | - | 14 | - | |
15 | - lc_charset = nl_langinfo(CODESET); | 15 | - lc_charset = nl_langinfo(CODESET); | |
16 | - if (parse_number(lc_charset, i)) | 16 | - if (mtx::string::parse_number(lc_charset, i)) | |
17 | - lc_charset = "ISO"s + lc_charset + "-US"s; | 17 | - lc_charset = "ISO"s + lc_charset + "-US"s; | |
18 | #elif HAVE_NL_LANGINFO | 18 | #elif HAVE_NL_LANGINFO | |
19 | lc_charset = nl_langinfo(CODESET); | 19 | lc_charset = nl_langinfo(CODESET); | |
20 | #elif HAVE_LOCALE_CHARSET | 20 | #elif HAVE_LOCALE_CHARSET |