<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a5b17acfb54808dc1d16e7d8a32e7f7d8c686b5a">https://github.com/macports/macports-ports/commit/a5b17acfb54808dc1d16e7d8a32e7f7d8c686b5a</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 a5b17acfb54 welle.io: upgrade to 2.4
</span>a5b17acfb54 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a5b17acfb54808dc1d16e7d8a32e7f7d8c686b5a
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Wed Oct 19 09:20:14 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> welle.io: upgrade to 2.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also:
</span><span style='display:block; white-space:pre;color:#404040;'> - update welle.io-devel to use qt6
</span><span style='display:block; white-space:pre;color:#404040;'> - add a rule in qt6 porgroup that we should configure with qt-cmake if
</span><span style='display:block; white-space:pre;color:#404040;'> configure.cmd is set to cmake (for example through cmake PG).
</span><span style='display:block; white-space:pre;color:#404040;'> This is because qt-cmake is a helper script provided by Qt that will permit
</span><span style='display:block; white-space:pre;color:#404040;'> to find itself at configure time
</span><span style='display:block; white-space:pre;color:#404040;'> - set CMAKE_INSTALL_RPATH correctly
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> BTW: remove + character from version string (see #65073)
</span>---
_resources/port1.0/group/qt6-1.0.tcl | 15 +++++++++++++
multimedia/welle.io/Portfile | 43 ++++++++++++++++++++++--------------
2 files changed, 41 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt6-1.0.tcl b/_resources/port1.0/group/qt6-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2dd4fea1736..a5bd71b9657 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt6-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt6-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,3 +190,18 @@ proc qt6pg::check_min_version {} {
</span> port::register_callback qt6pg::check_min_version
unset private_building_qt6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# If using Portgroup cmake + qt6 it means configure.cmd is set to cmake (for example by use of cmake porgroup),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So that qt6 finds itself correctly, we use the helper script 'qt-cmake' provided by Qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This will permit configuration step to succeed & find the Qt6 modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string equal ${configure.cmd} "${prefix}/bin/cmake"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd ${qt_bins_dir}/qt-cmake
</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;'>+# Qt6 makes uses of rpath. This is managed correctly when building with qmake, but with cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# we have to set -DCMAKE_INSTALL_RPATH=${qt_libs_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Actually the cmake portgroup sets CMAKE_INSTALL_RPATH to a value that doesn't fit for Qt6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This will result in a correct LC_RPATH in the binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string equal ${configure.cmd} "${qt_bins_dir}/qt-cmake"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_INSTALL_RPATH=${qt_libs_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/welle.io/Portfile b/multimedia/welle.io/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49fd06be733..0b12516c20c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/welle.io/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/welle.io/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,13 +22,6 @@ license_noconflict openssl mpg123
</span>
homepage https://www.welle.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component qtcharts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtdeclarative \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtmultimedia \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtquickcontrols \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtquickcontrols2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.min_version 5.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:faad2 \
port:fftw-3-single \
port:lame \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,30 +86,47 @@ variant kiss_fft description {Use KISS FFT instead of FFTW} {
</span>
if {${subport} eq ${name}} {
# stable
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup AlbrechtL welle.io 2.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup AlbrechtL welle.io 2.4 v
</span> github.tarball_from archive
epoch 1
revision 0
conflicts welle.io-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f7d8290701e86e3859cf165910c0228ad63e965b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e7aa936bf46499ce0abbbf617dd7984ccdaade955a5afb0c86886a0873f015c0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6771774
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e0ae521ea2c9bc7becc1610bd616fb1f575059d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7c2a2ff7b6e0780aee8a30a2beedfa831ce67683e1d076a73cebc897637d0202 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6764741
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtcharts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtdeclarative \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmultimedia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtquickcontrols \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtquickcontrols2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.min_version 5.10.0
</span>
configure.pre_args-append \
-DGIT_COMMIT_HASH=${version}
} else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup AlbrechtL welle.io 66675c9a4160c644a5ade5bf7a0cd0647647f33c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt6 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup AlbrechtL welle.io 6b69a78c99df4b46ec2589093cd39f05c9ac4641
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20210522+git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20221214.git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts welle.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b59b2c23af4405b0220980b21fa7c5da0f9640cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 84bcd5835e462bc2cb829df594ecc0accaa6e2c232c8ba1bc75dbf0cd30fdb3c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6772022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5fc4c3be4cc027f6491b142dc14963a0d776e84c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4cadc5062a78819641a8a63425d0650be69b961c4958d1c4e51c0a0514386ee2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6721458
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt6.depends_component qt5compat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtcharts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtdeclarative \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmultimedia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt6.min_version 6.2
</span>
configure.pre_args-append \
-DGIT_COMMIT_HASH=${githash}
</pre><pre style='margin:0'>
</pre>