From c9388864702fdd7b0b56c049eddb41bdb9054dcb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Oct 2022 15:03:33 +0000 Subject: gentoo auto-resync : 30:10:2022 - 15:03:33 --- media-video/mkvtoolnix/Manifest | 1 - .../mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch | 293 --------------------- 2 files changed, 294 deletions(-) delete mode 100644 media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch (limited to 'media-video/mkvtoolnix') diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 73a7f701db2d..56fae94e7426 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,6 +1,5 @@ AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d -AUX mkvtoolnix-68.0.0-fmt-9.patch 11851 BLAKE2B 936383fa62ce4bf2d3a08e62854c3c520a2bff8d56efc59c1ab6e75326f06a6af50e716513ca29e080f4579e2501b64d8a502c1d73c56fe270189676deaaf065 SHA512 7431eea6a3c559a802ce07a19e28588bea0842185748c03be1e9f2e70056465dea07ad7dc77cfbc18d39d046b6cdddd70d0cf24748b3fdae69881bde434cacfb DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1 SHA512 c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41 SHA512 f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b EBUILD mkvtoolnix-69.0.0.ebuild 2939 BLAKE2B b626b90bd71651f79431cc1cd803f57904c48dacc906a7e220474b602adaf5a8108febe262a08bf56e0c960817e6322413fdc70537a7ae77241c32ca07b85059 SHA512 cafe20ffdc9de60647a63dd4a7cb0806a012582f4d864423650603c6fa3b33658936e2c81ce8d3d4a076e55aefe55f1baaab912701e5d9175971d8492a4a20bc diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch deleted file mode 100644 index a0e3c1780db9..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch +++ /dev/null @@ -1,293 +0,0 @@ -https://gitlab.com/mbunkus/mkvtoolnix/-/commit/1e1076e43fe8f38e33246fff3ce8651a93c371d9 -https://bugs.gentoo.org/856700 - -From: Moritz Bunkus -Date: Thu, 7 Jul 2022 13:11:34 +0200 -Subject: [PATCH] fix compilation with fmt v9.0.0 - -Prior to v9 all types that were outputtable via `operator<<` to -`std::ostream` could be formatted. v9 changed that to require explicit -tagging of those types that should work this way. This commit adds -those tags for the types that are currently formatted via fmt. - -Fixes #3366. ---- a/src/common/aac.h -+++ b/src/common/aac.h -@@ -221,3 +221,7 @@ protected: - using parser_cptr = std::shared_ptr; - - } // namespace mtx::aac -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/bcp47.h -+++ b/src/common/bcp47.h -@@ -176,3 +176,8 @@ struct hash { - }; - - } // namespace mtx::bcp47 -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/bluray/track_chapter_names.cpp -+++ b/src/common/bluray/track_chapter_names.cpp -@@ -18,6 +18,7 @@ - #include "common/bluray/track_chapter_names.h" - #include "common/bluray/util.h" - #include "common/debugging.h" -+#include "common/path.h" - #include "common/qt.h" - #include "common/xml/xml.h" - ---- a/src/common/error.h -+++ b/src/common/error.h -@@ -45,3 +45,7 @@ operator <<(std::ostream &out, - } - - } -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/fourcc.h -+++ b/src/common/fourcc.h -@@ -83,3 +83,7 @@ operator <<(std::ostream &out, - out << fourcc.str(); - return out; - } -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/kax_analyzer.h -+++ b/src/common/kax_analyzer.h -@@ -239,3 +239,7 @@ public: - virtual void debug_abort_process(); - }; - using console_kax_analyzer_cptr = std::shared_ptr; -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/math_fwd.h -+++ b/src/common/math_fwd.h -@@ -18,6 +18,11 @@ - using mtx_mp_rational_t = boost::multiprecision::number; - using mtx_mp_int_t = boost::multiprecision::number; - -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 -+ - namespace mtx { - - // This conversion function exists to work around incomplete ---- a/src/common/mm_io_x.h -+++ b/src/common/mm_io_x.h -@@ -155,3 +155,16 @@ operator <<(std::ostream &out, - } - - }} -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter: ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter: ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/opus.h -+++ b/src/common/opus.h -@@ -91,3 +91,9 @@ operator <<(std::ostream &out, - } - - } -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/path.h -+++ b/src/common/path.h -@@ -36,3 +36,7 @@ std::filesystem::path absolute(std::filesystem::path const &p); - void create_directories(std::filesystem::path const &path, std::error_code &error_code); - - } // namespace mtx::fs -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/qt.h -+++ b/src/common/qt.h -@@ -102,3 +102,7 @@ operator <<(std::wostream &out, - out << string.toStdWString(); - return out; - } -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/strings/formatting.h -+++ b/src/common/strings/formatting.h -@@ -129,3 +129,7 @@ operator <<(std::ostream &out, - out << mtx::string::format_timestamp(timestamp); - return out; - } -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter> : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/common/translation.h -+++ b/src/common/translation.h -@@ -80,4 +80,8 @@ operator <<(std::ostream &out, - return out; - } - -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif -+ - void init_locales(std::string locale = ""); ---- a/src/input/r_flac.cpp -+++ b/src/input/r_flac.cpp -@@ -240,7 +240,7 @@ flac_reader_c::handle_picture_metadata(FLAC__StreamMetadata const *metadata) { - mxdebug_if(m_debug, fmt::format("flac_reader: MIME type: {0}\n", attachment->mime_type)); - mxdebug_if(m_debug, fmt::format("flac_reader: data length: {0}\n", picture.data_length)); - mxdebug_if(m_debug, fmt::format("flac_reader: ID: {0}\n", m_attachment_id)); -- mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", attach_mode)); -+ mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", static_cast(attach_mode))); - - if (attachment->mime_type.empty() || attachment->name.empty()) - return; -@@ -276,7 +276,7 @@ flac_reader_c::flac_metadata_cb(const FLAC__StreamMetadata *metadata) { - : metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT" - : metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET" - : "UNDEFINED", -- metadata->type, metadata->length)); -+ static_cast(metadata->type), metadata->length)); - break; - } - } ---- a/src/input/r_flv.h -+++ b/src/input/r_flv.h -@@ -173,3 +173,8 @@ protected: - - unsigned int add_track(char type); - }; -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/input/r_mpeg_ps.h -+++ b/src/input/r_mpeg_ps.h -@@ -244,3 +244,8 @@ private: - void sort_tracks(); - void calculate_global_timestamp_offset(); - }; -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/input/r_ogm_flac.cpp -+++ b/src/input/r_ogm_flac.cpp -@@ -104,7 +104,7 @@ fhe_metadata_cb(const FLAC__StreamDecoder *, - : metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT" - : metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET" - : "UNDEFINED", -- metadata->type, metadata->length)); -+ static_cast(metadata->type), metadata->length)); - break; - } - } ---- a/src/input/r_qtmp4.h -+++ b/src/input/r_qtmp4.h -@@ -590,3 +590,7 @@ protected: - - virtual void process_atom(qt_atom_t const &parent, int level, std::function const &handler); - }; -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/merge/item_selector.h -+++ b/src/merge/item_selector.h -@@ -139,3 +139,7 @@ operator <<(std::ostream &out, - - return out; - } -+ -+#if FMT_VERSION >= 90000 -+template struct fmt::formatter> : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/propedit/attachment_target.cpp -+++ b/src/propedit/attachment_target.cpp -@@ -83,14 +83,14 @@ attachment_target_c::dump_info() - " selector_num_arg: {6}\n" - " selector_string_arg: {7}\n", - m_file_name, -- m_command, -+ static_cast(m_command), - ac_add == m_command ? "add" - : ac_delete == m_command ? "delete" - : ac_replace == m_command ? "replace" - : ac_update == m_command ? "update" - : "unknown", - m_options, -- m_selector_type, -+ static_cast(m_selector_type), - st_id == m_selector_type ? "ID" - : st_uid == m_selector_type ? "UID" - : st_name == m_selector_type ? "name" ---- a/src/propedit/attachment_target.h -+++ b/src/propedit/attachment_target.h -@@ -130,3 +130,7 @@ operator <<(std::ostream &out, - - return out; - } -+ -+#if FMT_VERSION >= 90000 -+template <> struct fmt::formatter : ostream_formatter {}; -+#endif // FMT_VERSION >= 90000 ---- a/src/propedit/tag_target.cpp -+++ b/src/propedit/tag_target.cpp -@@ -104,10 +104,10 @@ tag_target_c::dump_info() - " selection_track_type: {3}\n" - " track_uid: {4}\n" - " file_name: {5}\n", -- static_cast(m_operation_mode), -- static_cast(m_selection_mode), -+ static_cast(m_operation_mode), -+ static_cast(m_selection_mode), - m_selection_param, -- m_selection_track_type, -+ static_cast(m_selection_track_type), - m_track_uid, - m_file_name)); - ---- a/src/propedit/track_target.cpp -+++ b/src/propedit/track_target.cpp -@@ -78,9 +78,9 @@ track_target_c::dump_info() - " selection_track_type: {2}\n" - " track_uid: {3}\n" - " file_name: {4}\n", -- static_cast(m_selection_mode), -+ static_cast(m_selection_mode), - m_selection_param, -- m_selection_track_type, -+ static_cast(m_selection_track_type), - m_track_uid, - m_file_name)); - -GitLab -- cgit v1.2.3