sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (cf4e8a5382017338e6f42cbea2935d0a0156c21e)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (cf4e8a5382017338e6f42cbea2935d0a0156c21e)
- Date: Sat, 1 Feb 2025 11:36:36 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
video/mkvtoolnix/BUILD | 6 -
video/mkvtoolnix/DEPENDS | 16
++-
video/mkvtoolnix/DETAILS | 4
video/mkvtoolnix/HISTORY | 6 +
video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch | 27
------
video/mkvtoolnix/patches/0001-fix-format-strings.patch | 45
----------
6 files changed, 19 insertions(+), 85 deletions(-)
New commits:
commit cf4e8a5382017338e6f42cbea2935d0a0156c21e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
mkvtoolnix 89.0
diff --git a/video/mkvtoolnix/BUILD b/video/mkvtoolnix/BUILD
index abac687..7a654ad 100755
--- a/video/mkvtoolnix/BUILD
+++ b/video/mkvtoolnix/BUILD
@@ -1,9 +1,7 @@
. "$GRIMOIRE"/FUNCTIONS
-# This seems wrong. Don't we have a standard thing for qtbase-dependent
stuff?
if is_depends_enabled $SPELL qt6base; then
- export
PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
-elif is_depends_enabled $SPELL qtbase; then
- export
PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+ export
PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \
+ PATH+=":$QT6DIR/bin"
fi &&
default_build_configure &&
rake
diff --git a/video/mkvtoolnix/DEPENDS b/video/mkvtoolnix/DEPENDS
index 4b07036..4a1f441 100755
--- a/video/mkvtoolnix/DEPENDS
+++ b/video/mkvtoolnix/DEPENDS
@@ -15,13 +15,15 @@ sub_depends boost REGEX &&
sub_depends boost SYSTEM &&
sub_depends boost DATE_TIME &&
-optional_depends qt6base --{en,dis}able-qt6 \
+optional_depends qt6base \
+ --enable-gui \
+ --disable-gui \
"for Qt 6 mvkinfo and mmg gui" &&
-if ! is_depends_enabled "$SPELL" qt6base; then
- optional_depends qtbase --{en,dis}able-qt5 \
- "for Qt 5 mkvinfo and mmg gui"
-fi &&
-optional_depends flac --with{,out}-flac \
+optional_depends flac \
+ --with-flac \
+ --without-flac \
"for FLAC support" &&
-optional_depends GETTEXT --with{,out}-gettext \
+optional_depends GETTEXT \
+ --with-gettext \
+ --without-gettext \
'for gettext support'
diff --git a/video/mkvtoolnix/DETAILS b/video/mkvtoolnix/DETAILS
index 376313e..2599ad3 100755
--- a/video/mkvtoolnix/DETAILS
+++ b/video/mkvtoolnix/DETAILS
@@ -1,11 +1,11 @@
# Watch: https://mkvtoolnix.download/sources/
SPELL=mkvtoolnix
- VERSION=76.0
+ VERSION=89.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://mkvtoolnix.download/sources/$SOURCE
WEB_SITE=http://www.bunkus.org/videotools/mkvtoolnix/
-
SOURCE_HASH=sha512:7be054bd5b4772e8744db358b5147d922ab46c723803b718d3eda4871f75ad69953a0a4b73f4678048702c7b711a6f9dc87156b5dc2e4f9dc588667eae03d185
+
SOURCE_HASH=sha512:5c48647f4d1b9a914647839bb2de1d9c2285862450cd0807fda27bb3e0601ba78d5450f66f82160d3e73cb6dd1fa141bfc7f93b0016bc92ebb20a90a9467dd2a
LICENSE[0]=GPL
ENTERED=20030520
KEYWORDS="video"
diff --git a/video/mkvtoolnix/HISTORY b/video/mkvtoolnix/HISTORY
index 73be1ca..3b6b5f8 100644
--- a/video/mkvtoolnix/HISTORY
+++ b/video/mkvtoolnix/HISTORY
@@ -1,3 +1,9 @@
+2025-02-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 89.0
+ * BUILD, DEPENDS: removed Qt5
+ * patches/0001-fix-compilation-with-fmt-10.0.0.patch,
+ patches/0001-fix-format-strings.patch: removed, no longer needed
+
2023-05-31 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS: updated spell to 76.0
* PRE_BUILD, patches/0001-fix-compilation-with-fmt-10.0.0.patch,
diff --git
a/video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch
b/video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch
deleted file mode 100644
index 2c240ed..0000000
--- a/video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 24716ce95bf5b10d685611de23489045cf2ca5cc Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus <mo AT bunkus.online>
-Date: Sat, 13 May 2023 22:25:34 +0200
-Subject: [PATCH] fix compilation with fmt 10.0.0
-
-Upstream-Status: Backport
-Origin: Upstream
-Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
----
- src/common/codec.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/common/codec.h b/src/common/codec.h
-index f8bc1b4e3..f4a92c322 100644
---- a/src/common/codec.h
-+++ b/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
---
-GitLab
-
diff --git a/video/mkvtoolnix/patches/0001-fix-format-strings.patch
b/video/mkvtoolnix/patches/0001-fix-format-strings.patch
deleted file mode 100644
index d7775c3..0000000
--- a/video/mkvtoolnix/patches/0001-fix-format-strings.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5a0a3502d496a1a0d0881dd001bcf5888c6f88a9 Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus <mo AT bunkus.online>
-Date: Tue, 23 May 2023 14:28:54 +0200
-Subject: [PATCH] fix format strings
-
-Fixes #3548.
-Upstream-Status: Backport
-Origin: Upstream
-Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
----
- src/common/ac3.cpp | 2 +-
- src/merge/cluster_helper.cpp | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/ac3.cpp b/src/common/ac3.cpp
-index c392d2ddd..07de6b463 100644
---- a/src/common/ac3.cpp
-+++ b/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;
- }
-diff --git a/src/merge/cluster_helper.cpp b/src/merge/cluster_helper.cpp
-index e47651c2c..105db4c34 100644
---- a/src/merge/cluster_helper.cpp
-+++ b/src/merge/cluster_helper.cpp
-@@ -115,8 +115,8 @@
cluster_helper_c::render_before_adding_if_necessary(packet_cptr const
&packet) {
- 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)));
-
---
-GitLab
-
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (cf4e8a5382017338e6f42cbea2935d0a0156c21e), Ismael Luceno, 02/01/2025
Archive powered by MHonArc 2.6.24.