<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5b1942952f48c0e4758dfde82fb64ae0b6296f53">https://github.com/macports/macports-ports/commit/5b1942952f48c0e4758dfde82fb64ae0b6296f53</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5b1942952f48c0e4758dfde82fb64ae0b6296f53
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Tue Mar 20 20:14:14 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> audacity: shuffle code around
</span>---
audio/audacity/Portfile | 100 ++++++++++-----------
.../files/devel/patch-unordered_map-fixes.diff | 2 +-
.../audacity/files/patch-unordered_map-fixes.diff | 2 +-
3 files changed, 52 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/Portfile b/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 01e7f06..2efd1db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,20 +95,20 @@ depends_build-append \
</span> port:cmake \
port:pkgconfig \
port:python27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libavcodec.dylib:ffmpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:freetype \
</span> port:harfbuzz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lame \
</span> port:libid3tag \
port:libmad \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libogg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsndfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libvorbis \
</span> port:soundtouch \
port:soxr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:twolame
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:twolame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libavcodec.dylib:ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libogg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvorbis
</span> # audacity could use port:lv2 and port:lilv but would also require a port:suil for that to be possible.
patch.pre_args -Np1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,6 +150,47 @@ if {[variant_exists wx32] && [variant_isset wx32]} {
</span> ${PPREFIX}patch-wxw-31x.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# quelch a huge number of warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-inconsistent-missing-override \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-overloaded-virtual
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dependency-tracking \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-quicktime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-static \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-universal_binary \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-audiounits \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libflac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libmad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libsoxr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libvamp=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libvorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lv2=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-portmixer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sbsms=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-soundtouch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-twolame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-widgetextra=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-portmidi=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WX_CONFIG=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Since version 2.2.0 we need to use the embedded (modified) Portaudio version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-portaudio=local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTMIDI_CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTMIDI_LIBS=${prefix}/lib/libportmidi.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:portmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append V=1 VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
set python_bin ${prefix}/bin/python2.7
reinplace -W ${worksrcpath} "s|@@PYTHON@@|${python_bin}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,47 +236,6 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# quelch a huge number of warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-inconsistent-missing-override \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-overloaded-virtual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dependency-tracking \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-quicktime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-static \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-universal_binary \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-audiounits \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shared \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-sse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ffmpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libflac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libmad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libsoxr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libvamp=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libvorbis \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lv2=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-portmixer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sbsms=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-soundtouch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-twolame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-widgetextra=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-portmidi=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WX_CONFIG=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Since version 2.2.0 we need to use the embedded (modified) Portaudio version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-portaudio=local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PORTMIDI_CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PORTMIDI_LIBS=${prefix}/lib/libportmidi.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:portmidi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append V=1 VERBOSE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
set aud_app_path ${applications_dir}/Audacity.app
destroot.keepdirs ${destroot}${aud_app_path}/Contents/Resources/en.lproj
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-unordered_map-fixes.diff b/audio/audacity/files/devel/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ec2db2d..c9d8aa8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/devel/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
</span> index 7668506f2698240a1efbace1521401040a7396e4..7fae64ec06a48ce4ae7b77c2489a17ed0e2d89da 100644
--- a/src/commands/CommandManager.h
+++ b/src/commands/CommandManager.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,7 +101,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +104,7 @@ namespace std
</span> namespace tr1
{
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-unordered_map-fixes.diff b/audio/audacity/files/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c5a35ed..dc367c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/src/MemoryX.h b/src/MemoryX.h
</span> index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
--- a/src/MemoryX.h
+++ b/src/MemoryX.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1177,7 +1179,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1171,7 +1173,7 @@ namespace std
</span> namespace tr1
{
#endif
</pre><pre style='margin:0'>
</pre>