Update mkvtoolnix to 99.0

This commit is contained in:
rsadowski
2026-05-25 15:00:59 +00:00
parent 1f31050855
commit 16ea460c7e
4 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-98.0
DISTNAME= mkvtoolnix-99.0
CATEGORIES= multimedia x11
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (mkvtoolnix-98.0.tar.xz) = FgD0p2jt5jVucHhTk/AvNN1U+7X2Yf/m5+i8D0Aim3k=
SIZE (mkvtoolnix-98.0.tar.xz) = 11774440
SHA256 (mkvtoolnix-99.0.tar.xz) = vNmbSbDRjw1zIfu+NrvH0kVtv+cHumrDzj+ea/ysrtY=
SIZE (mkvtoolnix-99.0.tar.xz) = 11786672
+2 -2
View File
@@ -4,7 +4,7 @@ Ensure that the default and working linker is used on all clang archs.
Index: Rakefile
--- Rakefile.orig
+++ Rakefile
@@ -180,7 +180,6 @@ def setup_globals
@@ -182,7 +182,6 @@ def setup_globals
ldflags = ""
ldflags += determine_stack_protector_flags
ldflags += " -pg" if c?(:USE_PROFILING)
@@ -12,7 +12,7 @@ Index: Rakefile
ldflags += " -Llib/libebml/src -Llib/libmatroska/src" if c?(:EBML_MATROSKA_INTERNAL)
ldflags += " -Llib/fmt/src" if c?(:FMT_INTERNAL)
ldflags += " #{c(:EXTRA_LDFLAGS)} #{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}"
@@ -1122,10 +1121,8 @@ $common_libs = [
@@ -1128,10 +1127,8 @@ $common_libs = [
:intl,
:iconv,
:fmt,
@@ -31,36 +31,36 @@ Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
void
-LinuxProgramRunner::systemctlAction(QString const &action) {
- qDebug() << Q("LinuxProgramRunner::systemctlAction: about to execute 'systemctl %1'").arg(action);
- qDebug() << u"LinuxProgramRunner::systemctlAction: about to execute 'systemctl %1'"_s.arg(action);
+UnixProgramRunner::systemctlAction(QString const &action) {
+ qDebug() << Q("UnixProgramRunner::systemctlAction: about to execute 'systemctl %1'").arg(action);
+ qDebug() << u"UnixProgramRunner::systemctlAction: about to execute 'systemctl %1'"_s.arg(action);
auto args = QStringList{} << action;
auto result = QProcess::execute(Q("systemctl"), args);
auto result = QProcess::execute(u"systemctl"_s, args);
@@ -56,26 +56,26 @@ LinuxProgramRunner::systemctlAction(QString const &act
if (result == 0)
return;
- qDebug() << Q("LinuxProgramRunner::systemctlAction: 'systemctl %1' failed: %2").arg(action).arg(result);
+ qDebug() << Q("UnixProgramRunner::systemctlAction: 'systemctl %1' failed: %2").arg(action).arg(result);
- qDebug() << u"LinuxProgramRunner::systemctlAction: 'systemctl %1' failed: %2"_s.arg(action).arg(result);
+ qDebug() << u"UnixProgramRunner::systemctlAction: 'systemctl %1' failed: %2"_s.arg(action).arg(result);
}
void
-LinuxProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
+UnixProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
systemctlAction(Q("poweroff"));
systemctlAction(u"poweroff"_s);
}
void
-LinuxProgramRunner::hibernateComputer(Util::Settings::RunProgramConfig &) {
+UnixProgramRunner::hibernateComputer(Util::Settings::RunProgramConfig &) {
systemctlAction(Q("hibernate"));
systemctlAction(u"hibernate"_s);
}
void
-LinuxProgramRunner::sleepComputer(Util::Settings::RunProgramConfig &) {
+UnixProgramRunner::sleepComputer(Util::Settings::RunProgramConfig &) {
systemctlAction(Q("suspend"));
systemctlAction(u"suspend"_s);
}
void
@@ -70,8 +70,8 @@ Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
#if defined(HAVE_QTDBUS)
QString message;
@@ -102,12 +102,12 @@ LinuxProgramRunner::showDesktopNotification([[maybe_un
hints[Q("desktop-entry")] = Q("org.bunkus.mkvtoolnix-gui");
hints[Q("urgency")] = 0u; // low
hints[u"desktop-entry"_s] = u"org.bunkus.mkvtoolnix-gui"_s;
hints[u"urgency"_s] = 0u; // low
- qDebug() << "LinuxProgramRunner::showDesktopNotification: about to notify; message & hints:" << message << hints;
+ qDebug() << "UnixProgramRunner::showDesktopNotification: about to notify; message & hints:" << message << hints;