diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index f23f73693cf1..313c068fcf92 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,75 +1,75 @@ # 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/ MAINTAINER= riggs@FreeBSD.org COMMENT= Tools to extract from/get info about/create Matroska media streams LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_sparc64= does not install BUILD_DEPENDS= rake:devel/rubygem-rake \ docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ libebml.so:textproc/libebml \ libboost_regex.so:devel/boost-libs \ libpugixml.so:textproc/pugixml \ libmatroska.so:multimedia/libmatroska \ libcmark.so:textproc/cmark \ libgmp.so:math/gmp USES= compiler:c++17-lang iconv localbase pkgconfig qmake:no_env qt:5 tar:xz USE_QT= buildtools_build concurrent core linguisttools_build multimedia GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PO4A=no CONFIGURE_ARGS= --with-boost=${LOCALBASE} \ --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook \ --disable-qt6 MAKE_ENV= V=1 MAKE_CMD= rake -v MAKEFILE= Rakefile ALL_TARGET= #Empty BINARY_ALIAS= qmake=${QMAKE} \ lconvert=${LCONVERT} \ moc=${MOC} \ rcc=${RCC} \ uic=${UIC} OPTIONS_DEFINE= DVDREAD FLAC GUI NLS MANTRANS OPTIONS_DEFAULT= FLAC GUI OPTIONS_SUB= yes DVDREAD_DESC= Support reading DVD chapters via libdvdread DVDREAD_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread DVDREAD_CONFIGURE_WITH= dvdread FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_WITH= flac NLS_USES= gettext NLS_CONFIGURE_WITH= gettext GUI_DESC= Build and install GUI application (Qt 5) GUI_USES= desktop-file-utils shared-mime-info GUI_USE= QT=dbus,declarative,gui,network,widgets MANTRANS_DESC= Build and install manpage translations MANTRANS_BUILD_DEPENDS= po4a:textproc/po4a .include .if ${CHOSEN_COMPILER_TYPE} != clang USE_CXXSTD= c++17 .endif .include 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 @@ -1,150 +1,151 @@ bin/mkvextract bin/mkvinfo bin/mkvmerge bin/mkvpropedit %%GUI%%bin/mkvtoolnix-gui %%MANTRANS%%man/bg/man1/mkvextract.1.gz %%MANTRANS%%man/bg/man1/mkvinfo.1.gz %%MANTRANS%%man/bg/man1/mkvmerge.1.gz %%MANTRANS%%man/bg/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/bg/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/ca/man1/mkvextract.1.gz %%MANTRANS%%man/ca/man1/mkvinfo.1.gz %%MANTRANS%%man/ca/man1/mkvmerge.1.gz %%MANTRANS%%man/ca/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/ca/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/de/man1/mkvextract.1.gz %%MANTRANS%%man/de/man1/mkvinfo.1.gz %%MANTRANS%%man/de/man1/mkvmerge.1.gz %%MANTRANS%%man/de/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/de/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/es/man1/mkvextract.1.gz %%MANTRANS%%man/es/man1/mkvinfo.1.gz %%MANTRANS%%man/es/man1/mkvmerge.1.gz %%MANTRANS%%man/es/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/es/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/fr/man1/mkvextract.1.gz %%MANTRANS%%man/fr/man1/mkvinfo.1.gz %%MANTRANS%%man/fr/man1/mkvmerge.1.gz %%MANTRANS%%man/fr/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/fr/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/it/man1/mkvextract.1.gz %%MANTRANS%%man/it/man1/mkvinfo.1.gz %%MANTRANS%%man/it/man1/mkvmerge.1.gz %%MANTRANS%%man/it/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/it/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/ja/man1/mkvextract.1.gz %%MANTRANS%%man/ja/man1/mkvinfo.1.gz %%MANTRANS%%man/ja/man1/mkvmerge.1.gz %%MANTRANS%%man/ja/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/ja/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/ko/man1/mkvextract.1.gz %%MANTRANS%%man/ko/man1/mkvinfo.1.gz %%MANTRANS%%man/ko/man1/mkvmerge.1.gz %%MANTRANS%%man/ko/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/ko/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/ru/man1/mkvextract.1.gz %%MANTRANS%%man/ru/man1/mkvinfo.1.gz %%MANTRANS%%man/ru/man1/mkvmerge.1.gz %%MANTRANS%%man/ru/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/ru/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/zh_TW/man1/mkvextract.1.gz %%MANTRANS%%man/zh_TW/man1/mkvinfo.1.gz %%MANTRANS%%man/zh_TW/man1/mkvmerge.1.gz %%MANTRANS%%man/zh_TW/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/zh_TW/man1/mkvtoolnix-gui.1.gz man/man1/mkvextract.1.gz man/man1/mkvinfo.1.gz man/man1/mkvmerge.1.gz man/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/nl/man1/mkvextract.1.gz %%MANTRANS%%man/nl/man1/mkvinfo.1.gz %%MANTRANS%%man/nl/man1/mkvmerge.1.gz %%MANTRANS%%man/nl/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/nl/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/pl/man1/mkvextract.1.gz %%MANTRANS%%man/pl/man1/mkvinfo.1.gz %%MANTRANS%%man/pl/man1/mkvmerge.1.gz %%MANTRANS%%man/pl/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/pl/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/uk/man1/mkvextract.1.gz %%MANTRANS%%man/uk/man1/mkvinfo.1.gz %%MANTRANS%%man/uk/man1/mkvmerge.1.gz %%MANTRANS%%man/uk/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/uk/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/zh_CN/man1/mkvextract.1.gz %%MANTRANS%%man/zh_CN/man1/mkvinfo.1.gz %%MANTRANS%%man/zh_CN/man1/mkvmerge.1.gz %%MANTRANS%%man/zh_CN/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%man/zh_CN/man1/mkvtoolnix-gui.1.gz %%GUI%%share/applications/org.bunkus.mkvtoolnix-gui.desktop %%GUI%%share/icons/hicolor/128x128/apps/mkvextract.png %%GUI%%share/icons/hicolor/128x128/apps/mkvinfo.png %%GUI%%share/icons/hicolor/128x128/apps/mkvmerge.png %%GUI%%share/icons/hicolor/128x128/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png %%GUI%%share/icons/hicolor/16x16/apps/mkvextract.png %%GUI%%share/icons/hicolor/16x16/apps/mkvinfo.png %%GUI%%share/icons/hicolor/16x16/apps/mkvmerge.png %%GUI%%share/icons/hicolor/16x16/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png %%GUI%%share/icons/hicolor/24x24/apps/mkvextract.png %%GUI%%share/icons/hicolor/24x24/apps/mkvinfo.png %%GUI%%share/icons/hicolor/24x24/apps/mkvmerge.png %%GUI%%share/icons/hicolor/24x24/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png %%GUI%%share/icons/hicolor/256x256/apps/mkvextract.png %%GUI%%share/icons/hicolor/256x256/apps/mkvinfo.png %%GUI%%share/icons/hicolor/256x256/apps/mkvmerge.png %%GUI%%share/icons/hicolor/256x256/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png %%GUI%%share/icons/hicolor/32x32/apps/mkvextract.png %%GUI%%share/icons/hicolor/32x32/apps/mkvinfo.png %%GUI%%share/icons/hicolor/32x32/apps/mkvmerge.png %%GUI%%share/icons/hicolor/32x32/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png %%GUI%%share/icons/hicolor/48x48/apps/mkvextract.png %%GUI%%share/icons/hicolor/48x48/apps/mkvinfo.png %%GUI%%share/icons/hicolor/48x48/apps/mkvmerge.png %%GUI%%share/icons/hicolor/48x48/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png %%GUI%%share/icons/hicolor/64x64/apps/mkvextract.png %%GUI%%share/icons/hicolor/64x64/apps/mkvinfo.png %%GUI%%share/icons/hicolor/64x64/apps/mkvmerge.png %%GUI%%share/icons/hicolor/64x64/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png %%GUI%%share/icons/hicolor/96x96/apps/mkvextract.png %%GUI%%share/icons/hicolor/96x96/apps/mkvinfo.png %%GUI%%share/icons/hicolor/96x96/apps/mkvmerge.png %%GUI%%share/icons/hicolor/96x96/apps/mkvpropedit.png %%GUI%%share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png %%NLS%%share/locale/bg/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ca/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/cs/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/de/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/es/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/eu/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/fr/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/it/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ja/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ko/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/lt/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/nl/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/pl/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/pt/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ro/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ru/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/sr_RS@latin/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/sv/LC_MESSAGES/mkvtoolnix.mo %%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