diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 41fc53342121..ba0bf5d8d902 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,90 +1,90 @@ PORTNAME= mkvtoolnix -PORTVERSION= 83.0 +PORTVERSION= 84.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 WWW= https://www.bunkus.org/videotools/mkvtoolnix/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING 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_system.so:devel/boost-libs \ libpugixml.so:textproc/pugixml \ libmatroska.so:multimedia/libmatroska \ libcmark.so:textproc/cmark \ libgmp.so:math/gmp FLAVORS= qt6 nogui FLAVOR?= ${FLAVORS:[1]} nogui_PKGNAMESUFFIX= -nogui nogui_CONFLICTS_INSTALL=mkvtoolnix qt6_CONFLICTS_INSTALL= mkvtoolnix-nogui USES= ${_USES_${FLAVOR}} USE_GL= ${_USE_GL_${FLAVOR}} USE_QT= ${_USE_QT_${FLAVOR}} GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --with-boost=${LOCALBASE} \ --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook \ ${_CONFIGURE_ARGS_${FLAVOR}} 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} # Flavor handling -_USES_qt6= compiler:c++17-lang desktop-file-utils gl iconv localbase \ +_USES_qt6= compiler:c++20-lang desktop-file-utils gl iconv localbase \ pkgconfig qmake:no_env qt:6 shared-mime-info tar:xz _USE_GL_qt6= gl opengl _USE_QT_qt6= base declarative multimedia svg tools _PLIST_SUB_qt6= GUI= _CONFIGURE_ARGS_nogui= --disable-gui -_USES_nogui= compiler:c++17-lang iconv localbase pkgconfig qmake:no_env \ +_USES_nogui= compiler:c++20-lang iconv localbase pkgconfig qmake:no_env \ qt:6 tar:xz _USE_QT_nogui= base multimedia svg tools:build _PLIST_SUB_nogui= GUI="@comment " PLIST_SUB+= ${_PLIST_SUB_${FLAVOR}} # Options handling OPTIONS_DEFINE= DVDREAD FLAC NLS MANTRANS GUI OPTIONS_DEFAULT= FLAC 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 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 e5623687de67..049ca1d64b33 100644 --- a/multimedia/mkvtoolnix/distinfo +++ b/multimedia/mkvtoolnix/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710455429 -SHA256 (mkvtoolnix-83.0.tar.xz) = 6a8615436406c7fa45bfb2b6270da1bf06ea54cfcd13c3699643833e1d73ecbc -SIZE (mkvtoolnix-83.0.tar.xz) = 11278152 +TIMESTAMP = 1714316078 +SHA256 (mkvtoolnix-84.0.tar.xz) = e9176dea435c3b06b4716fb131d53c8f2621977576ccc4aee8ff9050c0d9ea7a +SIZE (mkvtoolnix-84.0.tar.xz) = 11325260 diff --git a/multimedia/mkvtoolnix/files/patch-configure b/multimedia/mkvtoolnix/files/patch-configure index 7f6ec08da407..8f5fab9c9344 100644 --- a/multimedia/mkvtoolnix/files/patch-configure +++ b/multimedia/mkvtoolnix/files/patch-configure @@ -1,18 +1,17 @@ ---- configure.orig 2021-07-31 12:27:46 UTC +--- configure.orig 2024-04-29 05:34:06 UTC +++ configure -@@ -8969,14 +8969,10 @@ fi +@@ -8723,13 +8723,9 @@ printf "%s\n" "$ac_cv_fmt" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fmt" >&5 printf "%s\n" "$ac_cv_fmt" >&6; } -if test x"$ac_cv_fmt" = xyes; then - FMT_INTERNAL=no -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using the internal version of fmt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using the internal version of fmt" >&5 printf "%s\n" "$as_me: Using the internal version of fmt" >&6;} FMT_INTERNAL=yes - ac_cv_fmt_v8=yes -fi - if test $ac_cv_fmt_v8 = yes; then + diff --git a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h b/multimedia/mkvtoolnix/files/patch-src_common_sorting.h new file mode 100644 index 000000000000..ac924ca25017 --- /dev/null +++ b/multimedia/mkvtoolnix/files/patch-src_common_sorting.h @@ -0,0 +1,11 @@ +--- src/common/sorting.h.orig 2024-04-28 10:37:21 UTC ++++ src/common/sorting.h +@@ -27,7 +27,7 @@ template< typename Titer + + template< typename Titer + , typename Tcriterion_maker +- , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits::value_type) >::type ++ , typename Tcriterion = typename std::invoke_result< Tcriterion_maker, typename std::iterator_traits::value_type >::type + , typename Tcomparator = std::less + > + void diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist index 3e8a0d9ee415..f278e35088c9 100644 --- a/multimedia/mkvtoolnix/pkg-plist +++ b/multimedia/mkvtoolnix/pkg-plist @@ -1,158 +1,159 @@ bin/mkvextract bin/mkvinfo bin/mkvmerge bin/mkvpropedit %%GUI%%bin/mkvtoolnix-gui %%MANTRANS%%share/man/be/man1/mkvextract.1.gz %%MANTRANS%%share/man/be/man1/mkvinfo.1.gz %%MANTRANS%%share/man/be/man1/mkvmerge.1.gz %%MANTRANS%%share/man/be/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/be/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/bg/man1/mkvextract.1.gz %%MANTRANS%%share/man/bg/man1/mkvinfo.1.gz %%MANTRANS%%share/man/bg/man1/mkvmerge.1.gz %%MANTRANS%%share/man/bg/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/bg/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/ca/man1/mkvextract.1.gz %%MANTRANS%%share/man/ca/man1/mkvinfo.1.gz %%MANTRANS%%share/man/ca/man1/mkvmerge.1.gz %%MANTRANS%%share/man/ca/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/ca/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/de/man1/mkvextract.1.gz %%MANTRANS%%share/man/de/man1/mkvinfo.1.gz %%MANTRANS%%share/man/de/man1/mkvmerge.1.gz %%MANTRANS%%share/man/de/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/de/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/es/man1/mkvextract.1.gz %%MANTRANS%%share/man/es/man1/mkvinfo.1.gz %%MANTRANS%%share/man/es/man1/mkvmerge.1.gz %%MANTRANS%%share/man/es/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/es/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/fr/man1/mkvextract.1.gz %%MANTRANS%%share/man/fr/man1/mkvinfo.1.gz %%MANTRANS%%share/man/fr/man1/mkvmerge.1.gz %%MANTRANS%%share/man/fr/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/fr/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/it/man1/mkvextract.1.gz %%MANTRANS%%share/man/it/man1/mkvinfo.1.gz %%MANTRANS%%share/man/it/man1/mkvmerge.1.gz %%MANTRANS%%share/man/it/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/it/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/ja/man1/mkvextract.1.gz %%MANTRANS%%share/man/ja/man1/mkvinfo.1.gz %%MANTRANS%%share/man/ja/man1/mkvmerge.1.gz %%MANTRANS%%share/man/ja/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/ja/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/ko/man1/mkvextract.1.gz %%MANTRANS%%share/man/ko/man1/mkvinfo.1.gz %%MANTRANS%%share/man/ko/man1/mkvmerge.1.gz %%MANTRANS%%share/man/ko/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/ko/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/ru/man1/mkvextract.1.gz %%MANTRANS%%share/man/ru/man1/mkvinfo.1.gz %%MANTRANS%%share/man/ru/man1/mkvmerge.1.gz %%MANTRANS%%share/man/ru/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/ru/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/zh_TW/man1/mkvextract.1.gz %%MANTRANS%%share/man/zh_TW/man1/mkvinfo.1.gz %%MANTRANS%%share/man/zh_TW/man1/mkvmerge.1.gz %%MANTRANS%%share/man/zh_TW/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/zh_TW/man1/mkvtoolnix-gui.1.gz share/man/man1/mkvextract.1.gz share/man/man1/mkvinfo.1.gz share/man/man1/mkvmerge.1.gz share/man/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/nl/man1/mkvextract.1.gz %%MANTRANS%%share/man/nl/man1/mkvinfo.1.gz %%MANTRANS%%share/man/nl/man1/mkvmerge.1.gz %%MANTRANS%%share/man/nl/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/nl/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/pl/man1/mkvextract.1.gz %%MANTRANS%%share/man/pl/man1/mkvinfo.1.gz %%MANTRANS%%share/man/pl/man1/mkvmerge.1.gz %%MANTRANS%%share/man/pl/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/pl/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/uk/man1/mkvextract.1.gz %%MANTRANS%%share/man/uk/man1/mkvinfo.1.gz %%MANTRANS%%share/man/uk/man1/mkvmerge.1.gz %%MANTRANS%%share/man/uk/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/man/uk/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%share/man/zh_CN/man1/mkvextract.1.gz %%MANTRANS%%share/man/zh_CN/man1/mkvinfo.1.gz %%MANTRANS%%share/man/zh_CN/man1/mkvmerge.1.gz %%MANTRANS%%share/man/zh_CN/man1/mkvpropedit.1.gz %%MANTRANS%%%%GUI%%share/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/be/LC_MESSAGES/mkvtoolnix.mo %%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/nb/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%%/qt_resources.rcc %%GUI%%%%DATADIR%%/sounds/finished-1.webm %%GUI%%%%DATADIR%%/sounds/finished-2.webm %%GUI%%%%DATADIR%%/sounds/finished-3.webm