CVS commit: pkgsrc/multimedia/mkvtoolnix

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun  3 10:53:45 UTC 2024

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile distinfo
        pkgsrc/multimedia/mkvtoolnix/patches: patch-Rakefile
Removed Files:
        pkgsrc/multimedia/mkvtoolnix/patches: patch-src_common_sorting.h

Log Message:
mkvtoolnix: updated to 85.0

Version 85.0 "Shame For You" 2024-06-02

Bug fixes

* fixed compilation of `src/common/sorting.h` with certain compilers due to
  the deprecation & removal of `std::result_of<>` in C++20.
* fixed compilation with the `gtest` library when `gtest` requires additional
  libraries by querying `pkg-config` for the correct flags & libraries to
  build with.
* MKVToolNix GUI: multiplexer: restored the keyboard shortcut for switching to
  the "Attachments" tab (Alt+C for the English interface).
* MKVToolNix GUI: multiplexer: fixed several cases when the keyboard shortcuts
  for copying the first source file's name/the destination file's name to the
  title (Ctrl+F & Ctrl+D) and the one for copying the title to the destination
  file name (Ctrl+T) were not enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile
cvs rdiff -u -r1.1 -r0 \
    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.234 pkgsrc/multimedia/mkvtoolnix/Makefile:1.235
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.234 Wed May 29 16:33:45 2024
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Mon Jun  3 10:53:45 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.234 2024/05/29 16:33:45 adam Exp $
+# $NetBSD: Makefile,v 1.235 2024/06/03 10:53:45 adam Exp $
 
-DISTNAME=      mkvtoolnix-84.0
-PKGREVISION=   1
+DISTNAME=      mkvtoolnix-85.0
 CATEGORIES=    multimedia
 MASTER_SITES=  https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.121 pkgsrc/multimedia/mkvtoolnix/distinfo:1.122
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.121 Tue Apr 30 09:07:29 2024
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Mon Jun  3 10:53:45 2024
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.121 2024/04/30 09:07:29 adam Exp $
+$NetBSD: distinfo,v 1.122 2024/06/03 10:53:45 adam Exp $
 
-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
+BLAKE2s (mkvtoolnix-85.0.tar.xz) = e73e296d9c4b8bf3decf060afcbcf8668b9bd7b2dd21e9e01b7eb38528157a70
+SHA512 (mkvtoolnix-85.0.tar.xz) = 3e0a065d73473322886e8e6d1f00650e912dd61fdb14b39ea733ca9bc180eab98966f310cbed74f31c5326eb52c1e9700d0cf643da0d50e9b401f247c4cdec64
+Size (mkvtoolnix-85.0.tar.xz) = 11326932 bytes
+SHA1 (patch-Rakefile) = 64033bb6ade6ab6b09f0174ff1200555fee8db49
 SHA1 (patch-configure) = 6e3771027ed420db7e70732e92bfd42d89e3aeb2
 SHA1 (patch-src_common_locale.cpp) = 0c76a67c1ba65336e2d98d8e62cfc9624df9d223
-SHA1 (patch-src_common_sorting.h) = 0fa766948cebd556635add2726bdf680fe218055

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile
diff -u pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.7 pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.8
--- pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.7     Sun Aug  1 18:09:38 2021
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile Mon Jun  3 10:53:45 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-Rakefile,v 1.7 2021/08/01 18:09:38 adam Exp $
+$NetBSD: patch-Rakefile,v 1.8 2024/06/03 10:53:45 adam Exp $
 
 Leave pkgsrc to handle security features and optimization.
 
---- Rakefile.orig      2021-07-31 12:27:41.000000000 +0000
+--- Rakefile.orig      2024-06-02 14:08:35.000000000 +0000
 +++ Rakefile
-@@ -132,8 +132,6 @@ def setup_globals
+@@ -143,8 +143,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,8 +13,8 @@ Leave pkgsrc to handle security features
    cflags_common           += " -g3 -DDEBUG"                                              if c?(:USE_DEBUG)
    cflags_common           += " -pg"                                                      if c?(:USE_PROFILING)
    cflags_common           += " -fsanitize=undefined"                                     if c?(:USE_UBSAN)
-@@ -163,7 +161,6 @@ def setup_globals
-   cxxflags                += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)}"
+@@ -174,7 +172,6 @@ def setup_globals
+   cxxflags                += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)} #{c(:GTEST_CFLAGS)}"
  
    ldflags                  = ""
 -  ldflags                 += determine_stack_protector_flags