Update mkvtoolnix to 60.0.0

With mkvtoolnix 59.0.0 the Qt library is required for building all
applications. This means we need Qt5Core for no_x11.

https://www.bunkus.org/blog/2021/07/mkvtoolnix-v59-0-0-released/

Feedack and test by Stefan Hagen

multimedia/mkvtoolnix/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.105 2021/08/21 08:03:29 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.106 2021/09/07 05:58:12 rsadowski Exp $
 
 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@openbsd.org>
 # 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 z
 
 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,39 +57,38 @@ 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/ && \
 	cp linux_program_runner.cpp unix_program_runner.cpp && \

multimedia/mkvtoolnix/distinfo

@@ -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

multimedia/mkvtoolnix/patches/patch-Rakefile

@@ -1,4 +1,4 @@
-$OpenBSD: patch-Rakefile,v 1.7 2021/04/24 05:22:05 rsadowski Exp $
+$OpenBSD: patch-Rakefile,v 1.8 2021/09/07 05:58:12 rsadowski Exp $
 
 `configure' defines LLVM_LLD, that can only be overridden with another path.
 Ensure that the default and working linker is used on all clang archs.
@@ -6,20 +6,22 @@ Ensure that the default and working linker is used on all clang archs.
 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)

multimedia/mkvtoolnix/patches/patch-ac_qt5_m4

@@ -1,20 +1,23 @@
-$OpenBSD: patch-ac_qt5_m4,v 1.8 2020/12/02 06:44:11 rsadowski Exp $
+$OpenBSD: patch-ac_qt5_m4,v 1.9 2021/09/07 05:58:12 rsadowski Exp $
 
 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