<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/526914201fea86870487cf6f6602ed02ca1223ea">https://github.com/macports/macports-ports/commit/526914201fea86870487cf6f6602ed02ca1223ea</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 526914201fe mkvtoolnix-devel: update to 83.0
</span>526914201fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 526914201fea86870487cf6f6602ed02ca1223ea
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Fri Mar 15 20:50:45 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> mkvtoolnix-devel: update to 83.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69030
</span><span style='display:block; white-space:pre;color:#404040;'> Add myself as maintainer
</span>---
multimedia/mkvtoolnix-devel/Portfile | 47 ++++++++++----------------
multimedia/mkvtoolnix-devel/files/mktemp.patch | 35 -------------------
2 files changed, 18 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mkvtoolnix-devel/Portfile b/multimedia/mkvtoolnix-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e489eaa028..9d2d8924586 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mkvtoolnix-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mkvtoolnix-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup legacysupport 1.1
</span> PortGroup muniversal 1.0
PortGroup boost 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt6 1.0
</span>
# Please keep the mkvtoolnix and mkvtoolnix-devel ports as similar as
# possible.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +17,10 @@ name mkvtoolnix-devel
</span> conflicts mkvtoolnix
set my_name mkvtoolnix
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 83.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ryandesign @ryandesign} {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} {mascguy @mascguy} {i0ntempest @i0ntempest} openmaintainer
</span> license GPL-2+ LGPL-2.1+
description Matroska media files manipulation tools.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,22 +32,13 @@ homepage https://mkvtoolnix.download
</span> master_sites ${homepage}/sources/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 81.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 03c1ad905f5313303fc104b4e19f54353775d564 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 422f2bec88d5d93547df0c3e1399272a6dc4c23050b45d34343bbdd6d55e5ad6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11067288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3ff6d7daae26a8924b292685d5596250fcdc66c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a8615436406c7fa45bfb2b6270da1bf06ea54cfcd13c3699643833e1d73ecbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11278152
</span>
distname ${my_name}-${version}
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enable use of 'macports-libcxx' for macOS 10.14 and earlier, as port uses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# libcxx features normally only available on 10.15 and later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.use_mp_libcxx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # libc++ on 10.13 supports std::optional but the compilers that
# shipped with 10.13's Xcode incorrectly believed that it didn't.
# https://github.com/llvm/llvm-project/commit/7fb40e1569dd66292b647f4501b85517e9247953
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,11 +50,8 @@ compiler.blacklist-append \
</span> set version_ruby 2.7
set version_ruby_mp [join [split $version_ruby "."] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.min_version 5.9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtmultimedia \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt6.depends_lib qtmultimedia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtsvg
</span>
depends_build port:ruby${version_ruby_mp} \
port:docbook-xsl-nons \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,8 +79,6 @@ depends_run port:ruby${version_ruby_mp}
</span>
depends_test port:gtest
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append mktemp.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
fs-traverse f ${worksrcpath} {
set t [file tail ${f}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,6 +91,8 @@ post-patch {
</span>
compiler.cxx_standard 2017
configure.cxxflags-append -std=c++17
<span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.use_mp_libcxx yes
</span>
set cxx_stdlibflags {}
if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,9 +104,6 @@ build.target default
</span> # disable silent rules
build.args-append V=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: QT-related options changed significantly with v59.x and v58.x. And QT now required regardless, even when GUI disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://gitlab.com/mbunkus/mkvtoolnix/-/blob/release-59.0.0/NEWS.md#build-system-changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://gitlab.com/mbunkus/mkvtoolnix/-/blob/release-58.0.0/NEWS.md#build-system-changes
</span> configure.args --mandir=${prefix}/share/man \
--with-boost=[boost::install_area] \
--with-extra-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,11 +112,9 @@ configure.args --mandir=${prefix}/share/man \
</span> --with-docbook-xsl-root=${prefix}/share/xsl/docbook-xsl-nons \
--with-po4a=${prefix}/bin/po4a \
--with-po4a-translate=${prefix}/bin/po4a-translate \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-update-check \
</span> --disable-gui \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-qt6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-qt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-qmake=${qt_dir}/bin/qmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-update-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-qmake6=${qt6.dir}/bin/qmake6
</span>
configure.ldflags-append ${cxx_stdlibflags}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +122,7 @@ test.run yes
</span> test.cmd rake
test.target tests:unit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qtgui description {Build with the qt5 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qtgui description {Build with the qt6 GUI} {
</span> PortGroup app 1.0
app.name MKVToolNix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,6 +133,10 @@ variant qtgui description {Build with the qt5 GUI} {
</span> configure.args-replace \
--disable-gui \
--enable-gui
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-moc=${qt6.dir}/libexec/moc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-uic=${qt6.dir}/libexec/uic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rcc=${qt6.dir}/libexec/rcc
</span> }
default_variants +qtgui
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mkvtoolnix-devel/files/mktemp.patch b/multimedia/mkvtoolnix-devel/files/mktemp.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5b2f7882823..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mkvtoolnix-devel/files/mktemp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-usage: mktemp [-d] [-q] [-t prefix] [-u] template ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mktemp [-d] [-q] [-u] -t prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/mbunkus/mkvtoolnix/-/issues/3608
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-08-20 04:03:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-09-02 01:59:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9219,7 +9219,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f src/mkvtoolnix-gui/static_plugins.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qmake_dir="`mktemp -d`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qmake_dir="`mktemp -d "${TMPDIR-/tmp}/qmake.XXXXXXXX"`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch "$qmake_dir/configure.cpp" "$qmake_dir/configure.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9978,7 +9978,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qmake_properties="`mktemp`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qmake_properties="`mktemp "${TMPDIR-/tmp}/qmake.XXXXXXXX"`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$QMAKE" -query > "$qmake_properties"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10374,7 +10374,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x"$QT_PKG_CONFIG_STATIC" != x; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qmake_dir="`mktemp -d`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qmake_dir="`mktemp -d "${TMPDIR-/tmp}/qmake.XXXXXXXX"`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x"$MINGW" = x1 && check_version 5.10.0 $moc_ver; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTPLUGIN="qwindowsvistastyle"
</span></pre><pre style='margin:0'>
</pre>