CVS commit: pkgsrc/multimedia/mkvtoolnix

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul 14 07:39:05 UTC 2021

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile distinfo options.mk
        pkgsrc/multimedia/mkvtoolnix/patches: patch-Rakefile

Log Message:
mkvtoolnix: updated to 59.0.0

Version 59.0.0 "Shining Star" 2021-07-10

New features and enhancements

* mkvmerge: WebVTT parser: the parser now follows the specs' rules for parsing
  timestamps more closely by being more lenient: it allows arbitrary number of
  spaces & tabs at the start of the line & around the arrow; it allows any
  number of digits for the hours.
* MKVToolNix GUI: multiplexer: when adding a Blu-ray playlist without scanning
  for other playlists the GUI will now look for disc library information & let
  the user select which one to use if there's more than one entry.
* MKVToolNix GUI: multiplexer: added an option for sorting files & tracks by
  track types when adding them to multiplex settings. The order is: video
  first followed by audio, subtitles and other types. Files & tracks can still
  be reordered manually later. The option is enabled by default & can be found
  in the preferences → "Multiplexer" page → "Adding files" section.
* MKVToolNix GUI: multiplexer: added an option for recognizing file name
  sequences such as `movie.001.mp4`, `movie.002.mp4`, `movie.003.mp4` when
  adding multiple files at once. If a sequence is detected, the only first
  file will be added while the second and following file names will be
  appended to the first one. The option is enabled by default & can be found
  in the preferences → "Multiplexer" page → "Adding files" section.
* MKVToolNix GUI: multiplexer: added small colored boxes for each file & track
  in order to indicate from which file each track is read. The colors used can
  be configured in the preferences → "Multiplexer" page → "File & track
  colors" section.

Bug fixes

* build system: fixed compilation with fmt v8.
* mkvmerge: SRT subtitle reader: characters that aren't valid according to the
  assumed encoding of the file will now be replaced by the Unicode
  "Replacement Character" U+FFFD instead of keeping the invalid characters,
  potentially violating the Matroska specs.
* mkvmerge: WebVTT parser: the parser now accepts timestamps with hours
  larger than 99.
* mkvextract: TTA extraction, only on Windows: fixed removing the temporary
  file created during extraction.
* mkvmerge, mkvpropedit, MKVToolNix GUI's multiplexer & header editor: MIME
  type detection is now done using Qt instead of the `magic` library. The main
  impact is the MIME types of TrueType & OpenType fonts are now detected
  correctly.
* mkvmerge, mkvinfo, MKVToolNix GUI's info tool: only on Windows: displaying
  dates before 1970-01-01 00:00:00 UTC or after 2038-01-19 03:14:08 UTC was
  broken. Note that the header editor was not affected.
* MKVToolNix GUI: only on 64-bit Windows: under certain conditions, the 64-bit
  Windows binaries crashed when opening dialog windows. Even though the
  underlying bug hasn't been identified, the investigation showed that
  building it with newer versions than 10.2.0 of the mingw/gcc cross-compiler
  enabled the crashes, while binaries built with 10.2.0 were fine. This
  affected v57 and v58 which were built with gcc versions 10.3.0 and 11.1.0
  respectively. For the time being I've switched back to building Windows
  binaries with gcc 10.2.0.
* MKVToolNix GUI: multiplexer: when adding files to the multiplexer by running
  the GUI's executable with file names as command line arguments, the source
  directory will be remembered as the "last open directory" again, causing
  subsequent uses of the "open file" dialog to start in the same directory.
* MKVToolNix GUI: multiplexer: the "default track flag" column in the track
  list was missing its icons. Additionally it contained text even for things
  that aren't regular tracks and therefore do not actually have that flag
  (e.g. chapters or tags).
* MKVToolNix GUI: multiplexer: the default for the dialog asking the user what
  to do with dragged & dropped files if they've never seen the dialog is back
  to adding the files to the current multiplex settings instead of "add as
  additional parts" which was an unintentional default.
* MKVToolNix GUI: multiplexer: the "show command line" dialog will now always
  use backward slashes for the "Windows (cmd.exe)" mode and forward slashes
  for the "Linux/Unix shells" mode, regardless of the operating system it's
  currently running on.

Build system changes

* The Qt library is now required for building all applications, even the
  command-line ones, as they use Qt's MIME type detection capabilities. In
  turn this means that you cannot disable the Qt usage anymore; either Qt5 or
  Qt 6 is required.

  You can still chose not to build MKVToolNix GUI, though. A new option has
  been added to `configure` for this purpose: `--disable-gui`.
* The `gmp` library is now required.
* The `magic` library is not used anymore.
* The `PCRE2` & `JPCRE2` libraries are not used anymore. The bundled version
  of `JPCRE2` was removed.
* Boost's "rational" library is not used anymore.
* `configure`: the option `--enable-appimage` has been removed. The location
  of the relevant directories within an AppImage is now detected
  automatically.
* The bundled `fmt` library was updated to v8.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/mkvtoolnix/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile

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

Modified files:

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.177 pkgsrc/multimedia/mkvtoolnix/Makefile:1.178
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.177 Sun Jun 13 18:47:47 2021
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Wed Jul 14 07:39:05 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.177 2021/06/13 18:47:47 adam Exp $
+# $NetBSD: Makefile,v 1.178 2021/07/14 07:39:05 adam Exp $
 
-DISTNAME=      mkvtoolnix-58.0.0
+DISTNAME=      mkvtoolnix-59.0.0
 CATEGORIES=    multimedia
 MASTER_SITES=  https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=  .tar.xz
@@ -27,8 +27,10 @@ GNU_CONFIGURE=               yes
 CONFIGURE_ARGS+=       --disable-optimization
 CONFIGURE_ARGS+=       --disable-precompiled-headers
 CONFIGURE_ARGS+=       --disable-update-check
+CONFIGURE_ARGS+=       --enable-qt5
 CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
 CONFIGURE_ARGS+=       --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook
+CONFIGURE_ARGS+=       --with-qmake=${QTDIR}/bin/qmake
 
 REPLACE_LOCALEDIR_PATTERNS=    build-config.in
 
@@ -54,9 +56,9 @@ do-install:
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libebml+= libebml>=1.4.2
 .include "../../devel/libebml/buildlink3.mk"
-.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=1.6.3
 .include "../../multimedia/libmatroska/buildlink3.mk"
@@ -66,4 +68,5 @@ BUILDLINK_API_DEPENDS.libmatroska+= libm
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/fmtlib/buildlink3.mk"
 .include "../../textproc/pugixml/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.91 pkgsrc/multimedia/mkvtoolnix/distinfo:1.92
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.91  Sun Jun 13 18:47:47 2021
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Wed Jul 14 07:39:05 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.91 2021/06/13 18:47:47 adam Exp $
+$NetBSD: distinfo,v 1.92 2021/07/14 07:39:05 adam Exp $
 
-SHA1 (mkvtoolnix-58.0.0.tar.xz) = 16e2d01b2dd9dcc1e75ebd9b17ac052a47266d4d
-RMD160 (mkvtoolnix-58.0.0.tar.xz) = 3c513bf1851cfa9f439e2739a8027692ad2de6ea
-SHA512 (mkvtoolnix-58.0.0.tar.xz) = 50f2600ce3c4ac697d0f48e1a36627daddaed2989d5c00adb3077e60b31d3548fe82c9acd4c587ef51e62f76cd285c59679f0946988094c56cac321b58bef178
-Size (mkvtoolnix-58.0.0.tar.xz) = 7651964 bytes
-SHA1 (patch-Rakefile) = 94c0a9ae0443f652a87f91cec195fe0d7afb61ac
+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 (patch-src_common_locale.cpp) = 2f3113c8c9171b87a421df447f6c421b1e4dc7e0

Index: pkgsrc/multimedia/mkvtoolnix/options.mk
diff -u pkgsrc/multimedia/mkvtoolnix/options.mk:1.3 pkgsrc/multimedia/mkvtoolnix/options.mk:1.4
--- pkgsrc/multimedia/mkvtoolnix/options.mk:1.3 Sun Sep 17 12:00:41 2017
+++ pkgsrc/multimedia/mkvtoolnix/options.mk     Wed Jul 14 07:39:05 2021
@@ -1,21 +1,16 @@
-# $NetBSD: options.mk,v 1.3 2017/09/17 12:00:41 adam Exp $
+# $NetBSD: options.mk,v 1.4 2021/07/14 07:39:05 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mkvtoolnix
-PKG_SUPPORTED_OPTIONS= qt5
+PKG_SUPPORTED_OPTIONS= gui
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_SRC=             ${PLIST_SRC_DFLT}
 
-.if !empty(PKG_OPTIONS:Mqt5)
+.if !empty(PKG_OPTIONS:Mgui)
 PLIST_SRC+=            PLIST.gui
-CONFIGURE_ARGS+=       --enable-qt
-CONFIGURE_ARGS+=       --with-moc=${QTDIR}/bin/moc
-CONFIGURE_ARGS+=       --with-qmake=${QTDIR}/bin/qmake
-CONFIGURE_ARGS+=       --with-rcc=${QTDIR}/bin/rcc
-CONFIGURE_ARGS+=       --with-uic=${QTDIR}/bin/uic
+CONFIGURE_ARGS+=       --enable-gui
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=       --disable-qt
+CONFIGURE_ARGS+=       --disable-gui
 .endif

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile
diff -u pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.5 pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.6
--- pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.5     Tue Nov  5 18:01:48 2019
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile Wed Jul 14 07:39:05 2021
@@ -1,19 +1,19 @@
-$NetBSD: patch-Rakefile,v 1.5 2019/11/05 18:01:48 adam Exp $
+$NetBSD: patch-Rakefile,v 1.6 2021/07/14 07:39:05 adam Exp $
 
 Leave pkgsrc to handle security features and optimization.
 
---- Rakefile.orig      2019-11-04 20:54:12.000000000 +0000
+--- Rakefile.orig      2021-07-10 10:32:55.000000000 +0000
 +++ Rakefile
-@@ -128,8 +128,6 @@ def setup_globals
-   cflags_common           += " #{c(:WNO_INCONSISTENT_MISSING_OVERRIDE)} #{c(:WNO_POTENTIALLY_EVALUATED_EXPRESSION)}"
+@@ -131,8 +131,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)}\\\""
 -  cflags_common           += determine_stack_protector_flags
 -  cflags_common           += determine_optimization_cflags
    cflags_common           += " -g3 -DDEBUG"                                              if c?(:USE_DEBUG)
    cflags_common           += " -pg"                                                      if c?(:USE_PROFILING)
    cflags_common           += " -fsanitize=undefined"                                     if c?(:USE_UBSAN)
-@@ -160,7 +158,6 @@ def setup_globals
+@@ -162,7 +160,6 @@ def setup_globals
    cxxflags                += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)}"
  
    ldflags                  = ""