CVS commit: pkgsrc/multimedia/mkvtoolnix

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr 30 09:07:29 UTC 2024

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile PLIST distinfo
Added Files:
        pkgsrc/multimedia/mkvtoolnix/patches: patch-src_common_sorting.h

Log Message:
mkvtoolnix: updated to 84.0

Version 84.0 "Sleeper" 2024-04-28

New features and enhancements

* mkvmerge: added a new file-specific option `--regenerate-track-uids`. When
  used for Matroska files, `mkvmerge` will generate new random track UIDs
  instead of keeping existing track UIDs. This is done automatically when a
  Matroska file was created by MakeMKV.
* mkvmerge: MP4 reader: added support for FLAC in MP4.
* MKVToolNix GUI: multiplexer: the "Attachments" tab's title will now include
  the total number of attachments (both from source files & to newly
  attach).
* translations: added a Norwegian Bokmål translation of the programs by Roger
  Knutsen (see `AUTHORS`).

Bug fixes

* configure: when called with `--disable-gui` the build system still ran the
  check for the GUI libraries & failed if they weren't found. This check is
  now skipped when the option is given.
* mkvmerge: several color-related track header properties were parsed into &
  stored as a wrong integer type internally. This could result in wrong values
  being copied when very large values were present in source files, or in
  error messages when very large values were used as command-line parameters.
* MKVToolNix GUI: multiplexer: the keyboard shortcuts from the "modify
  selected tracks" sub-menu didn't work right after opening a file. They only
  started working after opening the "multiplexer" menu.

Build system changes

* Release v8.0.0 of the `fmt` library is now required. If not found, the
  bundled copy will be used.
* A C++20 compatible compiler is now required for several but certainly not
  all C++20 features. g++ v10 & clang++ v10 should suffice.


To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/multimedia/mkvtoolnix/PLIST
cvs rdiff -u -r1.120 -r1.121 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_sorting.h

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.232 pkgsrc/multimedia/mkvtoolnix/Makefile:1.233
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.232 Sat Apr  6 08:06:24 2024
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Tue Apr 30 09:07:29 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.232 2024/04/06 08:06:24 wiz Exp $
+# $NetBSD: Makefile,v 1.233 2024/04/30 09:07:29 adam Exp $
 
-DISTNAME=      mkvtoolnix-83.0
-PKGREVISION=   1
+DISTNAME=      mkvtoolnix-84.0
 CATEGORIES=    multimedia
 MASTER_SITES=  https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/multimedia/mkvtoolnix/PLIST
diff -u pkgsrc/multimedia/mkvtoolnix/PLIST:1.19 pkgsrc/multimedia/mkvtoolnix/PLIST:1.20
--- pkgsrc/multimedia/mkvtoolnix/PLIST:1.19     Mon Mar 11 09:31:46 2024
+++ pkgsrc/multimedia/mkvtoolnix/PLIST  Tue Apr 30 09:07:29 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2024/03/11 09:31:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2024/04/30 09:07:29 adam Exp $
 bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
@@ -137,6 +137,7 @@ share/locale/it/LC_MESSAGES/mkvtoolnix.m
 share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ko/LC_MESSAGES/mkvtoolnix.mo
 share/locale/lt/LC_MESSAGES/mkvtoolnix.mo
+share/locale/nb/LC_MESSAGES/mkvtoolnix.mo
 share/locale/nl/LC_MESSAGES/mkvtoolnix.mo
 share/locale/pl/LC_MESSAGES/mkvtoolnix.mo
 share/locale/pt/LC_MESSAGES/mkvtoolnix.mo

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.120 pkgsrc/multimedia/mkvtoolnix/distinfo:1.121
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.120 Mon Mar 11 09:31:46 2024
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Tue Apr 30 09:07:29 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.120 2024/03/11 09:31:46 adam Exp $
+$NetBSD: distinfo,v 1.121 2024/04/30 09:07:29 adam Exp $
 
-BLAKE2s (mkvtoolnix-83.0.tar.xz) = 2a8afd2c933132183744a0a1f63ce756dd15133c514e45ab10ed23bb66afae37
-SHA512 (mkvtoolnix-83.0.tar.xz) = e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
-Size (mkvtoolnix-83.0.tar.xz) = 11278152 bytes
+BLAKE2s (mkvtoolnix-84.0.tar.xz) = 987cf44a3ed3394688d2f2c44b7066d294da48a9de86841461a371c1e7986b49
+SHA512 (mkvtoolnix-84.0.tar.xz) = 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a
+Size (mkvtoolnix-84.0.tar.xz) = 11325260 bytes
 SHA1 (patch-Rakefile) = 08dbf4a4968008ff258a66e71aa2bddc61c04af6
 SHA1 (patch-configure) = 6e3771027ed420db7e70732e92bfd42d89e3aeb2
 SHA1 (patch-src_common_locale.cpp) = 0c76a67c1ba65336e2d98d8e62cfc9624df9d223
+SHA1 (patch-src_common_sorting.h) = 0fa766948cebd556635add2726bdf680fe218055

Added files:

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_sorting.h
diff -u /dev/null pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_sorting.h:1.1
--- /dev/null   Tue Apr 30 09:07:29 2024
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_sorting.h     Tue Apr 30 09:07:29 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_common_sorting.h,v 1.1 2024/04/30 09:07:29 adam Exp $
+
+Fix build: std::result_of is deprecated in c++17 and removed in c++20.
+https://gitlab.com/mbunkus/mkvtoolnix/-/issues/3695
+
+--- src/common/sorting.h.orig  2024-04-30 06:42:03.310422049 +0000
++++ src/common/sorting.h
+@@ -27,7 +27,7 @@ namespace mtx::sort {
+ 
+ template<  typename Titer
+          , typename Tcriterion_maker
+-         , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
++         , typename Tcriterion = typename boost::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
+          , typename Tcomparator = std::less<Tcriterion>
+          >
+ void