Index: head/multimedia/mkvtoolnix/Makefile =================================================================== --- head/multimedia/mkvtoolnix/Makefile (revision 489479) +++ head/multimedia/mkvtoolnix/Makefile (revision 489480) @@ -1,80 +1,79 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 29.0.0 -PORTREVISION= 2 +PORTVERSION= 30.1.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 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 USES= compiler:c++17-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 qt:5 shared-mime-info QT5_USE= QT=buildtools_build,concurrent,core,dbus,declarative,gui,multimedia,network,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 .include .if ${CHOSEN_COMPILER_TYPE} != clang USE_CXXSTD= c++17 .endif 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 489479) +++ head/multimedia/mkvtoolnix/distinfo (revision 489480) @@ -1,3 +1,3 @@ -TIMESTAMP = 1543689447 -SHA256 (mkvtoolnix-29.0.0.tar.xz) = 54eb5f88fe3c9c7b5df77f80b0dfcac7695c19a8226f8ba52be8ad15ba0975d3 -SIZE (mkvtoolnix-29.0.0.tar.xz) = 7051380 +TIMESTAMP = 1546762324 +SHA256 (mkvtoolnix-30.1.0.tar.xz) = 4628f40d62d359edb1441c52381b1f3a61aa227279133d7e01257f91e0d92591 +SIZE (mkvtoolnix-30.1.0.tar.xz) = 7274296 Index: head/multimedia/mkvtoolnix/files/patch-boost-1.69 =================================================================== --- head/multimedia/mkvtoolnix/files/patch-boost-1.69 (revision 489479) +++ head/multimedia/mkvtoolnix/files/patch-boost-1.69 (nonexistent) @@ -1,51 +0,0 @@ -After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails: - -src/common/debugging.h:63:14: fatal error: no viable conversion from returned value of type 'boost::tribool' to function return type 'bool' - return m_requested; - ^~~~~~~~~~~ -src/input/r_matroska.cpp:1685:43: fatal error: no viable conversion from 'boost::logic::tribool' to 'bool' - PTZR(t->ptzr)->set_track_enabled_flag(t->enabled_track); - ^~~~~~~~~~~~~~~~ -src/merge/generic_packetizer.h:199:44: note: passing argument to parameter 'enabled_track' here - virtual void set_track_enabled_flag(bool enabled_track); - ^ -src/output/p_avc_es.cpp:49:41: fatal error: no viable conversion from 'boost::logic::tribool' to 'bool' - m_parser.set_fix_bitstream_frame_rate(m_ti.m_fix_bitstream_frame_rate); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/common/avc_es_parser.h:152:42: note: passing argument to parameter 'fix' here - void set_fix_bitstream_frame_rate(bool fix) { - ^ - ---- src/common/debugging.h.orig 2018-10-20 14:44:02 UTC -+++ src/common/debugging.h -@@ -60,7 +60,7 @@ class debugging_option_c { - if (boost::logic::indeterminate(m_requested)) - m_requested = debugging_c::requested(m_option); - -- return m_requested; -+ return bool{m_requested}; - } - }; - ---- src/input/r_matroska.cpp.orig 2018-10-20 14:44:02 UTC -+++ src/input/r_matroska.cpp -@@ -1682,7 +1682,7 @@ kax_reader_c::set_packetizer_headers(kax_track_t *t) { - PTZR(t->ptzr)->set_track_forced_flag(true); - - if (boost::logic::indeterminate(PTZR(t->ptzr)->m_ti.m_enabled_track)) -- PTZR(t->ptzr)->set_track_enabled_flag(t->enabled_track); -+ PTZR(t->ptzr)->set_track_enabled_flag(bool{t->enabled_track}); - - if ((0 != t->track_uid) && !PTZR(t->ptzr)->set_uid(t->track_uid)) - mxwarn(boost::format(Y("matroska_reader: Could not keep the track UID %1% because it is already allocated for the new file.\n")) % t->track_uid); ---- src/output/p_avc_es.cpp.orig 2018-10-20 14:44:02 UTC -+++ src/output/p_avc_es.cpp -@@ -46,7 +46,7 @@ avc_es_video_packetizer_c(generic_reader_c *p_reader, - set_codec_id(MKV_V_MPEG4_AVC); - - m_parser.set_keep_ar_info(false); -- m_parser.set_fix_bitstream_frame_rate(m_ti.m_fix_bitstream_frame_rate); -+ m_parser.set_fix_bitstream_frame_rate(bool{m_ti.m_fix_bitstream_frame_rate}); - - // If no external timestamp file has been specified then mkvmerge - // might have created a factory due to the --default-duration Property changes on: head/multimedia/mkvtoolnix/files/patch-boost-1.69 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h =================================================================== --- head/multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h (nonexistent) +++ head/multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h (revision 489480) @@ -0,0 +1,24 @@ +--- src/common/mm_mem_io_p.h.orig 2019-01-05 15:10:16 UTC ++++ src/common/mm_mem_io_p.h +@@ -28,8 +28,8 @@ class mm_mem_io_private_c : public mm_io_private_c { ( + explicit mm_mem_io_private_c(unsigned char *p_mem, + uint64_t p_mem_size, + std::size_t p_increase) +- : mem_size{p_mem_size} +- , allocated{p_mem_size} ++ : mem_size{static_cast(p_mem_size)} ++ , allocated{static_cast(p_mem_size)} + , increase{p_increase} + , mem{p_mem} + { +@@ -48,8 +48,8 @@ class mm_mem_io_private_c : public mm_io_private_c { ( + + explicit mm_mem_io_private_c(unsigned char const *p_mem, + uint64_t p_mem_size) +- : mem_size{p_mem_size} +- , allocated{p_mem_size} ++ : mem_size{static_cast(p_mem_size)} ++ , allocated{static_cast(p_mem_size)} + , ro_mem{p_mem} + , read_only{true} + { Property changes on: head/multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h ___________________________________________________________________ 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