mkvtoolnix: updated to 60.0.0

Version 60.0.0 "Are We Copies?" 2021-07-31

New features and enhancements

* all: IETF BCP 47/RFC 5646 language tags: added support for language families
  from ISO 639-5 that aren't part of 639-2.
* all: IETF BCP 47/RFC 5646 language tags: implemented support for Alpha 2
  country codes of the "user-defined" category: `AA`, `QM`–`QZ`, `XA`–`XZ` and
  `ZZ`.
* all: IETF BCP 47/RFC 5646 language tags: updated the various lists of valid
  subtags from the official specs.
* MKVToolNix GUI: multiplexer: pressing the keyboard shortcut for the track's
  "Language" label (Alt+L for English) will now open the language dialog.
* MKVToolNix GUI: multiplexer: added an option in the preferences for turning
  off the colored boxes indicating which file each track belongs to.

Bug fixes

* all: IETF BCP 47/RFC 5646 language tags: fixed validating extended language
  & variant subtags against their allowed prefixes (e.g. a valid tag with a
  country code as in `de-CH-1996` is recognized as valid while two generally
  known variants that aren't allowed together as in `de-1901-1996` is
  recognized as invalid).
* all: IETF BCP 47/RFC 5646 language tags: when looking up a language for a
  two- or three-letter code, the programs will no longer compare that code
  with language names as that was unintended, ambiguous (e.g. the code "Ga"
  could be interpreted as the 639-2 alpha-2 code for "Irish" or as the name of
  the language called "Ga") and only worked with languages whose name was at
  most three letters long.
* mkvmerge: HEVC/H.265: appending Matroska files with HEVC tracks might lead
  to the loss of the first couple of frames from each of the second and all
  following files.
* mkvmerge, mkvextract: HEVC/H.265 parser: fixed the programs aborting when
  parsing VPS or SPS NALUs with invalid content due to unhandled
  exceptions.
* MKVToolNix GUI: multiplexer: when the option "use legacy MIME types for font
  attachments" is enabled, the GUI will now use `application/x-truetype-font`
  for font collection files.
* MKVToolNix GUI: multiplexer: fixed escaping the `mkvmerge` argument in the
  "Show command-line options" dialog for the "Windows (cmd.exe)" mode.
* MKVToolNix GUI: multiplexer: when adding multiple files at once, the GUI
  will sort file names with numbers the way a human would expect it to. For
  example, `1.mp4`, `9.aac`, `10.srt`, `11.srt` are now sorted exactly that
  order instead of `1.mp4`, `10.srt`, `11.srt`, `9.aac`.
* MKVToolNix GUI: header editor: the header editor will now honor the "use
  legacy MIME types when adding font attachments" setting when adding new
  attachments.

3 files changed, 13 insertions, 14 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index e6f94e1a685..432880a9f41 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.179 2021/07/30 12:27:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.180 2021/08/01 18:09:38 adam Exp $
 
-DISTNAME=	mkvtoolnix-59.0.0
-PKGREVISION=	1
+DISTNAME=	mkvtoolnix-60.0.0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=	.tar.xz
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 689b044913d..c477e118284 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.92 2021/07/14 07:39:05 adam Exp $
+$NetBSD: distinfo,v 1.93 2021/08/01 18:09:38 adam Exp $
 
-SHA1 (mkvtoolnix-59.0.0.tar.xz) = 0a3fe17d2e08ec84cf3943b85149a51d5bc29fba
-RMD160 (mkvtoolnix-59.0.0.tar.xz) = 84523c39f4210cb451407928872e726d14818ea0
-SHA512 (mkvtoolnix-59.0.0.tar.xz) = f49a542fa6d6d9573eb1a2296aff11575c56fb56a32fbd6f1ccc74b3592f6350360d8f8264f1c194569866ad15b7517d6dc42b11da81a6827ba6fc629e7bba57
-Size (mkvtoolnix-59.0.0.tar.xz) = 7643532 bytes
-SHA1 (patch-Rakefile) = 44aa3a62cd6ce2f36c82abe88e202a708dbf9d2c
+SHA1 (mkvtoolnix-60.0.0.tar.xz) = 906b81099cc9af1d5feb44a8ecc7fbd707cc67cb
+RMD160 (mkvtoolnix-60.0.0.tar.xz) = 862469e2e4f3a6aeb34160117a46bc222c399e55
+SHA512 (mkvtoolnix-60.0.0.tar.xz) = 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
+Size (mkvtoolnix-60.0.0.tar.xz) = 7657960 bytes
+SHA1 (patch-Rakefile) = 08dbf4a4968008ff258a66e71aa2bddc61c04af6
 SHA1 (patch-src_common_locale.cpp) = 2f3113c8c9171b87a421df447f6c421b1e4dc7e0
diff --git a/multimedia/mkvtoolnix/patches/patch-Rakefile b/multimedia/mkvtoolnix/patches/patch-Rakefile
index b16d31034dd..af84e101a3c 100644
--- a/multimedia/mkvtoolnix/patches/patch-Rakefile
+++ b/multimedia/mkvtoolnix/patches/patch-Rakefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-Rakefile,v 1.6 2021/07/14 07:39:05 adam Exp $
+$NetBSD: patch-Rakefile,v 1.7 2021/08/01 18:09:38 adam Exp $
 
 Leave pkgsrc to handle security features and optimization.
 
---- Rakefile.orig	2021-07-10 10:32:55.000000000 +0000
+--- Rakefile.orig	2021-07-31 12:27:41.000000000 +0000
 +++ Rakefile
-@@ -131,8 +131,6 @@ def setup_globals
+@@ -132,8 +132,6 @@ def setup_globals
    cflags_common           += " #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64"
    cflags_common           += " -DQT_NO_KEYWORDS"
    cflags_common           += " -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\""
@@ -13,11 +13,11 @@ Leave pkgsrc to handle security features and optimization.
    cflags_common           += " -g3 -DDEBUG"                                              if c?(:USE_DEBUG)
    cflags_common           += " -pg"                                                      if c?(:USE_PROFILING)
    cflags_common           += " -fsanitize=undefined"                                     if c?(:USE_UBSAN)
-@@ -162,7 +160,6 @@ def setup_globals
+@@ -163,7 +161,6 @@ def setup_globals
    cxxflags                += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)}"
  
    ldflags                  = ""
 -  ldflags                 += determine_stack_protector_flags
    ldflags                 += " -pg"                                     if c?(:USE_PROFILING)
-   ldflags                 += " -fuse-ld=lld"                            if is_clang? && !c(:LLVM_LLD).empty?
+   ldflags                 += " -fuse-ld=lld"                            if is_clang? && !c(:LLVM_LLD).empty? && !$building_for[:macos]
    ldflags                 += " -Llib/libebml/src -Llib/libmatroska/src" if c?(:EBML_MATROSKA_INTERNAL)