From nobody Thu Apr 14 07:21:39 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 14E9C1B3C789; Thu, 14 Apr 2022 07:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kf9r36Bh7z4nxX; Thu, 14 Apr 2022 07:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649920899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fw4ogIUTvjZBdHgic4cGjRqNP4ksrYMg/jbEQRbPLCc=; b=j3xGYnCQbD45cg0oACp2gOYfOjaa+K8RJ5VcjBd8oVgL1pEcOUGwFB0E36Qw4ZZxdcAtqs wnBvs2GgZSHkMOH8YzQT/YD3Xc9d+GJsktyw1ym6vfAU4T4xw2y8ERwYH2hJbSoeI1m/i4 mPcFXVO0aKcES6GHfefzz/nRFHArgn/3PcevrrIUJIvDotBfOvCAovv+nQsICs61wjzXU4 yq9th48cwi8RN+8jQP++9TzNjtL3GvAeb0xvfDkZykAi0IzIjiwpnpr4gES19c6zJcVjHn aqREGzRGoH92cJQx2ilygSMN3ixpDvwf4rUvqhtjYbrkBwwAZBECM8kLftPrlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 901061C48E; Thu, 14 Apr 2022 07:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23E7LdRu049015; Thu, 14 Apr 2022 07:21:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23E7LdnI049014; Thu, 14 Apr 2022 07:21:39 GMT (envelope-from git) Date: Thu, 14 Apr 2022 07:21:39 GMT Message-Id: <202204140721.23E7LdnI049014@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: 58ea8f6dc4c6 - main - multimedia/mkvtoolnix: Update to upstream release 67.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58ea8f6dc4c60281e369bf46f59441a02f671a76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649920899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fw4ogIUTvjZBdHgic4cGjRqNP4ksrYMg/jbEQRbPLCc=; b=PkAYLRMcOzvMq8p+Hd/ltoAHFxU5j3NWrqBNPMmYQSZhfSnI/9yQZEwLFdITtRtvCslYk8 Y0uco6KwdQ4yYniG7NT9KBRTRbvlg9hOY3LDzsYK36iwikFpoXy3jtV5YKENL6Fpoxzabl 7yh77KQmK6Esa2E+A8gFiQPKMfjTx0tduJWhQ1m04GXFtmeAEEfbJdvj0jl3UxH85m1YjM MRiGZz+KOjr1Xg1kFFXeUzQZOEQhCANSwtKJQg610/O92aow88sngMhmx98RiYwqxqfeQX 5PYPtqdAbT0JYYHZN5cbN9CPLl9f7s8yQdBuG4255kYlvKv7g1hpF9Z+qI3e3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649920899; a=rsa-sha256; cv=none; b=Jehknmz6lUHkHScLqLeRVx3CJ1T9bmaXgbHIQIgdkwAMtgV7WoQjteq8p6ZMxPYgeyauH8 /1mO8DPSmRJYm+k8UD0gxnRMcEctmK7rDNexwkfAUMgwecp53LYECbfBGymuuwyZ2pHPwz Jc7aD22GQGko/hrLKO5OEcvk77YTMVdsT1iYYmp+WhvHXpHB/8do8NbhP0DJqy1lE2jBDY MFd+/krWgTan6j2dxbzsxJO3bxJoGHazTA/Wz/g0n2HBV5Tpi5WEp6r+j9sbM8TOjxQzBX ej+qAW2lFt0hfa+hUqvlRZI0Wo1VA1q3RXtIA7U3QaQBaa03tZD7oJYyGssXzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=58ea8f6dc4c60281e369bf46f59441a02f671a76 commit 58ea8f6dc4c60281e369bf46f59441a02f671a76 Author: Thomas Zander AuthorDate: 2022-04-14 07:20:08 +0000 Commit: Thomas Zander 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 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 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 - #include - -+#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