CVS commit: pkgsrc/multimedia/mkvtoolnix

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov  1 20:33:31 UTC 2023

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile distinfo options.mk
        pkgsrc/multimedia/mkvtoolnix/patches: patch-configure

Log Message:
mkvtoolnix: updated to 80.0

Version 80.0 "Roundabout" 2023-10-29

New features and enhancements

* MKVToolNix GUI: if the system's locale uses one of the Han scripts, the GUI
  will force Arabic numerals to be used in spin boxes. This prevents Suzhou
  numerals from being used which seems to be the default on Windows systems
  sold in China.

Bug fixes

* build system: fixed detection of Qt6 if `clang` is used for compilation on
  Linux. In that case Qt's `qmake` added a `gcc`-specific option that `clang`
  doesn't understand, `-mno-direct-extern-access`. `configure` will now pass
  the parameter `-spec linux-clang` to `qmake` so that it uses the correct
  compiler flags.
* build system: fixed the use of `mktemp` to be more portable to
  e.g. macOS.
* mkvmerge: if a video aspect ratio was given with `--aspect-ratio-factor`,
  the code would apply a second factor based on the pixel resolution,
  resulting in much too large values for the `DisplayWidth` element. For
  example, with a pixel resolution of 720x520 & an aspect ratio factor of 1/1
  the result should be 720x520, but instead it was 900x520. Up until release
  76.0 this has only happened when a track order was given (which
  unfortunately includes all invocations with MKVToolNix GUI as it always
  includes the track order). Starting with release 77.0 this has always
  happened due to the automatic sorting of tracks implicitly creating a track
  order, even if none was given.


To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.116 -r1.117 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/mkvtoolnix/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/mkvtoolnix/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.223 pkgsrc/multimedia/mkvtoolnix/Makefile:1.224
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.223 Tue Oct 24 22:10:08 2023
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Wed Nov  1 20:33:31 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.223 2023/10/24 22:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.224 2023/11/01 20:33:31 adam Exp $
 
-DISTNAME=      mkvtoolnix-79.0
-PKGREVISION=   1
+DISTNAME=      mkvtoolnix-80.0
 CATEGORIES=    multimedia
 MASTER_SITES=  https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=  .tar.xz
@@ -27,10 +26,11 @@ GNU_CONFIGURE=              yes
 CONFIGURE_ARGS+=       --disable-optimization
 CONFIGURE_ARGS+=       --disable-precompiled-headers
 CONFIGURE_ARGS+=       --disable-update-check
-CONFIGURE_ARGS+=       --enable-qt5
+CONFIGURE_ARGS+=       --enable-qt6
 CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
 CONFIGURE_ARGS+=       --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook
 CONFIGURE_ARGS+=       --with-qmake=${QTDIR}/bin/qmake
+CONFIGURE_ENV+=                QMAKE6=${QTDIR}/bin/qmake6
 
 REPLACE_LOCALEDIR_PATTERNS=    build-config.in
 
@@ -67,9 +67,11 @@ do-install:
 BUILDLINK_API_DEPENDS.libebml+= libebml>=1.4.4
 .include "../../devel/libebml/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=1.7.1
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../textproc/cmark/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
@@ -77,5 +79,4 @@ BUILDLINK_API_DEPENDS.libmatroska+= libm
 .include "../../textproc/nlohmann-json/buildlink3.mk"
 .include "../../textproc/pugixml/buildlink3.mk"
 .include "../../textproc/utf8-cpp/buildlink3.mk"
-.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.116 pkgsrc/multimedia/mkvtoolnix/distinfo:1.117
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.116 Tue Aug 22 20:28:43 2023
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Wed Nov  1 20:33:31 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.116 2023/08/22 20:28:43 adam Exp $
+$NetBSD: distinfo,v 1.117 2023/11/01 20:33:31 adam Exp $
 
-BLAKE2s (mkvtoolnix-79.0.tar.xz) = 33be33e5aeea3498c75ad85e23311d78c9484b0220990475ab326ee10171a77b
-SHA512 (mkvtoolnix-79.0.tar.xz) = ec4d0dc6d7bf9fcc65a6ea464a449b5e4d92c1186ac330b39030e1483f6bf8dc406667c0e7aa495fbb80c689a3a951d3d4885f22cad5d2b178ff1a75828f8e07
-Size (mkvtoolnix-79.0.tar.xz) = 11053136 bytes
+BLAKE2s (mkvtoolnix-80.0.tar.xz) = c28b34ff5a6778cb8840f2feb0c6b2f8c865f3fd53c5a4d038cb4d3b30ad9780
+SHA512 (mkvtoolnix-80.0.tar.xz) = 066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc
+Size (mkvtoolnix-80.0.tar.xz) = 11056764 bytes
 SHA1 (patch-Rakefile) = 08dbf4a4968008ff258a66e71aa2bddc61c04af6
-SHA1 (patch-configure) = 22769c823b9558c86173b26e2c7d621b59d5a357
+SHA1 (patch-configure) = 6e3771027ed420db7e70732e92bfd42d89e3aeb2
 SHA1 (patch-src_common_locale.cpp) = 0c76a67c1ba65336e2d98d8e62cfc9624df9d223

Index: pkgsrc/multimedia/mkvtoolnix/options.mk
diff -u pkgsrc/multimedia/mkvtoolnix/options.mk:1.10 pkgsrc/multimedia/mkvtoolnix/options.mk:1.11
--- pkgsrc/multimedia/mkvtoolnix/options.mk:1.10        Tue Jun  6 12:42:02 2023
+++ pkgsrc/multimedia/mkvtoolnix/options.mk     Wed Nov  1 20:33:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2023/06/06 12:42:02 riastradh Exp $
+# $NetBSD: options.mk,v 1.11 2023/11/01 20:33:31 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mkvtoolnix
 PKG_SUPPORTED_OPTIONS= doc gui
@@ -11,8 +11,8 @@ PLIST_VARS+=  doc gui
 .if !empty(PKG_OPTIONS:Mgui)
 PLIST.gui=             yes
 CONFIGURE_ARGS+=       --enable-gui
+.include "../../devel/qt6-qttools/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-gui
 .endif

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-configure
diff -u pkgsrc/multimedia/mkvtoolnix/patches/patch-configure:1.3 pkgsrc/multimedia/mkvtoolnix/patches/patch-configure:1.4
--- pkgsrc/multimedia/mkvtoolnix/patches/patch-configure:1.3    Wed Nov 23 20:34:30 2022
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-configure        Wed Nov  1 20:33:31 2023
@@ -1,10 +1,40 @@
-$NetBSD: patch-configure,v 1.3 2022/11/23 20:34:30 adam Exp $
+$NetBSD: patch-configure,v 1.4 2023/11/01 20:33:31 adam Exp $
 
+Fix Qt6 detection.
 Fix configuring without po4a.
 
---- configure.orig     2022-11-23 20:15:43.899410199 +0000
+--- configure.orig     2023-10-29 21:08:59.000000000 +0000
 +++ configure
-@@ -11842,7 +11842,7 @@ PO4A_FLAGS="-k $TRANSLATE_PERCENT"
+@@ -9370,9 +9370,9 @@ printf "%s\n" "$qmake6_ver" >&6; }
+ 
+   qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
+ 
+-  QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 's/^DEFINES *= *//'`"
+-  QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[a-z][^ ]*//g' -e 's/ -W[^ ]*//g' -e 's/-std=[^ 
]*//g' -e 's/\$([^)]*)//g'`"
+-  QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *= *//'`"
++  QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *\+=' "$qmake_dir/Makefile" | sed 's/^DEFINES *+= *//'`"
++  QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *\+=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *+= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[a-z][^ ]*//g' -e 's/ -W[^ ]*//g' -e 
's/-std=[^ ]*//g' -e 's/\$([^)]*)//g'`"
++  QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *\+=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *+= *//'`"
+ 
+   # If under MinGW/MSYS2, fix relative include paths
+   if ! test -z "${MINGW_PREFIX}"; then
+@@ -9382,11 +9382,11 @@ printf "%s\n" "$qmake6_ver" >&6; }
+   QT_INCFLAGS="`echo $QT_INCFLAGS | sed -e 's:-I[^/][^ ]*::g'`"
+   QT_CFLAGS="$QT_CFLAGS $QT_INCFLAGS"
+   QT_CFLAGS="`echo $QT_CFLAGS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
+-  QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[^ ]*//g' -e 's/ -f[a-z][^ ]*//g'`"
+-  QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *= *//' -e 's/\$([^)]*)//g' -e 's:-L[^/][^ ]*::g'`"
++  QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *\+=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *+= *//' -e 's/-Wl,-O[^ ]*//g' -e 's/ -f[a-z][^ ]*//g'`"
++  QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *\+=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *+= *//' -e 's/\$([^)]*)//g' -e 's:-L[^/][^ ]*::g'`"
+   QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
+-  QT_LIBS_NON_GUI="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[^ ]*//g' -e 's/ -f[a-z][^ ]*//g'`"
+-  QT_LIBS_NON_GUI="$QT_LIBS_NON_GUI `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LIBS *= *//' -e 's/\$([^)]*)//g' -e 's:-L[^/][^ ]*::g'`"
++  QT_LIBS_NON_GUI="`$ac_cv_path_EGREP '^LFLAGS *\+=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LFLAGS *+= *//' -e 's/-Wl,-O[^ ]*//g' -e 's/ -f[a-z][^ ]*//g'`"
++  QT_LIBS_NON_GUI="$QT_LIBS_NON_GUI `$ac_cv_path_EGREP '^LIBS *\+=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LIBS *+= *//' -e 's/\$([^)]*)//g' -e 's:-L[^/][^ ]*::g'`"
+   QT_LIBS_NON_GUI="`echo $QT_LIBS_NON_GUI | sed -e 's/\$(EXPORT_ARCH_ARGS)//' -e 's/-Wl,-subsystem,windows *//g'`"
+ 
+   rm -rf "$qmake_dir"
+@@ -12386,7 +12386,7 @@ PO4A_FLAGS="-k $TRANSLATE_PERCENT"
  
  
  # Check whether --with-po4a was given.