<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a4e16dbb046d89f9146dbc9408f2bfb96ec73a82">https://github.com/macports/macports-ports/commit/a4e16dbb046d89f9146dbc9408f2bfb96ec73a82</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 a4e16db jack: Fix upgrade path from jack1
</span>a4e16db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a4e16dbb046d89f9146dbc9408f2bfb96ec73a82
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Fri Apr 6 23:26:54 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> jack: Fix upgrade path from jack1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The include order generated by the waf version packaged by jack2 is
</span><span style='display:block; white-space:pre;color:#404040;'> incorrect, which leads to build failures when upgrading from jack1 to
</span><span style='display:block; white-space:pre;color:#404040;'> jack2 because the build picks up the old jack headers. To avoid this,
</span><span style='display:block; white-space:pre;color:#404040;'> add a version of the deactivate hack that will deactivate jack1 right
</span><span style='display:block; white-space:pre;color:#404040;'> before the build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since this is an uncommon version of the deactivate hack that runs with
</span><span style='display:block; white-space:pre;color:#404040;'> dropped privileges, separate privilege elevation is necessary.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56241
</span>---
audio/jack/Portfile | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/jack/Portfile b/audio/jack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 621ab1a..b5a55dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/jack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/jack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,3 +42,23 @@ configure.args --doxygen=no \
</span> --samplerate=yes \
--sndfile=yes \
--readline=no \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# deactivate hack added 2018-04-06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When upgrading from jack1 to jack2, the build can fail outside of trace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mode because waf puts the CPPFLAGS at the beginning of the compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # command line. This was fixed in waf 1.9.0, but jack2 ships waf 1.8.17.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Instead of using the conflicts-build portgroup, use a deactivate hack to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force-deactive the old version before building, which should solve the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active jack] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elevateToRoot "deactivate jack1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_version 1.9.12] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1.9.12 is the first version of jack2 packaged in MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite jack "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dropPrivileges
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>