<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/df2b1db7dd14deea5ab1bb403be243317870b6a9">https://github.com/macports/macports-ports/commit/df2b1db7dd14deea5ab1bb403be243317870b6a9</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 df2b1db7dd1 mkvtoolnix: overhaul & update to 83.0
</span>df2b1db7dd1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit df2b1db7dd14deea5ab1bb403be243317870b6a9
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Thu Apr 4 15:03:13 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> mkvtoolnix: overhaul & update to 83.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add myself as maintainer
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62648
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65248
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67391
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68771
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69030
</span>---
multimedia/mkvtoolnix/Portfile | 130 ++++++++++++++---------------------------
1 file changed, 43 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mkvtoolnix/Portfile b/multimedia/mkvtoolnix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58574e5ffc5..f5cac1601ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mkvtoolnix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mkvtoolnix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@
</span> PortSystem 1.0
PortGroup muniversal 1.0
PortGroup boost 1.0
<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;'>@@ -14,8 +15,10 @@ name mkvtoolnix
</span> conflicts mkvtoolnix-devel mkvtoolnix-legacy
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} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} {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;'>@@ -27,56 +30,22 @@ homepage https://mkvtoolnix.download
</span> master_sites ${homepage}/sources/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} ne "darwin" || ${os.major} >= 19} {
</span><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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex ${my_name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${os.major} >= 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # mkvtoolnix 54.0.0 and later do not build on macOS 10.14 or earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (at least not with the versions of libc++ included on those systems) because:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The following features of the C++17 standards are not supported by ccache /opt/local/bin/clang++-mp-9.0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # * file system library (C++17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 53.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5fb3ea63712cbdaf9e61b8fd573ef7e1d9a06540 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8dfd66278c81e6f1df0fd84aad30ce2b4cf7a2ad4336924f01f1879f9d1e4cd6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7567276
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} == 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libc++ on 10.13 supports std::optional but the compilers that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # shipped with 10.13's Xcode incorrectly believed that it didn't.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/llvm/llvm-project/commit/7fb40e1569dd66292b647f4501b85517e9247953
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts clang 8 and later have applied this fix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append clang macports-clang-5.0 macports-clang-6.0 macports-clang-7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # mkvtoolnix 42.0.0 and later do not build on macOS 10.12 or earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (at least not with the versions of libc++ included on those systems) because:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The following features of the C++11/C++14/C++17 standards are not supported by /usr/bin/clang++:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # * std::optional (C++17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 41.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 17b2f3b7d6eb87e9d9d4aac536b66705c18d497f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7cdd6ad9144324162604172b7e96cb13cdbb7913e07c4ad7633344aac20e4103 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7401548
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-mm_text_io.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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;'>-set version_ruby 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_ruby 3.2
</span> set version_ruby_mp [join [split $version_ruby "."] ""]
<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><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;'>@@ -92,21 +61,24 @@ depends_lib port:bzip2 \
</span> port:zlib \
port:pugixml \
port:cmark \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdvdread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${version} 59] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmagic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdvdread \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp \
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+set minosver 10.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${macosx_deployment_target} ${minosver}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} requires macOS ${minosver} to run."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Consider installing mkvtoolnix-legacy instead."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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;'>@@ -121,7 +93,7 @@ compiler.cxx_standard 2017
</span> configure.cxxflags-append -std=c++17
set cxx_stdlibflags {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.cxx}]} {
</span> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,14 +110,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:#ffe0e0;'>- --disable-update-check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${version} 59] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-gui \
</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;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-update-check \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gui \
</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;'>@@ -153,36 +120,25 @@ 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${version} 59] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-qmake=${qt_dir}/bin/qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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:#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> configure.args-append \
<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:#ffe0e0;'>- if {[vercmp ${version} 59] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-gui --enable-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-qt --enable-qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} ne "darwin" || ${os.major} > 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qtgui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset qtgui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "The qtgui variant requires Qt 5.9.0 or later, available on OS X 10.10 and later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +qtgui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${my_name}-(\[0-9.\]+)${extract.suffix}
</span></pre><pre style='margin:0'>
</pre>