Index: head/multimedia/mkvtoolnix/Makefile =================================================================== --- head/multimedia/mkvtoolnix/Makefile (revision 465435) +++ head/multimedia/mkvtoolnix/Makefile (revision 465436) @@ -1,72 +1,72 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 20.0.0 +PORTVERSION= 21.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://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 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 BROKEN_sparc64= does not install USES= compiler:c++14-lang iconv localbase pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PO4A=no CONFIGURE_ARGS= --with-boost=${LOCALBASE} \ --with-boost-filesystem=boost_filesystem \ --with-boost-system=boost_system \ --with-boost-regex=boost_regex \ --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook MAKE_ENV= V=1 MAKE_CMD= rake -v MAKEFILE= Rakefile ALL_TARGET= #Empty OPTIONS_DEFINE= FLAC NLS QT5 MANTRANS OPTIONS_DEFAULT= FLAC QT5 OPTIONS_SUB= yes FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_WITH= flac NLS_USES= gettext NLS_CONFIGURE_WITH= gettext QT5_DESC= Build and install GUI application (Qt 5) QT5_USES= desktop-file-utils shared-mime-info QT5_USE= QT5=buildtools_build,concurrent,core,gui,multimedia,network,quick,widgets QT5_CONFIGURE_ENABLE= qt QT5_BUILD_DEPENDS= qmake:devel/qt5-qmake QT5_LIB_DEPENDS= libcmark.so:textproc/cmark MANTRANS_DESC= Build and install manpage translations MANTRANS_BUILD_DEPENDS= po4a:textproc/po4a post-patch: @${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \ ${WRKSRC}/configure post-configure-NLS-off: # https://github.com/mbunkus/mkvtoolnix/issues/1501 # Fixed in 8.6.0 @${REINPLACE_CMD} -e 's|LIBINTL_LIBS =|#LIBINTL_LIBS =|g' ${WRKSRC}/build-config @${REINPLACE_CMD} -e 's|#define HAVE_LIBINTL_H|//#define HAVE_LIBINTL_H|g' ${WRKSRC}/config.h @${REINPLACE_CMD} -e 's|S["LIBINTL_LIBS"]=|#S["LIBINTL_LIBS"]=|g' ${WRKSRC}/config.status .include Index: head/multimedia/mkvtoolnix/distinfo =================================================================== --- head/multimedia/mkvtoolnix/distinfo (revision 465435) +++ head/multimedia/mkvtoolnix/distinfo (revision 465436) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516400368 -SHA256 (mkvtoolnix-20.0.0.tar.xz) = 6f4b86a16af1f979ce2e83e64223b1bb8635ac8f81863d8ce46014a82c8bf500 -SIZE (mkvtoolnix-20.0.0.tar.xz) = 4670268 +TIMESTAMP = 1521806324 +SHA256 (mkvtoolnix-21.0.0.tar.xz) = ad6d1d0ba40b153c155d5b26425e88531b24bb9969bac0341040e48cbb77c391 +SIZE (mkvtoolnix-21.0.0.tar.xz) = 4682788 Index: head/multimedia/mkvtoolnix/files/patch-src_common_json.cpp =================================================================== --- head/multimedia/mkvtoolnix/files/patch-src_common_json.cpp (nonexistent) +++ head/multimedia/mkvtoolnix/files/patch-src_common_json.cpp (revision 465436) @@ -0,0 +1,11 @@ +--- src/common/json.cpp.orig 2018-02-24 09:41:56 UTC ++++ src/common/json.cpp +@@ -96,7 +96,7 @@ strip_comments(nlohmann::json::string_t + } catch (mtx::mm_io::exception &) { + } + +- return std::string{reinterpret_cast(out.get_buffer()), out.getFilePointer()}; ++ return std::string{reinterpret_cast(out.get_buffer()), static_cast(out.getFilePointer())}; + } + + } Property changes on: head/multimedia/mkvtoolnix/files/patch-src_common_json.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/mkvtoolnix/pkg-plist =================================================================== --- head/multimedia/mkvtoolnix/pkg-plist (revision 465435) +++ head/multimedia/mkvtoolnix/pkg-plist (revision 465436) @@ -1,124 +1,123 @@ bin/mkvextract bin/mkvinfo bin/mkvmerge bin/mkvpropedit %%QT5%%bin/mkvtoolnix-gui %%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%%%%QT5%%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%%%%QT5%%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%%%%QT5%%man/es/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%%%%QT5%%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%%%%QT5%%man/ko/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%%%%QT5%%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%%%%QT5%%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%%%%QT5%%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%%%%QT5%%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%%%%QT5%%man/zh_CN/man1/mkvtoolnix-gui.1.gz -%%QT5%%share/applications/org.bunkus.mkvinfo.desktop %%QT5%%share/applications/org.bunkus.mkvtoolnix-gui.desktop %%QT5%%share/icons/hicolor/128x128/apps/mkvextract.png %%QT5%%share/icons/hicolor/128x128/apps/mkvinfo.png %%QT5%%share/icons/hicolor/128x128/apps/mkvmerge.png %%QT5%%share/icons/hicolor/128x128/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/16x16/apps/mkvextract.png %%QT5%%share/icons/hicolor/16x16/apps/mkvinfo.png %%QT5%%share/icons/hicolor/16x16/apps/mkvmerge.png %%QT5%%share/icons/hicolor/16x16/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/24x24/apps/mkvextract.png %%QT5%%share/icons/hicolor/24x24/apps/mkvinfo.png %%QT5%%share/icons/hicolor/24x24/apps/mkvmerge.png %%QT5%%share/icons/hicolor/24x24/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/256x256/apps/mkvextract.png %%QT5%%share/icons/hicolor/256x256/apps/mkvinfo.png %%QT5%%share/icons/hicolor/256x256/apps/mkvmerge.png %%QT5%%share/icons/hicolor/256x256/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/32x32/apps/mkvextract.png %%QT5%%share/icons/hicolor/32x32/apps/mkvinfo.png %%QT5%%share/icons/hicolor/32x32/apps/mkvmerge.png %%QT5%%share/icons/hicolor/32x32/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/48x48/apps/mkvextract.png %%QT5%%share/icons/hicolor/48x48/apps/mkvinfo.png %%QT5%%share/icons/hicolor/48x48/apps/mkvmerge.png %%QT5%%share/icons/hicolor/48x48/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/64x64/apps/mkvextract.png %%QT5%%share/icons/hicolor/64x64/apps/mkvinfo.png %%QT5%%share/icons/hicolor/64x64/apps/mkvmerge.png %%QT5%%share/icons/hicolor/64x64/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/96x96/apps/mkvextract.png %%QT5%%share/icons/hicolor/96x96/apps/mkvinfo.png %%QT5%%share/icons/hicolor/96x96/apps/mkvmerge.png %%QT5%%share/icons/hicolor/96x96/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png %%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_TW/LC_MESSAGES/mkvtoolnix.mo %%QT5%%share/mime/packages/mkvtoolnix.xml %%QT5%%%%DATADIR%%/sounds/finished-1.ogg %%QT5%%%%DATADIR%%/sounds/finished-2.ogg %%QT5%%%%DATADIR%%/sounds/finished-3.ogg