Update mkvtoolnix to 60.0.0. With mkvtoolnix 59.0.0 Qt library is required for building all applications. This means we need Qt5Core for no_x11. Are there any votes on this?
"The Qt library is now required for building all applications, even the command-line ones, as they use Qt’s MIME type detection capabilities. In turn this means that you cannot disable the Qt usage anymore; either Qt5 or Qt 6 is required. You can still chose not to build MKVToolNix GUI, though. A new option has been added to configure for this purpose: --disable-gui." https://www.bunkus.org/blog/2021/07/mkvtoolnix-v59-0-0-released/ Feedback, OK? Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v retrieving revision 1.105 diff -u -p -u -p -r1.105 Makefile --- Makefile 21 Aug 2021 08:03:29 -0000 1.105 +++ Makefile 21 Aug 2021 10:43:03 -0000 @@ -2,7 +2,7 @@ COMMENT= create, alter and inspect Matroska files -DISTNAME= mkvtoolnix-57.0.0 +DISTNAME= mkvtoolnix-60.0.0 CATEGORIES= multimedia x11 @@ -13,14 +13,15 @@ MAINTAINER= Rafael Sadowski <rsadowski@o # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} FLAC c dvdread ebml fmt iconv intl -WANTLIB += m magic matroska ogg pcre2-8 pugixml vorbis z +WANTLIB += ${COMPILER_LIBCXX} FLAC Qt5Core c dvdread ebml fmt +WANTLIB += gmp iconv intl m matroska ogg pugixml vorbis MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/ EXTRACT_SUFX= .tar.xz -MODULES= lang/ruby +MODULES= x11/qt5 \ + lang/ruby MODRUBY_RUNDEP= No @@ -36,17 +37,15 @@ BUILD_DEPENDS= devel/boost \ devel/gettext,-tools \ devel/gtest \ textproc/docbook \ - textproc/docbook-xsl \ - x11/qt5/qttools + textproc/docbook-xsl LIB_DEPENDS= audio/flac \ audio/libogg \ audio/libvorbis \ devel/fmt \ devel/gettext,-runtime \ + devel/gmp \ devel/libdvdread \ - devel/libmagic \ - devel/pcre2 \ multimedia/libmatroska>=1.6.2 \ textproc/libebml>=1.4.0 \ textproc/pugixml @@ -58,38 +57,37 @@ AUTOCONF_VERSION= 2.69 CONFIGURE_ARGS= --disable-optimization \ --disable-update-check \ - --with-boost-libdir=${LOCALBASE}/lib \ + --disable-qt6 \ + --with-boost=${LOCALBASE} \ + --with-boost-filesystem=boost_filesystem \ + --with-boost-system=boost_system \ + --with-boost-regex=boost_regex \ --with-docbook-xsl-root=${LOCALBASE}/share/xsl/docbook -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${MODQT5_LIBDIR} + +CONFIGURE_ENV+= LCONVERT="${LOCALBASE}/lib/qt5/bin/lconvert" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" FLAVORS= no_x11 FLAVOR?= .if ${FLAVOR:Mno_x11} -CONFIGURE_ARGS+= --disable-gui +CONFIGURE_ARGS+= --disable-gui .else -MODULES+= x11/qt5 -WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network -WANTLIB += Qt5Widgets cmark +WANTLIB += Qt5Concurrent Qt5DBus Qt5Gui Qt5Multimedia +WANTLIB += Qt5Network Qt5Widgets cmark -LIB_DEPENDS+= x11/qt5/qtmultimedia \ - textproc/cmark +LIB_DEPENDS+= textproc/cmark \ + x11/qt5/qtmultimedia RUN_DEPENDS+= devel/desktop-file-utils \ misc/shared-mime-info \ x11/gtk+3,-guic - -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib -L${MODQT5_LIBDIR} - -CONFIGURE_ENV+= LCONVERT="${LOCALBASE}/lib/qt5/bin/lconvert" .endif - -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" pre-patch: @cd ${WRKSRC}/src/mkvtoolnix-gui/jobs/program_runner/ && \ Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/mkvtoolnix/distinfo,v retrieving revision 1.54 diff -u -p -u -p -r1.54 distinfo --- distinfo 23 May 2021 11:59:42 -0000 1.54 +++ distinfo 21 Aug 2021 10:43:03 -0000 @@ -1,2 +1,2 @@ -SHA256 (mkvtoolnix-57.0.0.tar.xz) = lh0Eh70nPsRfsUIoSlcQwJ2lYlu8aYHog4iZ0T10/Mc= -SIZE (mkvtoolnix-57.0.0.tar.xz) = 7635780 +SHA256 (mkvtoolnix-60.0.0.tar.xz) = oSQ3eQRAWJch582LR2y4Mq3mrZ8XWVM+6P6RvZz6dMQ= +SIZE (mkvtoolnix-60.0.0.tar.xz) = 7657960 Index: patches/patch-Rakefile =================================================================== RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-Rakefile,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-Rakefile --- patches/patch-Rakefile 24 Apr 2021 05:22:05 -0000 1.7 +++ patches/patch-Rakefile 21 Aug 2021 10:43:03 -0000 @@ -6,20 +6,22 @@ Ensure that the default and working link Index: Rakefile --- Rakefile.orig +++ Rakefile -@@ -166,7 +166,6 @@ def setup_globals +@@ -165,7 +165,6 @@ def setup_globals ldflags = "" ldflags += determine_stack_protector_flags ldflags += " -pg" if c?(:USE_PROFILING) -- ldflags += " -fuse-ld=lld" if is_clang? && !c(:LLVM_LLD).empty? +- ldflags += " -fuse-ld=lld" if is_clang? && !c(:LLVM_LLD).empty? && !$building_for[:macos] ldflags += " -Llib/libebml/src -Llib/libmatroska/src" if c?(:EBML_MATROSKA_INTERNAL) ldflags += " -Llib/fmt/src" if c?(:FMT_INTERNAL) ldflags += " #{c(:EXTRA_LDFLAGS)} #{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}" -@@ -1067,8 +1066,6 @@ $common_libs = [ +@@ -1065,10 +1064,8 @@ $common_libs = [ + :intl, :iconv, :fmt, - :pcre2, - :stdcppfs, + :qt_non_gui, + :gmp, - "-lstdc++", ] - $common_libs += [:cmark] if c?(:USE_QT) + $common_libs += [:cmark] if c?(:BUILD_GUI) Index: patches/patch-ac_qt5_m4 =================================================================== RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-ac_qt5_m4,v retrieving revision 1.8 diff -u -p -u -p -r1.8 patch-ac_qt5_m4 --- patches/patch-ac_qt5_m4 2 Dec 2020 06:44:11 -0000 1.8 +++ patches/patch-ac_qt5_m4 21 Aug 2021 10:43:03 -0000 @@ -5,16 +5,19 @@ Workaround for OpenBSD's pkg-config. Index: ac/qt5.m4 --- ac/qt5.m4.orig +++ ac/qt5.m4 -@@ -151,20 +151,18 @@ if test x"$enable_qt" = "xyes" -a \ +@@ -78,21 +78,20 @@ check_qt5() { fi - if test $ok = 1 -a "x$with_qt_pkg_config" = xyes; then + if test "x$with_qt_pkg_config" = xyes; then - with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/ /,/g'`" if test x"$with_qt_pkg_config_modules" != x ; then - with_qt_pkg_config_modules="$with_qt_pkg_config_modules," + with_qt_pkg_config_modules="$with_qt_pkg_config_modules" fi +- orig_with_qt_pkg_config_modules="$with_qt_pkg_config_modules," ++ orig_with_qt_pkg_config_modules="$with_qt_pkg_config_modules" + - with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Core,Qt5Gui,Qt5Widgets,Qt5Multimedia,Qt5Network,Qt5Concurrent" + with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Core,Qt5Gui,Qt5Widgets,Qt5Multimedia,Qt5Network,Qt5Concurrent" @@ -23,19 +26,18 @@ Index: ac/qt5.m4 + with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5WinExtras" fi - PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],,[ok=0]) + PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],[ok=1],[ok=0]) - PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5PlatformSupport"]) -- + PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5PlatformSupport"]) + if test $ok = 0; then - AC_MSG_RESULT(no: not found by pkg-config) - fi -@@ -305,7 +303,7 @@ EOF - unset problem + AC_MSG_CHECKING(for Qt 5) +@@ -111,7 +110,7 @@ check_qt5() { + with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`" + QT_CFLAGS="`$PKG_CONFIG --cflags $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`" + QT_LIBS="`$PKG_CONFIG --libs $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`" +- QT_LIBS_NON_GUI="`$PKG_CONFIG --libs $orig_with_qt_pkg_config_modules,Qt5Core $QT_PKG_CONFIG_STATIC`" ++ QT_LIBS_NON_GUI="`$PKG_CONFIG --libs $orig_with_qt_pkg_config_modules Qt5Core $QT_PKG_CONFIG_STATIC`" fi -- AC_PATH_PROG(LCONVERT, lconvert) -+ AC_PATH_PROG(LCONVERT, lconvert,, $PATH) - - else - echo '*** Not checking for Qt: disabled by user request' + dnl compile test program
