<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/021db675593b65c4045ca5247e68f8e817913c16">https://github.com/macports/macports-ports/commit/021db675593b65c4045ca5247e68f8e817913c16</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 021db675593 mkvtoolnix-devel: fix non-GUI build; reconcile with upstream See: https://trac.macports.org/ticket/65618
</span>021db675593 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 021db675593b65c4045ca5247e68f8e817913c16
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Aug 5 12:24:23 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mkvtoolnix-devel: fix non-GUI build; reconcile with upstream
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65618
</span>---
multimedia/mkvtoolnix-devel/Portfile | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 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 0201e6100bd..fb4709682fa 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,6 +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:#e0ffe0;'>+PortGroup qt5 1.0
</span>
# Please keep the mkvtoolnix and mkvtoolnix-devel ports as similar as
# possible.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +31,7 @@ master_sites ${homepage}/sources/
</span> use_xz yes
version 69.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 22a9c968409c18010913f51c63c7d8d6d2e1e261 \
sha256 8bad39de495be6e77346cffb4c334c5195edec1a2d79a27ba01b7a372db180aa \
size 10946800
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,8 +60,13 @@ boost.depends_type \
</span> set version_ruby 2.7
set version_ruby_mp [join [split $version_ruby "."] ""]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmultimedia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:ruby${version_ruby_mp} \
port:docbook-xsl-nons \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:libxslt \
port:po4a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,10 +84,13 @@ depends_lib port:bzip2 \
</span> port:cmark \
port:libdvdread \
port:gmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libfmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libfmt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nlohmann-json
</span>
depends_run port:ruby${version_ruby_mp}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
fs-traverse f ${worksrcpath} {
set t [file tail ${f}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,6 +114,9 @@ build.target default
</span> # disable silent rules
build.args-append V=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 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:#e0ffe0;'>+# 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:#e0ffe0;'>+# 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;'>@@ -113,7 +125,10 @@ 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:#ffe0e0;'>- --disable-qt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-qt6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-qmake=${qt_dir}/bin/qmake \
</span> --disable-update-check
configure.ldflags-append ${cxx_stdlibflags}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,21 +139,15 @@ test.target tests:unit
</span>
variant qtgui description {Build with the qt5 GUI} {
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span>
app.name MKVToolNix
app.executable mkvtoolnix-gui
app.icon ${worksrcpath}/share/icons/256x256/mkvtoolnix-gui.png
depends_build-append port:makeicns
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtmultimedia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-qt \
</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;'>- --with-moc=${qt_dir}/bin/moc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-uic=${qt_dir}/bin/uic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-rcc=${qt_dir}/bin/rcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-gui
</span> }
if {${os.platform} ne "darwin" || ${os.major} > 13} {
</pre><pre style='margin:0'>
</pre>