Update mkvtoolnix to 67.0.0
This commit is contained in:
parent
560657057f
commit
6c92ccab37
@ -1,7 +1,6 @@
|
|||||||
COMMENT= create, alter and inspect Matroska files
|
COMMENT= create, alter and inspect Matroska files
|
||||||
|
|
||||||
DISTNAME= mkvtoolnix-65.0.0
|
DISTNAME= mkvtoolnix-67.0.0
|
||||||
REVISION= 0
|
|
||||||
|
|
||||||
CATEGORIES= multimedia x11
|
CATEGORIES= multimedia x11
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
SHA256 (mkvtoolnix-65.0.0.tar.xz) = Dd3JzBuuJs6qw6GESCxQ5ruK3S1i4G7wi1X58BCLuS4=
|
SHA256 (mkvtoolnix-67.0.0.tar.xz) = 22i+ke6KC2iNkkzADTusk0kwbVTCnORKVVcowau30+w=
|
||||||
SIZE (mkvtoolnix-65.0.0.tar.xz) = 7709588
|
SIZE (mkvtoolnix-67.0.0.tar.xz) = 7791720
|
||||||
|
@ -4,7 +4,7 @@ Ensure that the default and working linker is used on all clang archs.
|
|||||||
Index: Rakefile
|
Index: Rakefile
|
||||||
--- Rakefile.orig
|
--- Rakefile.orig
|
||||||
+++ Rakefile
|
+++ Rakefile
|
||||||
@@ -164,7 +164,6 @@ def setup_globals
|
@@ -167,7 +167,6 @@ def setup_globals
|
||||||
ldflags = ""
|
ldflags = ""
|
||||||
ldflags += determine_stack_protector_flags
|
ldflags += determine_stack_protector_flags
|
||||||
ldflags += " -pg" if c?(:USE_PROFILING)
|
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/libebml/src -Llib/libmatroska/src" if c?(:EBML_MATROSKA_INTERNAL)
|
||||||
ldflags += " -Llib/fmt/src" if c?(:FMT_INTERNAL)
|
ldflags += " -Llib/fmt/src" if c?(:FMT_INTERNAL)
|
||||||
ldflags += " #{c(:EXTRA_LDFLAGS)} #{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}"
|
ldflags += " #{c(:EXTRA_LDFLAGS)} #{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}"
|
||||||
@@ -1063,10 +1062,8 @@ $common_libs = [
|
@@ -1066,10 +1065,8 @@ $common_libs = [
|
||||||
:intl,
|
:intl,
|
||||||
:iconv,
|
:iconv,
|
||||||
:fmt,
|
:fmt,
|
||||||
|
@ -3,7 +3,7 @@ Workaround for OpenBSD's pkg-config.
|
|||||||
Index: ac/qt5.m4
|
Index: ac/qt5.m4
|
||||||
--- ac/qt5.m4.orig
|
--- ac/qt5.m4.orig
|
||||||
+++ ac/qt5.m4
|
+++ ac/qt5.m4
|
||||||
@@ -78,17 +78,16 @@ check_qt5() {
|
@@ -77,17 +77,16 @@ check_qt5() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_qt_pkg_config" = xyes; then
|
if test "x$with_qt_pkg_config" = xyes; then
|
||||||
@ -25,7 +25,7 @@ Index: ac/qt5.m4
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$MINGW" = x1; then
|
if test x"$MINGW" = x1; then
|
||||||
@@ -96,7 +95,7 @@ check_qt5() {
|
@@ -95,7 +94,7 @@ check_qt5() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],[ok=1],[ok=0])
|
PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],[ok=1],[ok=0])
|
||||||
@ -34,7 +34,7 @@ Index: ac/qt5.m4
|
|||||||
|
|
||||||
if test $ok = 0; then
|
if test $ok = 0; then
|
||||||
AC_MSG_CHECKING(for Qt 5)
|
AC_MSG_CHECKING(for Qt 5)
|
||||||
@@ -107,7 +106,7 @@ check_qt5() {
|
@@ -106,7 +105,7 @@ check_qt5() {
|
||||||
if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
|
if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
|
||||||
PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
|
PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
|
||||||
if test x"$dbus_found" = xyes; then
|
if test x"$dbus_found" = xyes; then
|
||||||
@ -43,7 +43,7 @@ Index: ac/qt5.m4
|
|||||||
AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
|
AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -115,7 +114,7 @@ check_qt5() {
|
@@ -114,7 +113,7 @@ check_qt5() {
|
||||||
with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
|
with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
|
||||||
QT_CFLAGS="`$PKG_CONFIG --cflags $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
|
QT_CFLAGS="`$PKG_CONFIG --cflags $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
|
||||||
QT_LIBS="`$PKG_CONFIG --libs $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
|
QT_LIBS="`$PKG_CONFIG --libs $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
|
||||||
|
@ -1,16 +1,9 @@
|
|||||||
Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
|
Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
|
||||||
--- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp.orig
|
--- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp.orig
|
||||||
+++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
|
+++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
|
||||||
@@ -1,26 +1,26 @@
|
@@ -9,20 +9,20 @@
|
||||||
#include "common/common_pch.h"
|
|
||||||
|
|
||||||
-#if defined(SYS_LINUX)
|
|
||||||
+#if defined(SYS_LINUX) || defined(SYS_BSD)
|
|
||||||
|
|
||||||
#include <QDebug>
|
|
||||||
#include <QProcess>
|
|
||||||
|
|
||||||
#include "common/list_utils.h"
|
#include "common/list_utils.h"
|
||||||
|
#include "common/path.h"
|
||||||
#include "common/qt.h"
|
#include "common/qt.h"
|
||||||
-#include "mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h"
|
-#include "mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h"
|
||||||
+#include "mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h"
|
+#include "mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h"
|
||||||
@ -33,7 +26,7 @@ Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
|
|||||||
if (ProgramRunner::isRunProgramTypeSupported(type))
|
if (ProgramRunner::isRunProgramTypeSupported(type))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
@@ -28,8 +28,8 @@ LinuxProgramRunner::isRunProgramTypeSupported(Util::Se
|
@@ -33,8 +33,8 @@ LinuxProgramRunner::isRunProgramTypeSupported(Util::Se
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -44,7 +37,7 @@ Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
|
|||||||
|
|
||||||
auto args = QStringList{} << action;
|
auto args = QStringList{} << action;
|
||||||
auto result = QProcess::execute(Q("systemctl"), args);
|
auto result = QProcess::execute(Q("systemctl"), args);
|
||||||
@@ -37,21 +37,21 @@ LinuxProgramRunner::systemctlAction(QString const &act
|
@@ -42,21 +42,21 @@ LinuxProgramRunner::systemctlAction(QString const &act
|
||||||
if (result == 0)
|
if (result == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1,15 +1,6 @@
|
|||||||
Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
|
Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
|
||||||
--- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h.orig
|
--- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h.orig
|
||||||
+++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
|
+++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
#include "common/common_pch.h"
|
|
||||||
|
|
||||||
-#if defined(SYS_LINUX)
|
|
||||||
+#if defined(SYS_LINUX) || defined(SYS_BSD)
|
|
||||||
|
|
||||||
#include "mkvtoolnix-gui/jobs/program_runner.h"
|
|
||||||
|
|
||||||
@@ -10,12 +10,12 @@ namespace mtx::gui {
|
@@ -10,12 +10,12 @@ namespace mtx::gui {
|
||||||
|
|
||||||
namespace Jobs {
|
namespace Jobs {
|
||||||
|
@ -77,15 +77,18 @@ share/locale/sv/LC_MESSAGES/mkvtoolnix.mo
|
|||||||
share/locale/tr/LC_MESSAGES/mkvtoolnix.mo
|
share/locale/tr/LC_MESSAGES/mkvtoolnix.mo
|
||||||
share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
|
share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
|
||||||
share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
|
share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
|
||||||
|
share/locale/zh_SG/
|
||||||
|
share/locale/zh_SG/LC_MESSAGES/
|
||||||
|
share/locale/zh_SG/LC_MESSAGES/mkvtoolnix.mo
|
||||||
share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
|
share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
|
||||||
share/metainfo/
|
share/metainfo/
|
||||||
share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
|
share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
|
||||||
share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
|
share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
|
||||||
share/mkvtoolnix/
|
share/mkvtoolnix/
|
||||||
share/mkvtoolnix/sounds/
|
share/mkvtoolnix/sounds/
|
||||||
share/mkvtoolnix/sounds/finished-1.ogg
|
share/mkvtoolnix/sounds/finished-1.webm
|
||||||
share/mkvtoolnix/sounds/finished-2.ogg
|
share/mkvtoolnix/sounds/finished-2.webm
|
||||||
share/mkvtoolnix/sounds/finished-3.ogg
|
share/mkvtoolnix/sounds/finished-3.webm
|
||||||
@tag gtk-update-icon-cache %D/share/icons/hicolor
|
@tag gtk-update-icon-cache %D/share/icons/hicolor
|
||||||
@tag update-mime-database
|
@tag update-mime-database
|
||||||
@tag update-desktop-database
|
@tag update-desktop-database
|
||||||
|
Loading…
Reference in New Issue
Block a user