CVS commit: pkgsrc/multimedia/mkvtoolnix

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May 29 19:51:25 UTC 2023

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: distinfo
Added Files:
        pkgsrc/multimedia/mkvtoolnix/patches: patch-src_common_ac3.cpp
            patch-src_common_codec.h patch-src_merge_cluster__helper.cpp

Log Message:
mkvtoolnix: fix build with fmtlib 10 using upstream patches.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_ac3.cpp \
    pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_codec.h \
    pkgsrc/multimedia/mkvtoolnix/patches/patch-src_merge_cluster__helper.cpp

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/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.112 pkgsrc/multimedia/mkvtoolnix/distinfo:1.113
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.112 Thu May  4 16:44:17 2023
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Mon May 29 19:51:25 2023
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.112 2023/05/04 16:44:17 adam Exp $
+$NetBSD: distinfo,v 1.113 2023/05/29 19:51:25 wiz Exp $
 
 BLAKE2s (mkvtoolnix-76.0.tar.xz) = bf498615dd30aeec4843450a2b8616fa1b9a31448ba77c7b5e7b0397001f6587
 SHA512 (mkvtoolnix-76.0.tar.xz) = 7be054bd5b4772e8744db358b5147d922ab46c723803b718d3eda4871f75ad69953a0a4b73f4678048702c7b711a6f9dc87156b5dc2e4f9dc588667eae03d185
 Size (mkvtoolnix-76.0.tar.xz) = 11021180 bytes
 SHA1 (patch-Rakefile) = 08dbf4a4968008ff258a66e71aa2bddc61c04af6
 SHA1 (patch-configure) = 22769c823b9558c86173b26e2c7d621b59d5a357
+SHA1 (patch-src_common_ac3.cpp) = 8c99bb3ee1e80a58e3540349dccb5ab2594ff05c
+SHA1 (patch-src_common_codec.h) = fa91135f94c963a17e1357cba900254265ac0421
 SHA1 (patch-src_common_locale.cpp) = 2f3113c8c9171b87a421df447f6c421b1e4dc7e0
+SHA1 (patch-src_merge_cluster__helper.cpp) = 8b3f57452331182a3858be6b2e12b72e1ee96308

Added files:

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_ac3.cpp
diff -u /dev/null pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_ac3.cpp:1.1
--- /dev/null   Mon May 29 19:51:25 2023
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_ac3.cpp       Mon May 29 19:51:25 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_common_ac3.cpp,v 1.1 2023/05/29 19:51:25 wiz Exp $
+
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/5a0a3502d496a1a0d0881dd001bcf5888c6f88a9
+
+--- src/common/ac3.cpp.orig    2023-04-30 10:27:25.000000000 +0000
++++ src/common/ac3.cpp
+@@ -381,7 +381,7 @@ frame_c::to_string(bool verbose)
+                             get_effective_channel_layout());
+ 
+   for (auto &frame : m_dependent_frames)
+-    output += fmt::format(" { {0} }", frame.to_string(verbose));
++    output += fmt::format(" {{ {0} }}", frame.to_string(verbose));
+ 
+   return output;
+ }
Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_codec.h
diff -u /dev/null pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_codec.h:1.1
--- /dev/null   Mon May 29 19:51:25 2023
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-src_common_codec.h       Mon May 29 19:51:25 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_common_codec.h,v 1.1 2023/05/29 19:51:25 wiz Exp $
+
+Fix build with fmtlib 10.
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/24716ce95bf5b10d685611de23489045cf2ca5cc
+
+--- src/common/codec.h.orig    2023-04-30 10:27:25.000000000 +0000
++++ src/common/codec.h
+@@ -231,3 +231,7 @@ operator <<(std::ostream &out,
+ 
+   return out;
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<codec_c> : ostream_formatter {};
++#endif  // FMT_VERSION >= 90000
Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-src_merge_cluster__helper.cpp
diff -u /dev/null pkgsrc/multimedia/mkvtoolnix/patches/patch-src_merge_cluster__helper.cpp:1.1
--- /dev/null   Mon May 29 19:51:25 2023
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-src_merge_cluster__helper.cpp    Mon May 29 19:51:25 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_merge_cluster__helper.cpp,v 1.1 2023/05/29 19:51:25 wiz Exp $
+
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/5a0a3502d496a1a0d0881dd001bcf5888c6f88a9
+
+--- src/merge/cluster_helper.cpp.orig  2023-04-30 10:27:25.000000000 +0000
++++ src/merge/cluster_helper.cpp
+@@ -116,8 +116,8 @@ cluster_helper_c::render_before_adding_i
+   timestamp_delay          = (int64_t)(timestamp_delay / g_timestamp_scale);
+ 
+   mxdebug_if(m->debug_packets,
+-             fmt::format("cluster_helper_c::add_packet(): new packet { source {0}/{1} "
+-                         "timestamp: {2} duration: {3} bref: {4} fref: {5} assigned_timestamp: {6} timestamp_delay: {7} }\n",
++             fmt::format("cluster_helper_c::add_packet(): new packet {{ source {0}/{1} "
++                         "timestamp: {2} duration: {3} bref: {4} fref: {5} assigned_timestamp: {6} timestamp_delay: {7} }}\n",
+                          packet->source->m_ti.m_id, packet->source->m_ti.m_fname, packet->timestamp,          packet->duration,
+                          packet->bref,              packet->fref,                 packet->assigned_timestamp, mtx::string::format_timestamp(timestamp_delay)));
+