git: 76fff25ccdcb - 2024Q2 - multimedia/mkvtoolnix: Update to upstream release 84.0

The branch 2024Q2 has been updated by riggs:

URL: https://cgit.FreeBSD.org/ports/commit/?id=76fff25ccdcbfef47b6e5aae2761fdab74712c89

commit 76fff25ccdcbfef47b6e5aae2761fdab74712c89
Author:     Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2024-04-30 21:42:14 +0000
Commit:     Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2024-05-01 15:34:24 +0000

    multimedia/mkvtoolnix: Update to upstream release 84.0
    
    Details:
    - New features and bug fixes, see
      https://mkvtoolnix.download/doc/NEWS.md
    - Now requires a c++20 compiler
    
    MFH:            2024Q2
    (cherry picked from commit 8445b7e1721c3021771cae61491d8d71efa6de28)
---
 multimedia/mkvtoolnix/Makefile                         |  6 +++---
 multimedia/mkvtoolnix/distinfo                         |  6 +++---
 multimedia/mkvtoolnix/files/patch-configure            |  7 +++----
 multimedia/mkvtoolnix/files/patch-src_common_sorting.h | 11 +++++++++++
 multimedia/mkvtoolnix/pkg-plist                        |  1 +
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 41fc53342121..ba0bf5d8d902 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mkvtoolnix
-PORTVERSION=	83.0
+PORTVERSION=	84.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
@@ -50,13 +50,13 @@ BINARY_ALIAS=	qmake=${QMAKE} \
 		uic=${UIC}
 
 # Flavor handling
-_USES_qt6=		compiler:c++17-lang desktop-file-utils gl iconv localbase \
+_USES_qt6=		compiler:c++20-lang desktop-file-utils gl iconv localbase \
 			pkgconfig qmake:no_env qt:6 shared-mime-info tar:xz
 _USE_GL_qt6=		gl opengl
 _USE_QT_qt6=		base declarative multimedia svg tools
 _PLIST_SUB_qt6=		GUI=
 _CONFIGURE_ARGS_nogui=	--disable-gui
-_USES_nogui=		compiler:c++17-lang iconv localbase pkgconfig qmake:no_env \
+_USES_nogui=		compiler:c++20-lang iconv localbase pkgconfig qmake:no_env \
 			qt:6 tar:xz
 _USE_QT_nogui=		base multimedia svg tools:build
 _PLIST_SUB_nogui=	GUI="@comment "
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index e5623687de67..049ca1d64b33 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710455429
-SHA256 (mkvtoolnix-83.0.tar.xz) = 6a8615436406c7fa45bfb2b6270da1bf06ea54cfcd13c3699643833e1d73ecbc
-SIZE (mkvtoolnix-83.0.tar.xz) = 11278152
+TIMESTAMP = 1714316078
+SHA256 (mkvtoolnix-84.0.tar.xz) = e9176dea435c3b06b4716fb131d53c8f2621977576ccc4aee8ff9050c0d9ea7a
+SIZE (mkvtoolnix-84.0.tar.xz) = 11325260
diff --git a/multimedia/mkvtoolnix/files/patch-configure b/multimedia/mkvtoolnix/files/patch-configure
index 7f6ec08da407..8f5fab9c9344 100644
--- a/multimedia/mkvtoolnix/files/patch-configure
+++ b/multimedia/mkvtoolnix/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2021-07-31 12:27:46 UTC
+--- configure.orig	2024-04-29 05:34:06 UTC
 +++ configure
-@@ -8969,14 +8969,10 @@ fi
+@@ -8723,13 +8723,9 @@ printf "%s\n" "$ac_cv_fmt" >&6; }
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fmt" >&5
  printf "%s\n" "$ac_cv_fmt" >&6; }
  
@@ -11,8 +11,7 @@
 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using the internal version of fmt" >&5
  printf "%s\n" "$as_me: Using the internal version of fmt" >&6;}
    FMT_INTERNAL=yes
-   ac_cv_fmt_v8=yes
 -fi
  
- if test $ac_cv_fmt_v8 = yes; then
+ 
  
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h b/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
new file mode 100644
index 000000000000..ac924ca25017
--- /dev/null
+++ b/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
@@ -0,0 +1,11 @@
+--- src/common/sorting.h.orig	2024-04-28 10:37:21 UTC
++++ src/common/sorting.h
+@@ -27,7 +27,7 @@ template<  typename Titer
+ 
+ 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 std::invoke_result< Tcriterion_maker, typename std::iterator_traits<Titer>::value_type >::type
+          , typename Tcomparator = std::less<Tcriterion>
+          >
+ void
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 3e8a0d9ee415..f278e35088c9 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -136,6 +136,7 @@ share/man/man1/mkvpropedit.1.gz
 %%NLS%%share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/mkvtoolnix.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/mkvtoolnix.mo