git: 58ea8f6dc4c6 - main - multimedia/mkvtoolnix: Update to upstream release 67.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Apr 2022 07:21:39 UTC
The branch main has been updated by riggs:
URL: https://cgit.FreeBSD.org/ports/commit/?id=58ea8f6dc4c60281e369bf46f59441a02f671a76
commit 58ea8f6dc4c60281e369bf46f59441a02f671a76
Author: Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2022-04-14 07:20:08 +0000
Commit: Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2022-04-14 07:21:37 +0000
multimedia/mkvtoolnix: Update to upstream release 67.0.0
Details:
- New features, bug fixes and build system fixes, see
https://mkvtoolnix.download/doc/NEWS.md
MFH: 2022Q2
---
multimedia/mkvtoolnix/Makefile | 2 +-
multimedia/mkvtoolnix/distinfo | 6 +--
.../mkvtoolnix/files/patch-rake.d_extensions.rb | 23 ---------
.../files/patch-src_common_fs__sys__helpers.h | 10 ----
.../patch-src_common_fs__sys__helpers_common.cpp | 58 ----------------------
...jobs_program__runner_linux__program__runner.cpp | 33 ------------
...i_jobs_program__runner_linux__program__runner.h | 17 -------
multimedia/mkvtoolnix/pkg-plist | 7 +--
8 files changed, 8 insertions(+), 148 deletions(-)
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index f23f73693cf1..313c068fcf92 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,7 +1,7 @@
# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
PORTNAME= mkvtoolnix
-PORTVERSION= 66.0.0
+PORTVERSION= 67.0.0
CATEGORIES= multimedia audio
MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
https://mkvtoolnix.download/sources/
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 3c488d6ee807..de61a3d0c6d5 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649518643
-SHA256 (mkvtoolnix-66.0.0.tar.xz) = 73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c
-SIZE (mkvtoolnix-66.0.0.tar.xz) = 7752240
+TIMESTAMP = 1649745790
+SHA256 (mkvtoolnix-67.0.0.tar.xz) = db68be91ee8a0b688d924cc00d3bac9349306d54c29ce44a555728c1abb7d3ec
+SIZE (mkvtoolnix-67.0.0.tar.xz) = 7791720
diff --git a/multimedia/mkvtoolnix/files/patch-rake.d_extensions.rb b/multimedia/mkvtoolnix/files/patch-rake.d_extensions.rb
deleted file mode 100644
index ed8b289f3481..000000000000
--- a/multimedia/mkvtoolnix/files/patch-rake.d_extensions.rb
+++ /dev/null
@@ -1,23 +0,0 @@
---- rake.d/extensions.rb.orig 2022-03-13 12:54:56 UTC
-+++ rake.d/extensions.rb
-@@ -62,14 +62,14 @@ class Array
- :windows => %w{linux macos unix x11},
- }
-
-- reject.each do |os, types|
-- next if !$building_for[os]
-+ # Treat other OS (e.g. FreeBSD) the same as Linux wrt. which files to compile
-+ os = $building_for.keys.select { |key| $building_for[key] }.first
-+ types = reject[os || :linux]
-
-- re = '(?:' + types.join('|') + ')'
-- re = %r{(?:/|^)#{re}[_.]}
-+ re = '(?:' + types.join('|') + ')'
-+ re = %r{(?:/|^)#{re}[_.]}
-
-- self.reject! { |f| re.match f }
-- end
-+ self.reject! { |f| re.match f }
-
- return self
- end
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_fs__sys__helpers.h b/multimedia/mkvtoolnix/files/patch-src_common_fs__sys__helpers.h
deleted file mode 100644
index fe414bdeec99..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_common_fs__sys__helpers.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/common/fs_sys_helpers.h.orig 2022-03-13 12:54:56 UTC
-+++ src/common/fs_sys_helpers.h
-@@ -26,6 +26,7 @@ void determine_path_to_current_executable(std::string
- std::filesystem::path get_current_exe_path(std::string const &argv0);
- std::filesystem::path get_application_data_folder();
- std::filesystem::path get_installation_path();
-+std::filesystem::path find_exe_in_path(std::filesystem::path const &exe);
- uint64_t get_memory_usage();
-
- bool is_installed();
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_fs__sys__helpers_common.cpp b/multimedia/mkvtoolnix/files/patch-src_common_fs__sys__helpers_common.cpp
deleted file mode 100644
index e0c80719a6c8..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_common_fs__sys__helpers_common.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/common/fs_sys_helpers/common.cpp.orig 2022-03-13 12:54:56 UTC
-+++ src/common/fs_sys_helpers/common.cpp
-@@ -14,12 +14,36 @@
- #include "common/common_pch.h"
-
- #include "common/fs_sys_helpers.h"
-+#include "common/path.h"
-+#include "common/strings/parsing.h"
-
- namespace mtx::sys {
-
--static std::filesystem::path s_current_executable_path;
-+namespace {
-
-+std::filesystem::path s_current_executable_path;
-+std::unordered_map<std::string, std::filesystem::path> s_exes_in_path;
-+
- std::filesystem::path
-+find_exe_in_path_worker(std::filesystem::path const &exe) {
-+ auto paths = mtx::string::split(get_environment_variable("PATH"), ":");
-+
-+ for (auto const &path : paths) {
-+ auto potential_exe = mtx::fs::to_path(path) / exe;
-+ if (std::filesystem::exists(potential_exe))
-+ return potential_exe;
-+
-+ potential_exe += mtx::fs::to_path(".exe");
-+ if (std::filesystem::exists(potential_exe))
-+ return potential_exe;
-+ }
-+
-+ return {};
-+}
-+
-+} // anonymous
-+
-+std::filesystem::path
- get_installation_path() {
- return s_current_executable_path;
- }
-@@ -27,6 +51,17 @@ get_installation_path() {
- void
- determine_path_to_current_executable(std::string const &argv0) {
- s_current_executable_path = get_current_exe_path(argv0);
-+}
-+
-+std::filesystem::path
-+find_exe_in_path(std::filesystem::path const &exe) {
-+ auto const exe_str = exe.u8string();
-+ auto const itr = s_exes_in_path.find(exe_str);
-+
-+ if (itr == s_exes_in_path.end())
-+ s_exes_in_path[exe_str] = find_exe_in_path_worker(exe);
-+
-+ return s_exes_in_path[exe_str];
- }
-
- }
diff --git a/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_jobs_program__runner_linux__program__runner.cpp b/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_jobs_program__runner_linux__program__runner.cpp
deleted file mode 100644
index e237b325f69a..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_jobs_program__runner_linux__program__runner.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/mkvtoolnix-gui/jobs/program_runner/linux_program_runner.cpp.orig 2022-03-13 12:54:56 UTC
-+++ src/mkvtoolnix-gui/jobs/program_runner/linux_program_runner.cpp
-@@ -1,11 +1,13 @@
- #include "common/common_pch.h"
-
--#if defined(SYS_LINUX)
-+#if !defined(SYS_APPLE) && !defined(SYS_WINDOWS)
-
- #include <QDebug>
- #include <QProcess>
-
-+#include "common/fs_sys_helpers.h"
- #include "common/list_utils.h"
-+#include "common/path.h"
- #include "common/qt.h"
- #include "mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h"
-
-@@ -24,6 +26,9 @@ LinuxProgramRunner::isRunProgramTypeSupported(Util::Se
- if (ProgramRunner::isRunProgramTypeSupported(type))
- return true;
-
-+ if (mtx::sys::find_exe_in_path(mtx::fs::to_path("systemctl")).empty())
-+ return false;
-+
- return mtx::included_in(type, Util::Settings::RunProgramType::ShutDownComputer, Util::Settings::RunProgramType::HibernateComputer, Util::Settings::RunProgramType::SleepComputer);
- }
-
-@@ -57,4 +62,4 @@ LinuxProgramRunner::sleepComputer(Util::Settings::RunP
-
- }
-
--#endif // SYS_LINUX
-+#endif // !SYS_APPLE && !SYS_WINDOWS
diff --git a/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_jobs_program__runner_linux__program__runner.h b/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_jobs_program__runner_linux__program__runner.h
deleted file mode 100644
index a279e0ead1be..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_jobs_program__runner_linux__program__runner.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h.orig 2022-03-13 12:54:56 UTC
-+++ src/mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h
-@@ -2,7 +2,7 @@
-
- #include "common/common_pch.h"
-
--#if defined(SYS_LINUX)
-+#if !defined(SYS_APPLE) && !defined(SYS_WINDOWS)
-
- #include "mkvtoolnix-gui/jobs/program_runner.h"
-
-@@ -28,4 +28,4 @@ class LinuxProgramRunner: public ProgramRunner { (prot
-
- }}
-
--#endif // SYS_LINUX
-+#endif // !SYS_APPLE && !SYS_WINDOWS
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 4391341cb13b..c5823f21f44a 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -142,9 +142,10 @@ man/man1/mkvpropedit.1.gz
%%NLS%%share/locale/tr/LC_MESSAGES/mkvtoolnix.mo
%%NLS%%share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
+%%NLS%%share/locale/zh_SG/LC_MESSAGES/mkvtoolnix.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
%%GUI%%share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
%%GUI%%share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
-%%GUI%%%%DATADIR%%/sounds/finished-1.ogg
-%%GUI%%%%DATADIR%%/sounds/finished-2.ogg
-%%GUI%%%%DATADIR%%/sounds/finished-3.ogg
+%%GUI%%%%DATADIR%%/sounds/finished-1.webm
+%%GUI%%%%DATADIR%%/sounds/finished-2.webm
+%%GUI%%%%DATADIR%%/sounds/finished-3.webm