Simple updatge mkvtoolnix to 50.0.0. After we updated boost it is
possible and easy to update mkvtoolnix.
Feedback? Tests?
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 Makefile
--- Makefile 18 Apr 2020 14:17:57 -0000 1.95
+++ Makefile 7 Sep 2020 17:51:57 -0000
@@ -2,9 +2,7 @@
COMMENT= create, alter and inspect Matroska files
-# Update depends on a new boost version
-DISTNAME= mkvtoolnix-33.0.0
-REVISION= 2
+DISTNAME= mkvtoolnix-50.0.0
CATEGORIES= multimedia x11
@@ -15,9 +13,9 @@ MAINTAINER = Rafael Sadowski <rsadowski@
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC boost_filesystem-mt boost_regex-mt
-WANTLIB += boost_system-mt c cmark ebml iconv intl m magic matroska
-WANTLIB += ogg pugixml vorbis z
+WANTLIB += ${COMPILER_LIBCXX} FLAC boost_filesystem-mt boost_system-mt
+WANTLIB += c cmark dvdread iconv intl m magic ogg pcre2-8 pugixml
+WANTLIB += vorbis z
MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -41,7 +39,9 @@ LIB_DEPENDS= audio/flac \
audio/libvorbis \
devel/boost \
devel/gettext,-runtime \
+ devel/libdvdread \
devel/libmagic \
+ devel/pcre2 \
multimedia/libmatroska>=1.5.0 \
textproc/cmark \
textproc/libebml>=1.3.7 \
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/distinfo,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 distinfo
--- distinfo 28 Apr 2019 08:29:54 -0000 1.47
+++ distinfo 7 Sep 2020 17:51:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-33.0.0.tar.xz) =
krgrGD0U4dTvHdd50A33A/lzWVxq5gsyyfqpzyHiZ4E=
-SIZE (mkvtoolnix-33.0.0.tar.xz) = 7285816
+SHA256 (mkvtoolnix-50.0.0.tar.xz) =
WKXSwTTkdjhqGzkZE9aNPhxR26cPajPKSznHthwuiCQ=
+SIZE (mkvtoolnix-50.0.0.tar.xz) = 7559852
Index: patches/patch-Rakefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-Rakefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Rakefile
--- patches/patch-Rakefile 18 Apr 2020 14:17:57 -0000 1.3
+++ patches/patch-Rakefile 7 Sep 2020 17:51:57 -0000
@@ -6,11 +6,11 @@ Ensure that the default and working link
Index: Rakefile
--- Rakefile.orig
+++ Rakefile
-@@ -156,7 +156,6 @@ def setup_globals
- cxxflags += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)}
#{c(:USER_CXXFLAGS)}"
-
+@@ -167,7 +167,6 @@ def setup_globals
ldflags = ""
+ ldflags += determine_stack_protector_flags
+ ldflags += " -pg" if
c?(:USE_PROFILING)
- ldflags += " -fuse-ld=lld" if
is_clang? && !c(:LLVM_LLD).empty?
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(:PROFILING_LIBS)}
#{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}"
+ ldflags += " #{c(:EXTRA_LDFLAGS)} #{c(:USER_LDFLAGS)}
#{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}"
Index: patches/patch-ac_qt5_m4
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-ac_qt5_m4,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-ac_qt5_m4
--- patches/patch-ac_qt5_m4 14 Dec 2018 10:00:57 -0000 1.7
+++ patches/patch-ac_qt5_m4 7 Sep 2020 17:51:57 -0000
@@ -30,7 +30,7 @@ Index: ac/qt5.m4
if test $ok = 0; then
AC_MSG_RESULT(no: not found by pkg-config)
fi
-@@ -302,7 +300,7 @@ EOF
+@@ -305,7 +303,7 @@ EOF
unset problem
fi
Index: patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp
===================================================================
RCS file:
/cvs/ports/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_mkvtoolnix-gui_jobs_program_runner_cpp
--- patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp 18 Aug 2018
06:47:58 -0000 1.1
+++ patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp 7 Sep 2020
17:51:57 -0000
@@ -12,7 +12,7 @@ Index: src/mkvtoolnix-gui/jobs/program_r
#elif defined(SYS_WINDOWS)
#include "mkvtoolnix-gui/jobs/program_runner/windows_program_runner.h"
#endif // SYS_WINDOWS
-@@ -158,6 +160,8 @@ ProgramRunner::create() {
+@@ -164,6 +166,8 @@ ProgramRunner::create() {
runner.reset(new LinuxProgramRunner{});
#elif defined(SYS_APPLE)
runner.reset(new MacOSProgramRunner{});
Index:
patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp
===================================================================
RCS file:
/cvs/ports/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp
---
patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp
18 Aug 2018 06:47:58 -0000 1.1
+++
patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp
7 Sep 2020 17:51:57 -0000
@@ -17,7 +17,7 @@ Index: src/mkvtoolnix-gui/jobs/program_r
-#include "mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h"
+#include "mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h"
- namespace mtx { namespace gui { namespace Jobs {
+ namespace mtx::gui::Jobs {
-LinuxProgramRunner::LinuxProgramRunner()
+UnixProgramRunner::UnixProgramRunner()
@@ -35,47 +35,40 @@ Index: src/mkvtoolnix-gui/jobs/program_r
if (ProgramRunner::isRunProgramTypeSupported(type))
return true;
-@@ -28,35 +28,35 @@ LinuxProgramRunner::isRunProgramTypeSupported(Util::Se
+@@ -28,8 +28,8 @@ LinuxProgramRunner::isRunProgramTypeSupported(Util::Se
}
void
--LinuxProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
-- qDebug() << "LinuxProgramRunner::shutDownComputer: about to shut down the
computer via systemctl";
-+UnixProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
-+ qDebug() << "UnixProgramRunner::shutDownComputer: about to shut down the
computer via systemctl";
-
- auto result = QProcess::execute("systemctl poweroff");
-
+-LinuxProgramRunner::systemctlAction(QString const &action) {
+- qDebug() << Q("LinuxProgramRunner::systemctlAction: about to execute
'systemctl %1'").arg(action);
++UnixProgramRunner::systemctlAction(QString const &action) {
++ qDebug() << Q("UnixProgramRunner::systemctlAction: about to execute
'systemctl %1'").arg(action);
+
+ auto args = QStringList{} << action;
+ auto result = QProcess::execute(Q("systemctl"), args);
+@@ -37,21 +37,21 @@ LinuxProgramRunner::systemctlAction(QString const &act
if (result == 0)
return;
-- qDebug() << "LinuxProgramRunner::shutDownComputer: 'systemctl poweroff'
failed:" << result;
-+ qDebug() << "UnixProgramRunner::shutDownComputer: 'systemctl poweroff'
failed:" << result;
+- qDebug() << Q("LinuxProgramRunner::systemctlAction: 'systemctl %1' failed:
%2").arg(action).arg(result);
++ qDebug() << Q("UnixProgramRunner::systemctlAction: 'systemctl %1' failed:
%2").arg(action).arg(result);
}
void
--LinuxProgramRunner::hibernateOrSleepComputer(bool hibernate) {
-+UnixProgramRunner::hibernateOrSleepComputer(bool hibernate) {
- auto action = Q(hibernate ? "hibernate" : "suspend");
-- qDebug() << "LinuxProgramRunner::hibernateOrSleepComputer: about to" <<
action << "the computer via systemctl";
-+ qDebug() << "UnixProgramRunner::hibernateOrSleepComputer: about to" <<
action << "the computer via systemctl";
-
- auto result = QProcess::execute(Q("systemctl %1").arg(action));
-
- if (result != 0)
-- qDebug() << "LinuxProgramRunner::hibernateOrSleepComputer: 'systemctl" <<
action << "' failed:" << result;
-+ qDebug() << "UnixProgramRunner::hibernateOrSleepComputer: 'systemctl" <<
action << "' failed:" << result;
+-LinuxProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
++UnixProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
+ systemctlAction(Q("poweroff"));
}
void
-LinuxProgramRunner::hibernateComputer(Util::Settings::RunProgramConfig &) {
+UnixProgramRunner::hibernateComputer(Util::Settings::RunProgramConfig &) {
- hibernateOrSleepComputer(true);
+ systemctlAction(Q("hibernate"));
}
void
-LinuxProgramRunner::sleepComputer(Util::Settings::RunProgramConfig &) {
+UnixProgramRunner::sleepComputer(Util::Settings::RunProgramConfig &) {
- hibernateOrSleepComputer(false);
+ systemctlAction(Q("suspend"));
}
Index:
patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
===================================================================
RCS file:
/cvs/ports/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2
patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
--- patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
28 Apr 2019 08:29:55 -0000 1.2
+++ patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
7 Sep 2020 17:51:57 -0000
@@ -12,7 +12,7 @@ Index: src/mkvtoolnix-gui/jobs/program_r
#include "mkvtoolnix-gui/jobs/program_runner.h"
-@@ -10,12 +10,12 @@ namespace mtx { namespace gui {
+@@ -10,12 +10,12 @@ namespace mtx::gui {
namespace Jobs {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST
--- pkg/PLIST 18 Aug 2018 06:47:58 -0000 1.16
+++ pkg/PLIST 7 Sep 2020 17:51:57 -0000
@@ -7,6 +7,7 @@
@man man/man1/mkvinfo.1
@man man/man1/mkvmerge.1
@man man/man1/mkvpropedit.1
+share/locale/bg/LC_MESSAGES/mkvtoolnix.mo
share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
share/locale/de/LC_MESSAGES/mkvtoolnix.mo
