<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e6153814550f99c0e7c37f9a9817d09838020228">https://github.com/macports/macports-ports/commit/e6153814550f99c0e7c37f9a9817d09838020228</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 e6153814550 This renames port:audacity (v2.4.2) to port:audacity-legacy and replaces it with port:audacity-devel (v3.0.2.129). This is probably the newest version committed before the controversial takeover which among others resulted in the introduction of phoning-home features. The main difference between these versions is that the latter introduces and uses a new, sqlite3-based file format (.aup3) which the older version cannot read (the newer version cannot export to the olde [...]
</span>e6153814550 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e6153814550f99c0e7c37f9a9817d09838020228
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Tue Oct 19 11:54:42 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> This renames port:audacity (v2.4.2) to port:audacity-legacy and replaces
</span><span style='display:block; white-space:pre;color:#404040;'> it with port:audacity-devel (v3.0.2.129). This is probably the newest
</span><span style='display:block; white-space:pre;color:#404040;'> version committed before the controversial takeover which among others
</span><span style='display:block; white-space:pre;color:#404040;'> resulted in the introduction of phoning-home features.
</span><span style='display:block; white-space:pre;color:#404040;'> The main difference between these versions is that the latter introduces
</span><span style='display:block; white-space:pre;color:#404040;'> and uses a new, sqlite3-based file format (.aup3) which the older version
</span><span style='display:block; white-space:pre;color:#404040;'> cannot read (the newer version cannot export to the older .aup format).
</span><span style='display:block; white-space:pre;color:#404040;'> The old port:audacity-devel is marked obsolete and replaced_by the main port.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Another new subport is introduced, audacity-manual, which installs a local
</span><span style='display:block; white-space:pre;color:#404040;'> copy of the online manual inside the app bundle where the application
</span><span style='display:block; white-space:pre;color:#404040;'> will find it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Several behind-the-scenes changes:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - The builds are now handled through cmake and ninja, using pre-compiled
</span><span style='display:block; white-space:pre;color:#404040;'> headers (and setting up the environment so this doesn't break ccache if used).
</span><span style='display:block; white-space:pre;color:#404040;'> - Both builds can depend on wxWidgets-3.0 and/or wxWidgets-3.2 via variants,
</span><span style='display:block; white-space:pre;color:#404040;'> port:audacity will only build against wxWidgets-3.2 (by choice).
</span><span style='display:block; white-space:pre;color:#404040;'> - The preferred way to build and run Audacity is against a patched version
</span><span style='display:block; white-space:pre;color:#404040;'> of wxWidgets 3.1.3 which contains fixes not included upstreams plus some
</span><span style='display:block; white-space:pre;color:#404040;'> new functionality (including accessibility support on Mac). The cmake
</span><span style='display:block; white-space:pre;color:#404040;'> build system has logic to grab the patched sources or use a locally
</span><span style='display:block; white-space:pre;color:#404040;'> provided copy, build them, and embed the required libraries in the app
</span><span style='display:block; white-space:pre;color:#404040;'> bundle. This has little effect on the size (more on the build time...)
</span><span style='display:block; white-space:pre;color:#404040;'> Therefore, the default build of the ports now uses this solution to
</span><span style='display:block; white-space:pre;color:#404040;'> provide the best possible user experience. Users who insist on runnnig
</span><span style='display:block; white-space:pre;color:#404040;'> against a "system" wxWidgets can set the +wxsystem variant, in which
</span><span style='display:block; white-space:pre;color:#404040;'> case the choice(s) outlined above become available.
</span><span style='display:block; white-space:pre;color:#404040;'> - A +suil variant is introduced that installs a Qt5-based GUI library
</span><span style='display:block; white-space:pre;color:#404040;'> for LV2 plugins (suil). This is done via variant because of the additional
</span><span style='display:block; white-space:pre;color:#404040;'> dependency on Qt5.
</span><span style='display:block; white-space:pre;color:#404040;'> - Clamp the OSX SDK to 10.13 on 10.14 and up, like the stock build system does
</span><span style='display:block; white-space:pre;color:#404040;'> (but only) in the final link step; use standard MacPorts SDK settings on
</span><span style='display:block; white-space:pre;color:#404040;'> 11.x .
</span><span style='display:block; white-space:pre;color:#404040;'> - Don't build MAD and ID3Tag support on ARM, per the build documentation.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: #5693
</span><span style='display:block; white-space:pre;color:#404040;'> Committed from host : Bola
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Committed from host : Bola
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Committed from host : Bola
</span>---
audio/audacity/Portfile | 500 +++++++++++++++------
audio/audacity/files/add_enGB_translation.diff | 10 +-
.../files/buildinfo-clarify-no-gstreamer.diff | 12 +-
audio/audacity/files/devel/patch-cmakefiles.diff | 226 ++++++++++
.../files/devel/patch-enable-compact-menu.diff | 31 ++
.../files/devel/patch-no-embedded-wxW.diff | 32 ++
audio/audacity/files/devel/patch-temp-fixes.diff | 13 +
.../files/devel/patch-unordered_map-fixes.diff | 39 +-
audio/audacity/files/devel/patch-wxw-31x.diff | 74 +--
audio/audacity/files/fix-minsrc-autoreconf.patch | 15 -
audio/audacity/files/libvamp-Makefile-for-osx.diff | 36 --
audio/audacity/files/patch-aboutdlg-compiler.diff | 51 +++
audio/audacity/files/patch-add-MenusMac.diff | 8 +-
.../files/patch-avoid-clang-choke-on-confbase.diff | 13 +
audio/audacity/files/patch-cmakefiles.diff | 214 +++++++++
audio/audacity/files/patch-embed-wxW.diff | 22 +
audio/audacity/files/patch-fix-audiounits.diff | 138 ------
audio/audacity/files/patch-fix-casts.diff | 15 -
.../files/patch-implement-progdial=beep.diff | 10 +-
.../files/patch-libnyquist-symbol-visibility.diff | 14 +-
.../files/patch-more-decent-font-sizes.diff | 38 +-
audio/audacity/files/patch-no-libatomic.diff | 141 ++++++
audio/audacity/files/patch-python.diff | 63 +--
.../files/patch-skip-gcc-version-test.diff | 2 +-
.../patch-src-memoryx-disable-snowleopard-fix.diff | 11 -
audio/audacity/files/patch-temp-fixes.diff | 13 -
.../audacity/files/patch-unordered_map-fixes.diff | 20 +-
audio/audacity/files/patch-use-MPffmpeg.diff | 51 +++
audio/audacity/files/patch-use-MPlame.diff | 13 +
audio/audacity/files/patch-vstcontrolosx.diff | 19 -
audio/audacity/files/patch-wxw-303.diff | 113 +----
.../files/portaudio-no-universal-build.diff | 16 +-
audio/audacity/files/src-Makefile-for-osx.diff | 32 --
audio/audacity/files/vocalremover.ny | 140 ++++++
34 files changed, 1421 insertions(+), 724 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 b7f3be176e5..30f644cdc5f 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;'>@@ -2,13 +2,57 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup wxWidgets 1.0
</span>
name audacity
<span style='display:block; white-space:pre;background:#e0ffe0;'>+categories audio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set aud_app_path ${applications_dir}/Audacity.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The manual subport is defined first since it doesn't require a lot of setting up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport "${name}-manual" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}-manual"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description The manual for audacity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}. Users of port:audacity-legacy may prefer to use the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ online manual instead of installing this port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup audacity audacity-manual 3.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://manual.audacityteam.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 8e8916ad861888538ca2844c107470a262651222 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f30068e8eabe70b001e4fc2f6ace6b6e87b815d3bd756902485a960e41523e93 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23695970
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run path:bin/audacity:audacity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/manual ${destroot}${aud_app_path}/Contents/help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform linux {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/audacity/help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/manual ${destroot}${prefix}/share/audacity/help
</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;'>+ return 0
</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;'>+variant wxsystem description {Depend on wxWidgets from MacPorts} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PortGroups for the main ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> description A Free, Cross-Platform Digital Audio Editor.
long_description Audacity is a free, easy-to-use, multi-track audio editor and recorder \
for Windows, Mac OS X, GNU/Linux and other operating systems. The interface is translated \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,84 +66,135 @@ long_description Audacity is a free, easy-to-use, multi-track audio editor an
</span> Numerous effects including change the speed or pitch of a recording. \n\
And more!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport audacity-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description A port of the Audacity audio editor aimed at development purposes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport audacity-legacy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n This version of the port provides the last release using the legacy file format. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The newer v3 versions can import the legacy .aup projects but can only \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write in a new .aup3 format that the older versions cannot import! Use this port \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if you have a need to exchange native projects with people using Audacity versions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ older than 3.0.0 .
</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;'>+subport audacity-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by audacity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}-legacy"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span> # get the source tarball from github because it contains all required external libs
# incl. those not in MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity 2.2.2 Audacity-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c48e8467fc06c1ffb11af2b0fba4ede77b66ee2f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7963cedab841aff181ea25b06991ba5ba56249533815ba5cdd82ec1282dbadd8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 25941576
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup audacity audacity 2.4.2 Audacity-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d9e04c029a144800e378a6b5464c74f3fdb2a7e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 032273e2408ad51f97c6846ac8d8fe9e4a3fbc6e4c620e630ea4c1d0124d9a94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 61254313
</span> set PPREFIX ./
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant wx30 conflicts wx32 requires wxsystem description {build against wxWidgets-3.0} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # git describe --tags : Audacity-2.2.2-407-g56bca7427
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity 56bca7427218ab9bdd9a54f4eb7d7490c07657bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.2.407
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts "${name}-legacy"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## 576b7e66 looks like possibly the last commit before the takeover by the new project owner:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup audacity audacity 576b7e66d2b96c39241d3d992259fc2bfa7855b0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.0.2.129
</span> # this port is intended to facilitate development efforts shared with "upstreams"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # so using git instead of a tarball fetch type is more appropriate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # distname audacity-git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 43b66fdbe873d5f64059f5b58b20b676d9540d20 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9231238cfe468b7b0531853564cfc19dea635f50b1acd5c9b468c5795d6e767b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 26049423
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so using git instead of a tarball fetch type is more appropriate for the current maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # distname audacity-git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir audacity-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3615af185a7338b83fba23c943b9898c7bbb260d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 58349631840adf45a81b57037819e14e18cb684586cde249630e66488b911902 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 64490814
</span> set PPREFIX devel/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant wx32 description {Use wxWidgets 3.2 - experimental!} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # register the exact source version in the build:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/mac "scripts/get_gitident.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant wx32 conflicts wx30 requires wxsystem description {build against wxWidgets-3.2} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_exists wxsystem] || [variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_fetch-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:wget:wget
</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;'>+supported_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args-append -k
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Audacity builds "normally" from 10.7 to 10.13, but will request the 10.13 SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on 10.14 and newer to "prevent high CPU usage and slow drawing". Linking will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fail if MacPort lets source be compiled against the platform SDK, so we handle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK selection ourselves entirely. MP builds aren't required to support anything
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but the OS version they were built for. On 11.x we just build as if there are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no OS specifics.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macosx_deployment_target 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdkroot
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories audio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc add_patchfile_ifexists {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global PPREFIX filespath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach fname ${args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${filespath}/${fname}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append ${fname}
</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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span> # openssl is a dependency of curl in cmake
license_noconflict openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span> use_parallel_build yes
homepage http://www.audacityteam.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_exists wx32] && [variant_isset wx32]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we want to use the wxWidgets-3.2 "bleeding edge" port!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists wx32] && [variant_isset wx32]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_exists wx30] && [variant_isset wx30]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we want to use the temporary wxWidgets-3.1 "Audacity-special" port!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants ${wxWidgets.port} "" stdlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![catch {set wxw_stdlib [active_variants ${wxWidgets.port} stdlib]} err]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${wxw_stdlib}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append "This port needs ${wxWidgets.port} without the +stdlib variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "This port needs ${wxWidgets.port} without the +stdlib variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "reinstall port:${wxWidgets.port} without the +stdlib variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wxCommit 07e7d83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # different master_sites so we need to fetch and extract the audacity-wxWidgets sources "manually"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${distpath}/wxWidgets-${wxCommit}.tar.gz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "---> Fetching wxWidgets-${wxCommit}.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "wget --no-check-certificate \"https://github.com/audacity/wxWidgets/tarball/${wxCommit}/wxWidgets-${wxCommit}.tar.gz\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --progress=bar:force -O ${distpath}/wxWidgets-${wxCommit}.tar.gz"
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "---> Extracting wxWidgets-${wxCommit}.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/lib-src "tar -xf ${distpath}/wxWidgets-${wxCommit}.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s audacity-wxWidgets-${wxCommit} ${worksrcpath}/lib-src/wxWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add the wxWidgets dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv
</span> }
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_bin ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:freetype \
path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libid3tag \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmad \
</span> port:soundtouch \
port:soxr \
port:twolame \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,6 +205,11 @@ depends_lib-append port:freetype \
</span> port:libogg \
port:libsndfile \
port:libvorbis
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.arch} ne "arm"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libid3tag \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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;'>@@ -119,84 +219,144 @@ patch.pre_args -Np1
</span> # - address a visibility issue with the slider_array variable in libnyquist
# - make the AudioUnits plugin support build; on 64bit and also include AUControl.mm
platform darwin {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-minsrc-autoreconf.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libvamp-Makefile-for-osx.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src-Makefile-for-osx.diff \
</span> portaudio-no-universal-build.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- buildinfo-clarify-no-gstreamer.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_enGB_translation.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-more-decent-font-sizes.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-vstcontrolosx.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libnyquist-symbol-visibility.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-casts.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-add-MenusMac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-skip-gcc-version-test.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-audiounits.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reported upstream, patch accepted as the proper fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildinfo-clarify-no-gstreamer.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-aboutdlg-compiler.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_enGB_translation.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-more-decent-font-sizes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-python.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use lame from MacPorts (partial revert of ae431bc5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # load ffmpeg libs from MacPorts (reverts of 1d40f33e)
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PPREFIX}patch-unordered_map-fixes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for building against wxWidgets 3.0.3 and up:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-wxw-303.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-MPlame.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-MPffmpeg.diff
</span> # work around a missing implementation in wxCocoa's wxSound class
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-implement-progdial=beep.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-implement-progdial=beep.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-wxw-303.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make certain we're not embedding any wxWidgets libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_patchfile_ifexists \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PPREFIX}patch-no-embedded-wxW.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make certain we're embedding our wxWidgets libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_patchfile_ifexists \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PPREFIX}patch-embed-wxW.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_exists wx32] && [variant_isset wx32]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+add_patchfile_ifexists \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PPREFIX}patch-skip-gcc-version-test.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PPREFIX}patch-enable-compact-menu.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PPREFIX}patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset wxsystem] && ${wxWidgets.use} ne "wxWidgets-3.2"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_patchfile_ifexists \
</span> ${PPREFIX}patch-wxw-31x.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# this software does some funky SL fixes that don't work with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# newer compilers building against libc++ -- disable those if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# building with libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src-memoryx-disable-snowleopard-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant suil description {Build the GUI library for LV2 plugins\; requires Qt5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# among other things, we add frameworks AudioToolbox, Cocoa and Carbon because somewhere after wxW 3.1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the wx build system no longer exports private libraries. Carbon could be temporary because wxW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dropped Carbon usage somewhere around 3.1.4 but drops support for 10.9- earlier. This is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# required when building against port:wxWidgets-3.1 but it won't hurt either.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append ${PPREFIX}patch-cmakefiles.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
# quelch a huge number of warnings
configure.cxxflags-append \
-Wno-inconsistent-missing-override \
-Wno-overloaded-virtual
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set _OPT "audacity_"
</span> configure.args-append \
<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:#e0ffe0;'>+ -D${_OPT}lib_preference=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_audio_units=on \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_pa_jack=off \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_ffmpeg=linked \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_lame=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_flac=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_soxr=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_vamp=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_ogg=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_vorbis=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_lv2=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_suil_qt5=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_sbsms=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_soundtouch=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_twolame=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_midi=local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_pch=on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.arch} ne "arm"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_mad=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_id3tag=system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_mad=off \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_id3tag=off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # using port:sqlite3 leads to unstable behaviour?!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_sqlite=local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_wxwidgets=system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span> WX_CONFIG=${wxWidgets.wxconfig}
<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:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_wxwidgets=local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the MacPorts options for building wxWidgets, in particular
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # about using dependencies from MacPorts:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_LIBICONV=sys \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_LIBJPEG=sys \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_LIBTIFF=sys \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_LIBPNG=sys \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_ZLIB=sys \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_OPENGL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_LIBSDL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_AUI=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_DISPLAY=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_XRC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxUSE_GRAPHICS_CONTEXT=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxBUILD_PRECOMP=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxBUILD_STRIPPED_RELEASE_DEFAULT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WXWIN=${worksrcpath}/lib-src/wxWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WXWIN=${worksrcpath}/lib-src/wxWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ensure pre-compiled headers and the possible use of ccache can co-exist
</span> configure.env-append \
<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:#e0ffe0;'>+ "CCACHE_SLOPPINESS=pch_defines,time_macros"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CCACHE_SLOPPINESS=pch_defines,time_macros"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_suil_qt5=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D${_OPT}use_suil_qt5=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</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;'>+ -Daudacity_use_portaudio=local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# make sure the C++ stdlib argument is added to the LDFLAGS too
if {${configure.cxx_stdlib} ne "" && [string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,17 +364,25 @@ if {${configure.cxx_stdlib} ne "" && [string match *clang* ${configure.cxx}]} {
</span> -stdlib=${configure.cxx_stdlib}
}
<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:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPPFLAGS=\"${configure.cppflags}\""
</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;'>+if {${build.cmd} ne "ninja"} {
</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;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.pre_args-prepend -k 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# with everything defined/declared as intended we can now
# handle the post-patch step with its reinplace statements.
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bin ${prefix}/bin/python2.7
</span> reinplace -W ${worksrcpath} "s|@@PYTHON@@|${python_bin}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/lv2/build \
</span> lib-src/lv2/configure
reinplace -W ${worksrcpath} "s|/usr/local|${prefix}|g" \
src/effects/ladspa/LadspaEffect.cpp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/effects/VST/VSTEffect.cpp \
</span> src/export/ExportMP3.cpp \
lib-src/lv2/lilv/wscript \
lib-src/lv2/lilv/test/lilv_test.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,76 +393,112 @@ post-patch {
</span> reinplace -W ${worksrcpath} "s| -Werror||g" \
lib-src/portaudio-v19/configure.in \
lib-src/portaudio-v19/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@LDFLAGS@|${configure.ldflags}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/libvamp/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|/opt/local|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake-proxies/lv2/CMakeLists.txt
</span> platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # audacity 2.1.2 contains C++ files that include system SDK headers and ObjC code on OS X;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # audacity contains C++ files that include system SDK headers and ObjC code on OS X;
</span> # they must thus be built as ObjC++
set make_objcpp { \
{CommandManager src/commands {src/Makefile.in src/Makefile.am}} \
{Effect src/effects {src/Makefile.in src/Makefile.am}} \
{LV2Effect src/effects/lv2 {src/Makefile.in src/Makefile.am}} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ {KeyboardCapture src {src/Makefile.in src/Makefile.am}} \
</span> }
foreach mm ${make_objcpp} {
set f [lindex ${mm} 0]
set d [lindex ${mm} 1]
set mk [lindex ${mm} 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach m ${mk} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|/${f}.cpp|/${f}.mm|g" ${m}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> # it's easiest to symlink f.mm to f.cpp; clang++ will do the rest.
if {![file exists ${worksrcpath}/${d}/${f}.mm]} {
ln -s ${f}.cpp ${worksrcpath}/${d}/${f}.mm
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|/VSTControlGTK.cpp|/VSTControlOSX.mm|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Makefile.in src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${worksrcpath}/src/MenusMac.cpp] && ![file exists ${worksrcpath}/src/MenusMac.mm]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s MenusMac.cpp ${worksrcpath}/src/MenusMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${worksrcpath}/src/menus/WindowMenus.cpp] && ![file exists ${worksrcpath}/src/menus/WindowMenus.mm]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s WindowMenus.cpp ${worksrcpath}/src/menus/WindowMenus.mm
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # register the exact source version in the build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${worksrcpath}/mac/scripts/get_gitident.sh]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/mac "scripts/get_gitident.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '#define GIT_DESC \"${version}\"' >> ${worksrcpath}/src/RevisionIdent.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '#define GIT_DESC \"${version}\"' > ${worksrcpath}/src/GitDesc.h"
</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> platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set aud_app_path ${applications_dir}/Audacity.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs ${destroot}${aud_app_path}/Contents/Resources/en.lproj
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # create the app bundle infrastructure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the BundleExec:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/bin/audacity ${destroot}${aud_app_path}/Contents/MacOS/Audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install the Info.plist provided by Audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/mac/Info.plist ${destroot}${aud_app_path}/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # adapt the provided Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|AUDACITY_EXECUTABLE|Audacity|g" ${destroot}${aud_app_path}/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|AUDACITY_INFO_VERSION|${version} (MacPorts)|g" ${destroot}${aud_app_path}/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install the provided icons into the Resources directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach r [glob -nocomplain ${worksrcpath}/mac/Resources/*.icns] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${r} ${destroot}${aud_app_path}/Contents/Resources/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "${name}-legacy"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}${prefix}/Audacity.app ${destroot}${aud_app_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/share/audacity/plug-ins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/share/audacity/nyquist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/share/audacity/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${aud_app_path}/Contents/plug-ins ${destroot}${prefix}/share/audacity/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${build.dir}/bin/MacPorts/lib/audacity/suil_qt5_in_cocoa.so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${aud_app_path}/Contents/Frameworks/suil_qt5_in_cocoa.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s suil_qt5_in_cocoa.dylib ${destroot}${aud_app_path}/Contents/Frameworks/suil_qt5_in_cocoa.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}${prefix}/Audacity.app ${destroot}${aud_app_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # I haven't yet figured out how to disable the copying of wx libraries into the bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but they can be pruned because CopyLibs.cmake is not invoked.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/audacity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${aud_app_path}/Contents/plug-ins ${destroot}${prefix}/share/audacity/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/mime/packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/src/audacity.xml ${destroot}${prefix}/share/mime/packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/appdata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/help/audacity.appdata.xml ${destroot}${prefix}/share/appdata/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/doc/Audacity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/README.txt ${worksrcpath}/LICENSE.txt ${destroot}${prefix}/share/doc/Audacity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/help/audacity.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/icons/hicolor/scalable/apps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/images/audacity.svg ${destroot}${prefix}/share/icons/hicolor/scalable/apps/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s {16 22 24 32 48} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/icons/hicolor/${s}x${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/images/icons/${s}x${s}/audacity.png ${destroot}${prefix}/share/icons/hicolor/${s}x${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}${aud_app_path}/Contents${build.dir}/bin/Audacity.app/Contents/Frameworks/libsuil_qt5_in_cocoa.so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${aud_app_path}/Contents/Frameworks/libsuil_qt5_in_cocoa.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s libsuil_qt5_in_cocoa.dylib ${destroot}${aud_app_path}/Contents/Frameworks/libsuil_qt5_in_cocoa.so
</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;'>+ if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l [glob -nocomplain ${wxWidgets.prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lang [file tail ${l}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Resources/${lang}.lproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${l}/LC_MESSAGES/wxstd.mo ${destroot}${aud_app_path}/Contents/Resources/${lang}.lproj/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# allow the application to find certain things where it expects them on OS X (= inside the app bundle)
foreach r [glob -nocomplain ${destroot}${prefix}/share/audacity/*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/audacity/[file tail ${r}] ${destroot}${aud_app_path}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install translation resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach l [glob -nocomplain ${destroot}${prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lang [file tail ${l}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Resources/${lang}.lproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/locale/${lang}/LC_MESSAGES/audacity.mo ${destroot}${aud_app_path}/Contents/Resources/${lang}.lproj/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach l [glob -nocomplain ${wxWidgets.prefix}/share/locale/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lang [file tail ${l}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Resources/${lang}.lproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${l}/LC_MESSAGES/wxstd.mo ${destroot}${aud_app_path}/Contents/Resources/${lang}.lproj/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f [file tail ${r}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${destroot}${aud_app_path}/Contents/Resources/${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/audacity/${f} ${destroot}${aud_app_path}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# install a wrapper script in ${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo \"#!/bin/sh\nexec \\\"${aud_app_path}/Contents/MacOS/Audacity\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/audacity"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo \"#!/bin/sh\nexec \\\"${aud_app_path}/Contents/MacOS/Wrapper\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/audacity"
</span> system "chmod 755 ${destroot}${prefix}/bin/audacity"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/vocalremover.ny ${destroot}${aud_app_path}/Contents/plug-ins/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> notes "
In case Audacity complains about finding FFmpeg or Lame, please locate these libraries\
under ${prefix}/lib in the Libraries section of the Preferences dialog (see\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/add_enGB_translation.diff b/audio/audacity/files/add_enGB_translation.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d0f2670e65..07df5a700ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/add_enGB_translation.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/add_enGB_translation.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/locale/LINGUAS b/locale/LINGUAS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index cb63b55f53f4201b23dea97eb8eb40294266bca4..f8170c2cb2f2af793f17d67b5260aff0addca4b1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c43bcc311..a314ad033 100644
</span> --- a/locale/LINGUAS
+++ b/locale/LINGUAS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,7 @@ cy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,7 @@ cy
</span> da
de
el
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ index cb63b55f53f4201b23dea97eb8eb40294266bca4..f8170c2cb2f2af793f17d67b5260aff0
</span> eu_ES
diff --git a/locale/en_GB.po b/locale/en_GB.po
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..26c4d89
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000..26c4d8994
</span> --- /dev/null
+++ b/locale/en_GB.po
@@ -0,0 +1,12827 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12844,10 +12844,10 @@ index 0000000..26c4d89
</span> +#~ msgid "Normalizing..."
+#~ msgstr "Normalising..."
diff --git a/src/Languages.cpp b/src/Languages.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 88d0d9ff6db320b04c5e8337f3965272750248e4..d173484382012f25198108ac7829f8c395694baf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5f04b41de..7b0de5c28 100644
</span> --- a/src/Languages.cpp
+++ b/src/Languages.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,8 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,8 @@ void GetLanguages(
</span> "da Dansk",
"de Deutsch",
"el \316\225\316\273\316\273\316\267\316\275\316\271\316\272\316\254",
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff b/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4904e0211f4..6ddb3e4b1c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index fe789d6..21d32ad 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 798e9ee8a..3d32e3787 100644
</span> --- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -520,7 +520,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -720,7 +720,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
</span> #ifdef USE_GSTREAMER
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AddBuildinfoRow(&informationStr, wxT("gstreamer"), _("Import via GStreamer"), enabled);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddBuildinfoRow(&informationStr, wxT("gstreamer"), XO("Import via GStreamer"), enabled);
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- AddBuildinfoRow(&informationStr, wxT("gstreamer"), _("Import via GStreamer"), disabled);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AddBuildinfoRow(&informationStr, wxT("gstreamer"), _("Import via GStreamer - removed in version 2.0.6"), disabled);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AddBuildinfoRow(&informationStr, wxT("gstreamer"), XO("Import via GStreamer"), disabled);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AddBuildinfoRow(&informationStr, wxT("gstreamer"), XO("Import via GStreamer - removed in version 2.0.6"), disabled);
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- informationStr += wxT("</table>\n"); //end table of file format libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ informationStr << wxT("</table>\n"); //end table of file formats supported
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-cmakefiles.diff b/audio/audacity/files/devel/patch-cmakefiles.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d94050cb502
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-cmakefiles.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,226 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a85373670..60aa0c775 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@ cmake_policy( SET CMP0075 NEW )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Definitions that must happen before the project() command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( MIN_MACOS_VERSION 10.9 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( MIN_MACOS_VERSION 10.7 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( TARGET_MACOS_VERSION 10.13 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Generate schema files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_XCODE_GENERATE_SCHEME ON )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,14 +86,14 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define the OSX compatibility parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_OSX_ARCHITECTURES x86_64 CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_OSX_DEPLOYMENT_TARGET ${MIN_MACOS_VERSION} CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set( CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This prevents a link error when building with the 10.9 or older SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME OFF )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Shouldn't cmake do this???
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string( APPEND CMAKE_CXX_FLAGS " -stdlib=libc++" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# string( APPEND CMAKE_CXX_FLAGS " -stdlib=libc++" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add our module path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,12 +108,14 @@ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_CXX_STANDARD 14 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Use ccache if available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_program( CCACHE_PROGRAM ccache )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-mark_as_advanced( FORCE CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Use ccache if requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( ${CMAKE_CXX_COMPILER_LAUNCHER} MATCHES "ccache" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( CCACHE_PROGRAM "${CMAKE_CXX_COMPILER_LAUNCHER}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mark_as_advanced( FORCE CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if( CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Our very own project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +137,8 @@ cmd_option( ${_OPT}obey_system_dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Off
</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;'>+-include( AudacityDependencies )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# spurious commit:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include( AudacityDependencies )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Pull all the modules we'll need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include( CheckCXXCompilerFlag )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,6 +255,7 @@ if( CMAKE_CONFIGURATION_TYPES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( _DEST "${_DESTDIR}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( _PREFIX "${CMAKE_INSTALL_PREFIX}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake-proxies/lv2/CMakeLists.txt b/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5551e5dd8d1fa060a91a00eb9a3bd115c31d7274..db7a5341d0ed22d4f14adb72b4b61fda22a0fd2e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,6 +151,9 @@ macro( bld name packages define sources )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PkgConfig::${pkg}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( ${name} STREQUAL "suil_qt5_in_cocoa")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list( APPEND libs PRIVATE "-framework Cocoa" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT missing )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list( APPEND DEFINES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,7 +191,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_PATH_SEP ":" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_DIR_SEP "/" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( LILV_DEFAULT_LV2_PATH "~/Library/Audio/Plug-Ins/LV2:~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:/Library/Audio/Plug-Ins/LV2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( LILV_DEFAULT_LV2_PATH "~/Library/Audio/Plug-Ins/LV2:~/.lv2:@PREFIX@/lib/lv2:/Library/Audio/Plug-Ins/LV2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_DIR "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_DIR_SEP "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,10 +199,18 @@ elseif( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_GTK3_LIB_NAME "libgtk-x11-3.0.so.0" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_PREFIX "lib" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_EXT ".dylib" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ option(audacity_use_suil_qt5 "Whether to build the suil_qt5_in_cocoa GUI library for LV2 plugins" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( audacity_use_suil_qt5 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_check_modules( QT5 IMPORTED_TARGET "Qt5Widgets >= 5.1.0" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bld( "suil_qt5_in_cocoa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "QT5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "SUIL_WITH_COCOA_IN_QT5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${TARGET_ROOT}/suil/src/cocoa_in_qt5.mm" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif( UNIX )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_PATH_SEP ":" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_DIR_SEP "/" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( LILV_DEFAULT_LV2_PATH "~/.lv2:/usr/lib/lv2:/usr/local/lib/lv2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( LILV_DEFAULT_LV2_PATH "~/.lv2:@PREFIX@/lib/lv2:/usr/lib/lv2:/usr/local/lib/lv2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_DIR "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_DIR_SEP "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake-proxies/wxWidgets/CMakeLists.txt b/cmake-proxies/wxWidgets/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 47b6bd0ee..e957ee666 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake-proxies/wxWidgets/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake-proxies/wxWidgets/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,10 +240,10 @@ file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT ours )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message( FATAL_ERROR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message( WARNING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n########################################################################\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Audacity version 3.0.0 or higher requires use of a customized version of "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "wxWidgets. For details:\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Audacity version 3.0.0 or higher recommends the use of a customised version "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "of wxWidgets. For details:\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "########################################################################\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e6dd6cf03..fa2f49b7e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1032,7 +1032,7 @@ list( APPEND DEFINES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If we have cmake 3.16 or higher, we can use precompiled headers, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # only use them if ccache is not available and the user hasn't disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" AND NOT CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd_option(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${_OPT}use_pch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Use precompiled headers [yes, no]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1081,6 +1081,11 @@ list( APPEND LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:z>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:pthread>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list( APPEND LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $<$<CXX_COMPILER_ID:Clang>:atomic>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( BUILDING_AUDACITY YES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( INSTALL_PREFIX "${_PREFIX}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1147,22 +1152,23 @@ if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Bug 2400 workaround
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Replaces the SDK version in the built executable with 10.13 to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # prevent high CPU usage and slow drawing on Mojave or newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- check_for_platform_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( PLATFORM_VERSION_SUPPORTED )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,-platform_version,macos,${MIN_MACOS_VERSION},${TARGET_MACOS_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,-sdk_version,10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## MacPorts will specify the SDK to use itself, thank you very much
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # Bug 2400 workaround
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # Replaces the SDK version in the built executable with 10.13 to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # prevent high CPU usage and slow drawing on Mojave or newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# check_for_platform_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if( PLATFORM_VERSION_SUPPORTED )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -Wl,-platform_version,macos,${MIN_MACOS_VERSION},${TARGET_MACOS_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -Wl,-sdk_version,10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define Mac specific resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list( APPEND MAC_RESOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1206,6 +1212,9 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-framework AudioUnit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-framework CoreAudio"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-framework CoreAudioKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-framework AudioToolbox"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-framework Cocoa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-framework Carbon"
</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;'>+ # Use the Aqua theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1317,13 +1326,20 @@ list( APPEND DEFINES PRIVATE "${export_symbol}" INTERFACE "${import_symbol}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_sources( ${TARGET} PRIVATE ${HEADERS} ${SOURCES} ${RESOURCES} ${MAC_RESOURCES} ${WIN_RESOURCES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/VST/VSTEffect.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/ladspa/LadspaEffect.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/lv2/LoadLV2.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/lv2/LoadLV2.cpp APPEND PROPERTY COMPILE_DEFINITIONS PKGLIBDIR="${PKGLIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE export/ExportMP3.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options( ${TARGET} PRIVATE ${OPTIONS} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_options( ${TARGET} PRIVATE ${LDFLAGS} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries( ${TARGET} ${LIBRARIES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries( ${TARGET} PUBLIC ${AUDACITY_LIBRARIES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" AND NOT CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( ${_OPT}use_pch )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message( STATUS "Using precompiled headers" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_precompile_headers( ${TARGET} PRIVATE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-enable-compact-menu.diff b/audio/audacity/files/devel/patch-enable-compact-menu.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03c6b2086dd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-enable-compact-menu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b36c10fa3..80ec737b4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/menus/FileMenus.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/menus/FileMenus.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,6 +200,7 @@ void OnClose(const CommandContext &context )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void OnCompact(const CommandContext &context)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ProjectFileManager::Get(context.project).Compact();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UndoManager::Get(context.project).ClearStates();
</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;'>+ void OnSave(const CommandContext &context )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -618,15 +619,15 @@ BaseItemSharedPtr FileMenu()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioIONotBusyFlag() ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Command( wxT("SaveCopy"), XXO("&Backup Project..."), FN(OnSaveCopy),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioIONotBusyFlag() )
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Bug 2600: Compact has interactions with undo/history that are bound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // to confuse some users. We don't see a way to recover useful amounts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // of space and not confuse users using undo.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // As additional space used by aup3 is 50% or so, perfectly valid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // approach to this P1 bug is to not provide the 'Compact' menu item.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- //Command( wxT("Compact"), XXO("Co&mpact Project"), FN(OnCompact),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // AudioIONotBusyFlag(), wxT("Shift+A") )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Command( wxT("Compact"), XXO("Compact Project..."), FN(OnCompact),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AudioIONotBusyFlag() )
</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;'>+ Section( "Import-Export",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-no-embedded-wxW.diff b/audio/audacity/files/devel/patch-no-embedded-wxW.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bcb9866d07e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-no-embedded-wxW.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8954b4e25..5d9e7240d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1207,16 +1215,16 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( HAVE_VISIBILITY 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file( audacity_config.h.in private/configmac.h )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Copy the required wxWidgets libs into the bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_COMMAND} -D SRC="${_EXEDIR}/Audacity"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -D DST="${_PKGLIB}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -P ${CMAKE_MODULE_PATH}/CopyLibs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # Copy the required wxWidgets libs into the bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ${TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# COMMAND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ${CMAKE_COMMAND} -D SRC="${_EXEDIR}/Audacity"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -D DST="${_PKGLIB}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -P ${CMAKE_MODULE_PATH}/CopyLibs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# POST_BUILD
</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;'>+ # Define the Wrapper target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( WRAPPER_ROOT "${TARGET_ROOT}/../mac" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-temp-fixes.diff b/audio/audacity/files/devel/patch-temp-fixes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8712b465520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/widgets/FileConfig.cpp b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 29f983667..0d8388621 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "FileConfig.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(F_OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define F_OK 0x00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><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 c9d8aa8cc68..de58be00e2f 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;'>@@ -1,26 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/MemoryX.h b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1177,7 +1179,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace tr1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<> struct hash< wxString > {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t operator () (const wxString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7668506f2698240a1efbace1521401040a7396e4..7fae64ec06a48ce4ae7b77c2489a17ed0e2d89da 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/commands/CommandManager.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/commands/CommandManager.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace tr1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<> struct hash< NormalizedKeyString > {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t operator () (const NormalizedKeyString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/audacity/Types.h b/include/audacity/Types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 137779c1c2abe4d9c14c264755842f188e385722..a1df29e54cc47bd7ae118ea29a7060215e74d295 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/audacity/Types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/audacity/Types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // For using std::unordered_map on wxString
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> struct hash< wxString > {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t operator () (const wxString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-wxw-31x.diff b/audio/audacity/files/devel/patch-wxw-31x.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 24452ad8965..98c55a2c762 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/devel/patch-wxw-31x.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/devel/patch-wxw-31x.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,60 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 394803a34debcaeb297f89437a42a583ef9b534f..719fa03646b350b28e30b7053c7b5e455f9749f2 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19898,7 +19898,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs --version`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.0.x" >&6;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/widgets/FileConfig.cpp b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e0e1db83b0b2a090ec93fa075352e27a7772e36e..231c8edd015793c9016291e3d133e456077b2154 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,11 +55,13 @@ void FileConfig::Init()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mConfig = std::make_unique<wxFileConfig>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (mAppName, mVendorName, mLocalFilename, mGlobalFilename, mStyle, mConv);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${wx_version}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 3.0.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 3.0.*|3.1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Great, you're using wxWidgets ${wx_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:#ffe0e0;'>-diff --git a/lib-src/lib-widget-extra/configure b/lib-src/lib-widget-extra/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a86b5247ad89c72c75f05eff5b2753c2d129e0ad..4f3a6c7655d2bb41f362ec1d98fa867a0ea311af 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/lib-widget-extra/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/lib-widget-extra/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16616,7 +16616,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs --version`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if wxCHECK_VERSION(3, 1, 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Prevent wxFileConfig from attempting a Flush() during object deletion. This happens
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // because we don't use the wxFileConfig::Flush() method and so the wxFileConfig dirty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // flag never gets reset. During deletion, the dirty flag is checked and a Flush()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // performed. This can (and probably will) create bogus temporary files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mConfig->DisableAutoSave();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${wx_version}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 2.8.* | 3.0.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 2.8.* | 3.0.* | 3.1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Great, you're using wxWidgets ${wx_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:#ffe0e0;'>-diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..fca75e17da856475cb602d8d5040bcffce2fa7d5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/FileDialog/mac/FileDialogPrivate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // implementation
</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:#ffe0e0;'>--@interface OSPanelDelegate : NSObject wxOSX_10_6_AND_LATER(<NSOpenSavePanelDelegate>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@interface OSPanelDelegate : NSObject <NSOpenSavePanelDelegate>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FileDialog* _dialog;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/MemoryX.h b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..6f8694ed9f5dbfceea34474d7c05ccfc7fa84506 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1172,7 +1172,7 @@ make_value_transform_iterator(const Iterator &iterator, Function function)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return { iterator, NewFunction{ function } };
</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:#ffe0e0;'>--// For using std::unordered_map on wxString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*// For using std::unordered_map on wxString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace std
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __AUDACITY_OLD_STD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1191,6 +1191,6 @@ namespace std
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __AUDACITY_OLD_STD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // __AUDACITY_MEMORY_X_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool canRead = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool canWrite = false;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/fix-minsrc-autoreconf.patch b/audio/audacity/files/fix-minsrc-autoreconf.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 76bbd4886fe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/fix-minsrc-autoreconf.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Description: Fix autoreconf for the minimal audacity source tarball.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The minimal audacity source tarball does not ship every library in lib-src.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Benjamin Drung <bdrung@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +180,7 @@ SUBDIRS += lib-widget-extra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: These optional libraries will not be distributed in the source tarball.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS += $(OPTIONAL_SUBDIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#SUBDIRS += $(OPTIONAL_SUBDIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Overwrite install* targets from automake. We do not want to install anything
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from the lib-src libraries, because we statically link these libraries.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/libvamp-Makefile-for-osx.diff b/audio/audacity/files/libvamp-Makefile-for-osx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0fd060b036b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/libvamp-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib-src/libvamp/Makefile.in b/lib-src/libvamp/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4fc9378b57c70675c0f0243b2598342c4414ccf9..a56a05346e595d73d7189d4b7bcfe89e93bfb1bb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/libvamp/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/libvamp/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,22 +100,23 @@ INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Flags required to tell the compiler to create a dynamically loadable object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DYNAMIC_LDFLAGS = -static-libgcc -shared -Wl,-Bsymbolic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_SDK_LINK_ABI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_ABI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#DYNAMIC_LDFLAGS = -static-libgcc -shared -Wl,-Bsymbolic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_SDK_LINK_ABI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_ABI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Additional flags for making a plugin. This version script tells the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # GNU linker to make all symbols in the library hidden except for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # public entry point. It's not essential, but makes a tidier library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=${srcdir}/build/vamp-plugin.map
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=${srcdir}/build/vamp-plugin.map
</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:#ffe0e0;'>- ## For OS/X with g++:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#DYNAMIC_LDFLAGS = -dynamiclib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DYNAMIC_LDFLAGS = -dynamiclib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS += @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### End of user-serviceable parts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-aboutdlg-compiler.diff b/audio/audacity/files/patch-aboutdlg-compiler.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ab3cb4dc85a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-aboutdlg-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3d32e3787..f1b7c1967 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/AboutDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/AboutDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,6 +63,7 @@ hold information about one contributor to Audacity.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <RevisionIdent.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "GitDesc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef REV_TIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define REV_TIME "unknown date and time"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -405,6 +406,7 @@ visit our %s.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << ProgramName
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << wxT(" ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << wxString(AUDACITY_VERSION_STRING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << wxT(" (") << wxString(GIT_DESC) << wxT(")")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << wxT("</center></h3>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* i18n-hint: The program's name substitutes for %s */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << XO("%s the free, open source, cross-platform software for recording and editing sounds.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -608,16 +610,21 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxString::Format(wxT("MSVC %02d.%02d.%05d.%02d"), _MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 100000, _MSC_BUILD));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNUC_PATCHLEVEL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __MINGW32__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AddBuildinfoRow(&informationStr, XO("Compiler:"), wxT("MinGW ") wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AddBuildinfoRow(&informationStr, XO("Compiler:"), wxT("GCC ") wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __clang_version__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AddBuildinfoRow(&informationStr, XO("Compiler:"), wxT("clang ") __clang_version__);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __GNUC_PATCHLEVEL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AddBuildinfoRow(&informationStr, XO("Compiler:"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wxString::Format(wxT("clang %s (compatible GCC %d.%d.%d)"), __clang_version__, __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AddBuildinfoRow(&informationStr, XO("Compiler:"), wxT("clang ") __clang_version__);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __GNUC_PATCHLEVEL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __MINGW32__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AddBuildinfoRow(&informationStr, XO("Compiler:"), wxT("MinGW ") wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AddBuildinfoRow(&informationStr, XO("Compiler:"), wxT("GCC ") wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Install prefix
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-add-MenusMac.diff b/audio/audacity/files/patch-add-MenusMac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c5abffe63d9..638844d56c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-add-MenusMac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-add-MenusMac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ diff --git a/src/Makefile.am b/src/Makefile.am
</span> index e61be0e4e..14fa52ff3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,6 +177,7 @@ audacity_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,6 +176,7 @@ audacity_SOURCES = \
</span> MemoryX.h \
Menus.cpp \
Menus.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ index d28e7abc1..d6914ed13 100644
</span> audacity-MixerBoard.$(OBJEXT) audacity-ModuleManager.$(OBJEXT) \
audacity-PitchName.$(OBJEXT) \
audacity-PlatformCompatibility.$(OBJEXT) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1322,7 +1322,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1321,7 +1321,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \
</span> LabelDialog.h LabelTrack.cpp LabelTrack.h LangChoice.cpp \
LangChoice.h Languages.cpp Languages.h Legacy.cpp Legacy.h \
Lyrics.cpp Lyrics.h LyricsWindow.cpp LyricsWindow.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ index d28e7abc1..d6914ed13 100644
</span> Mix.cpp Mix.h MixerBoard.cpp MixerBoard.h ModuleManager.cpp \
ModuleManager.h NumberScale.h PitchName.cpp PitchName.h \
PlatformCompatibility.cpp PlatformCompatibility.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2438,6 +2438,7 @@ distclean-compile:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2437,6 +2437,7 @@ distclean-compile:
</span> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-LyricsWindow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Matrix.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Menus.Po@am__quote@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ index d28e7abc1..d6914ed13 100644
</span> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Mix.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-MixerBoard.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-ModuleManager.Po@am__quote@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3624,6 +3625,20 @@ audacity-Menus.obj: Menus.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3623,6 +3624,20 @@ audacity-Menus.obj: Menus.cpp
</span> @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o audacity-Menus.obj `if test -f 'Menus.cpp'; then $(CYGPATH_W) 'Menus.cpp'; else $(CYGPATH_W) '$(srcdir)/Menus.cpp'; fi`
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-avoid-clang-choke-on-confbase.diff b/audio/audacity/files/patch-avoid-clang-choke-on-confbase.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e9d394abed9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-avoid-clang-choke-on-confbase.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 66ed25b..11a9e24 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/toolbars/ToolManager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/toolbars/ToolManager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,6 +63,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../AllThemeResources.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../AudioIO.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../ImageManipulation.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// hack to deactivate a bit in wx/confbase.h on which clang chokes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __VMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../Prefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../Project.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../Theme.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-cmakefiles.diff b/audio/audacity/files/patch-cmakefiles.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..31a3cc833ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-cmakefiles.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,214 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index be2646a05b4287aa0d5e34863cb2c4402af73e68..1a018e367f18cacc73472224fc544f8d3bd22e60 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,14 +52,14 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define the OSX compatibility parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_OSX_ARCHITECTURES x86_64 CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_OSX_DEPLOYMENT_TARGET 10.7 CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set( CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This prevents a link error when building with the 10.9 or older SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME OFF )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Shouldn't cmake do this???
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string( APPEND CMAKE_CXX_FLAGS " -stdlib=libc++" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# string( APPEND CMAKE_CXX_FLAGS " -stdlib=libc++" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add our module path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,12 +74,14 @@ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_CXX_STANDARD 14 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Use ccache if available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_program( CCACHE_PROGRAM ccache )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-mark_as_advanced( FORCE CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Use ccache if requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( ${CMAKE_CXX_COMPILER_LAUNCHER} MATCHES "ccache" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( CCACHE_PROGRAM "${CMAKE_CXX_COMPILER_LAUNCHER}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mark_as_advanced( FORCE CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if( CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Our very own project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,6 +205,7 @@ if( CMAKE_CONFIGURATION_TYPES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( _DEST "${_DESTDIR}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( _PREFIX "${CMAKE_INSTALL_PREFIX}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/orig.CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 93dc50c..2a0c014 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/orig.CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1095,6 +1095,11 @@ list( APPEND LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:z>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:pthread>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list( APPEND LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $<$<CXX_COMPILER_ID:Clang>:atomic>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( BUILDING_AUDACITY YES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( INSTALL_PREFIX "${_PREFIX}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1182,22 +1187,23 @@ if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Bug 2400 workaround
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Replaces the SDK version in the built executable with 10.13 to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # prevent high CPU usage and slow drawing on Mojave or newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- check_for_platform_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( PLATFORM_VERSION_SUPPORTED )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,-platform_version,macos,10.7,10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,-sdk_version,10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## MacPorts will specify the SDK to use itself, thank you very much
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # Bug 2400 workaround
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # Replaces the SDK version in the built executable with 10.13 to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # prevent high CPU usage and slow drawing on Mojave or newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# check_for_platform_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if( PLATFORM_VERSION_SUPPORTED )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -Wl,-platform_version,macos,10.7,10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -Wl,-sdk_version,10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define Mac specific resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list( APPEND MAC_RESOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1240,6 +1246,9 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-framework AudioUnit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-framework CoreAudio"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-framework CoreAudioKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-framework AudioToolbox"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-framework Cocoa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-framework Carbon"
</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;'>+ # Use the Aqua theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1365,6 +1374,13 @@ source_group(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_sources( ${TARGET} PRIVATE ${HEADERS} ${SOURCES} ${RESOURCES} ${MAC_RESOURCES} ${WIN_RESOURCES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/VST/VSTEffect.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/ladspa/LadspaEffect.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/lv2/LoadLV2.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE effects/lv2/LoadLV2.cpp APPEND PROPERTY COMPILE_DEFINITIONS PKGLIBDIR="${PKGLIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(SOURCE export/ExportMP3.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options( ${TARGET} PRIVATE ${OPTIONS} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_options( ${TARGET} PRIVATE ${LDFLAGS} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1373,7 +1389,7 @@ target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If was have cmake 3.16 or higher, we can use precompiled headers, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # only use them if ccache is not available and the user hasn't disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" AND NOT CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd_option(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${_OPT}use_pch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Use precompiled headers [yes, no]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1390,10 +1406,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install( FILES "${_DEST}/Info.plist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${CMAKE_INSTALL_BINDIR}/Audacity.app/Contents" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install( PROGRAMS "${_EXEDIR}/${AUDACITY_NAME}" "${_EXEDIR}/Wrapper"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${CMAKE_INSTALL_BINDIR}/Audacity.app/Contents/MacOS" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( TARGETS ${TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RESOURCE DESTINATION "${_APPDIR}/Resources" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( PROGRAMS "${_EXEDIR}/${AUDACITY_NAME}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TYPE BIN )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1403,12 +1418,12 @@ if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILES_MATCHING PATTERN "*.so" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( FILES "${_INTDIR}/audacity.desktop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION "${_DATADIR}/applications" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install( FILES "${_SRCDIR}/audacity.xml"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${_DATADIR}/mime/packages" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install( FILES "${topdir}/presets/EQDefaultCurves.xml"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${_PKGDATA}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( FILES "${_SRCDIR}/audacity.xml"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${_DATADIR}/mime/packages" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install( FILES "${topdir}/presets/EQDefaultCurves.xml"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${_PKGDATA}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake-proxies/lv2/orig.CMakeLists.txt b/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 289688e..af8d37a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake-proxies/lv2/orig.CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,6 +150,9 @@ macro( bld name packages define sources )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PkgConfig::${pkg}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( ${name} STREQUAL "suil_qt5_in_cocoa")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list( APPEND libs PRIVATE "-framework Cocoa" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT missing )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list( APPEND DEFINES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,7 +190,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_PATH_SEP ":" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_DIR_SEP "/" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( LILV_DEFAULT_LV2_PATH "~/Library/Audio/Plug-Ins/LV2:~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:/Library/Audio/Plug-Ins/LV2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( LILV_DEFAULT_LV2_PATH "~/Library/Audio/Plug-Ins/LV2:~/.lv2:@PREFIX@/lib/lv2:/Library/Audio/Plug-Ins/LV2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_DIR "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_DIR_SEP "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,10 +198,18 @@ elseif( APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_GTK3_LIB_NAME "libgtk-x11-3.0.so.0" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_PREFIX "lib" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_EXT ".dylib" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ option(audacity_use_suil_qt5 "Whether to build the suil_qt5_in_cocoa GUI library for LV2 plugins" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( audacity_use_suil_qt5 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_check_modules( QT5 IMPORTED_TARGET "Qt5Widgets >= 5.1.0" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bld( "suil_qt5_in_cocoa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "QT5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "SUIL_WITH_COCOA_IN_QT5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${TARGET_ROOT}/suil/src/cocoa_in_qt5.mm" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif( UNIX )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_PATH_SEP ":" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( LILV_DIR_SEP "/" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( LILV_DEFAULT_LV2_PATH "~/.lv2:/usr/lib/lv2:/usr/local/lib/lv2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( LILV_DEFAULT_LV2_PATH "~/.lv2:@PREFIX@/lib/lv2:/usr/lib/lv2:/usr/local/lib/lv2" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_MODULE_DIR "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( SUIL_DIR_SEP "" )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-embed-wxW.diff b/audio/audacity/files/patch-embed-wxW.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9525d0b0237
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-embed-wxW.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 93dc50c821cd59b5be4fa74cc4c8e3fee161cfcb..bf6519cd7a059b81aa3f9f7a71ba658e1a965357 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1250,7 +1258,7 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file( audacity_config.h.in private/configmac.h )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy the wxWidgets libraries into the bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( "${CMAKE_GENERATOR}" MATCHES "Xcode" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if( "${CMAKE_GENERATOR}" MATCHES "Xcode" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1258,7 +1266,7 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sh -c "TARGET_BUILD_DIR=${_DEST} EXECUTABLE_PATH=MacOS/${AUDACITY_NAME} FRAMEWORKS_FOLDER_PATH=Frameworks ${topdir}/mac/scripts/install_wxlibs.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define the Wrapper target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( WRAPPER_ROOT "${TARGET_ROOT}/../mac" )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-fix-audiounits.diff b/audio/audacity/files/patch-fix-audiounits.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 809b52d29a9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-fix-audiounits.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,138 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1f1e3347b..fe10404fb 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23814,7 +23814,7 @@ esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${host_os}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin* | rhapsody*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="-framework CoreAudio $LIBS -lz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="-framework CoreAudio -framework CoreAudioKit $LIBS -lz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cygwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Makefile.am b/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e61be0e4e..cd0b45fd7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -710,6 +710,8 @@ audacity_LDADD += $(AUDIOUNITS_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- audacity_SOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- effects/audiounits/AudioUnitEffect.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- effects/audiounits/AudioUnitEffect.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ effects/audiounits/AUControl.mm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ effects/audiounits/AUControl.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Makefile.in b/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d28e7abc1..6fa29336d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,6 +85,8 @@ bin_PROGRAMS = audacity$(EXEEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_AUDIO_UNITS_TRUE@am__append_3 = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_AUDIO_UNITS_TRUE@ effects/audiounits/AudioUnitEffect.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_AUDIO_UNITS_TRUE@ effects/audiounits/AudioUnitEffect.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@USE_AUDIO_UNITS_TRUE@ effects/audiounits/AUControl.mm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@USE_AUDIO_UNITS_TRUE@ effects/audiounits/AUControl.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_AUDIO_UNITS_TRUE@ $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_FFMPEG_TRUE@am__append_4 = $(FFMPEG_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,7 +551,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- widgets/wxPanelWrapper.h xml/XMLFileReader.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xml/XMLFileReader.h xml/XMLWriter.cpp xml/XMLWriter.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- effects/audiounits/AudioUnitEffect.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- effects/audiounits/AudioUnitEffect.h export/ExportFFmpeg.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ effects/audiounits/AudioUnitEffect.h effects/audiounits/AUControl.mm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ effects/audiounits/AUControl.h export/ExportFFmpeg.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export/ExportFFmpeg.h export/ExportFFmpegDialogs.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export/ExportFFmpegDialogs.h import/ImportFFmpeg.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import/ImportFFmpeg.h import/ImportGStreamer.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -581,7 +584,8 @@ am__objects_1 = audacity-BlockFile.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blockfile/audacity-SilentBlockFile.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blockfile/audacity-SimpleBlockFile.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xml/audacity-XMLTagHandler.$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@USE_AUDIO_UNITS_TRUE@am__objects_2 = effects/audiounits/audacity-AudioUnitEffect.$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@USE_AUDIO_UNITS_TRUE@am__objects_2 = effects/audiounits/audacity-AudioUnitEffect.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@USE_AUDIO_UNITS_TRUE@ effects/audiounits/audacity-AUControl.$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_FFMPEG_TRUE@am__objects_3 = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_FFMPEG_TRUE@ export/audacity-ExportFFmpeg.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @USE_FFMPEG_TRUE@ export/audacity-ExportFFmpegDialogs.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2294,6 +2298,9 @@ effects/audiounits/$(DEPDIR)/$(am__dirstamp):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- effects/audiounits/audacity-AudioUnitEffect.$(OBJEXT): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- effects/audiounits/$(am__dirstamp) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- effects/audiounits/$(DEPDIR)/$(am__dirstamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+effects/audiounits/audacity-AUControl.$(OBJEXT): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ effects/audiounits/$(am__dirstamp) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ effects/audiounits/$(DEPDIR)/$(am__dirstamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export/audacity-ExportFFmpeg.$(OBJEXT): export/$(am__dirstamp) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export/$(DEPDIR)/$(am__dirstamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export/audacity-ExportFFmpegDialogs.$(OBJEXT): export/$(am__dirstamp) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2590,6 +2597,7 @@ distclean-compile:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Wahwah.Po@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Po@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTEffect.Po@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@AMDEP_TRUE@@am__include@ @am__quote@effects/audiounits/$(DEPDIR)/audacity-AUControl.Po@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@effects/audiounits/$(DEPDIR)/audacity-AudioUnitEffect.Po@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@effects/ladspa/$(DEPDIR)/audacity-LadspaEffect.Po@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@effects/lv2/$(DEPDIR)/audacity-LV2Effect.Po@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7195,6 +7203,20 @@ effects/audiounits/audacity-AudioUnitEffect.obj: effects/audiounits/AudioUnitEff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/audiounits/audacity-AudioUnitEffect.obj `if test -f 'effects/audiounits/AudioUnitEffect.cpp'; then $(CYGPATH_W) 'effects/audiounits/AudioUnitEffect.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/audiounits/AudioUnitEffect.cpp'; fi`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+effects/audiounits/audacity-AUControl.o: effects/audiounits/AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/audiounits/audacity-AUControl.o -MD -MP -MF effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo -c -o effects/audiounits/audacity-AUControl.o `test -f 'effects/audiounits/AUControl.mm' || echo '$(srcdir)/'`effects/audiounits/AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo effects/audiounits/$(DEPDIR)/audacity-AUControl.Po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='effects/audiounits/AUControl.mm' object='effects/audiounits/audacity-AUControl.o' libtool=no @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/audiounits/audacity-AUControl.o `test -f 'effects/audiounits/AUControl.mm' || echo '$(srcdir)/'`effects/audiounits/AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+effects/audiounits/audacity-AUControl.obj: effects/audiounits/AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/audiounits/audacity-AUControl.obj -MD -MP -MF effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo -c -o effects/audiounits/audacity-AUControl.obj `if test -f 'effects/audiounits/AUControl.mm'; then $(CYGPATH_W) 'effects/audiounits/AUControl.mm'; else $(CYGPATH_W) '$(srcdir)/effects/audiounits/AUControl.mm'; fi`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo effects/audiounits/$(DEPDIR)/audacity-AUControl.Po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='effects/audiounits/AUControl.mm' object='effects/audiounits/audacity-AUControl.obj' libtool=no @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/audiounits/audacity-AUControl.obj `if test -f 'effects/audiounits/AUControl.mm'; then $(CYGPATH_W) 'effects/audiounits/AUControl.mm'; else $(CYGPATH_W) '$(srcdir)/effects/audiounits/AUControl.mm'; fi`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export/audacity-ExportFFmpeg.o: export/ExportFFmpeg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT export/audacity-ExportFFmpeg.o -MD -MP -MF export/$(DEPDIR)/audacity-ExportFFmpeg.Tpo -c -o export/audacity-ExportFFmpeg.o `test -f 'export/ExportFFmpeg.cpp' || echo '$(srcdir)/'`export/ExportFFmpeg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) export/$(DEPDIR)/audacity-ExportFFmpeg.Tpo export/$(DEPDIR)/audacity-ExportFFmpeg.Po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/effects/audiounits/AUControl.mm b/src/effects/audiounits/AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9e2198384..2164fe223 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/effects/audiounits/AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/effects/audiounits/AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,23 +173,31 @@ bool AUControl::Create(wxWindow *parent, AudioComponent comp, AudioUnit unit, bo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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:#ffe0e0;'>-- if (!mView && !mHIView)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!mView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(_LP64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && !mHIView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CreateGeneric();
</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:#ffe0e0;'>-- if (!mView && !mHIView)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!mView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(_LP64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && !mHIView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</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:#ffe0e0;'>- // wxWidgets takes ownership so safenew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SetPeer(safenew AUControlImpl(this, mAUView));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(_LP64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mHIView)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CreateCarbonOverlay();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Must get the size again since SetPeer() could cause it to change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SetInitialSize(GetMinSize());
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-fix-casts.diff b/audio/audacity/files/patch-fix-casts.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7a165ddcf0e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-fix-casts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3cd95bd1c339ea1a744849562f387161d8be3ea2..b69547e22e6444c676c3eca98754139743da7183 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/effects/VST/VSTEffect.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/effects/VST/VSTEffect.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1110,7 +1110,9 @@ void VSTEffect::BundleDeleter::operator() (void* p) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void VSTEffect::ResourceDeleter::operator() (void *p) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mpHandle) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int resource = (int)p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // take a detour to avoid a "fatal warning" about losing data downcasting a void* to int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t dum = size_t(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int resource = int(dum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleCloseBundleResourceMap(mpHandle->get(), resource);
</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;color:#808080;'>diff --git a/audio/audacity/files/patch-implement-progdial=beep.diff b/audio/audacity/files/patch-implement-progdial=beep.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c89eb77b017..a3d235bd3f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-implement-progdial=beep.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-implement-progdial=beep.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c81c69b9598948534b2dfbd2258103e37337a58c..59a05e5ff71eb8b305a97e8d6662bd2228d59b42 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a5064be23..b79c1bbc0 100644
</span> --- a/src/widgets/ProgressDialog.cpp
+++ b/src/widgets/ProgressDialog.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,6 +53,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +52,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include "../Prefs.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../Internat.h"
</span>
+#ifdef __WXOSX_COCOA__
+extern "C" void NSBeep(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,9 +13,9 @@ index c81c69b9598948534b2dfbd2258103e37337a58c..59a05e5ff71eb8b305a97e8d6662bd22
</span> // This really should be a Preferences setting
static const unsigned char beep[] =
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1595,7 +1599,13 @@ void ProgressDialog::Beep() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1615,7 +1619,13 @@ void ProgressDialog::Beep() const
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (name.IsEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name.empty())
</span> {
+#ifdef __WXOSX_COCOA__
+ // wxSound::Create(size_t,const void*) isn't implemented;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-libnyquist-symbol-visibility.diff b/audio/audacity/files/patch-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c65f155eb69..4dcdae61367 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.c b/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 178a33f..9f0a68e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 178a33fd7..9f0a68e90 100644
</span> --- a/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.c
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.c
@@ -15,4 +15,12 @@ void set_slider(int index, float value)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ index 178a33f..9f0a68e 100644
</span> +}
\ No newline at end of file
diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.h b/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 93f0f85..fa20ecb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 93f0f851c..fa20ecb47 100644
</span> --- a/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.h
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sliderdata.h
@@ -10,3 +10,4 @@ extern float slider_array[SLIDERS_MAX];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,23 +28,25 @@ index 93f0f85..fa20ecb 100644
</span> +float get_slider(int index);
\ No newline at end of file
diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sndsliders.c b/lib-src/libnyquist/nyquist/nyqsrc/sndsliders.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7fd9ac6..80ebdbf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2cf5f36b9..bec767866 100644
</span> --- a/lib-src/libnyquist/nyquist/nyqsrc/sndsliders.c
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sndsliders.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,7 +17,7 @@ LVAL xslider_read(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int index = getfixnum(arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,8 @@ LVAL xslider_read(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int index = (int) getfixnum(arg);
</span> xllastarg();
if (index >= 0 && index < SLIDERS_MAX) {
- return cvflonum(slider_array[index]);
<span style='display:block; white-space:pre;background:#e0ffe0;'>++// return cvflonum(slider_array[index]);
</span> + return cvflonum(get_slider(index));
}
return NIL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +91,7 @@ void slider__fetch(snd_susp_type a_susp, snd_list_type snd_list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +92,8 @@ void slider__fetch(snd_susp_type a_susp, snd_list_type snd_list)
</span> }
n = togo;
- c_reg = slider_array[susp->index];
<span style='display:block; white-space:pre;background:#e0ffe0;'>++// c_reg = slider_array[susp->index];
</span> + c_reg = get_slider(susp->index);
out_ptr_reg = out_ptr;
if (n) do { /* the inner sample computation loop */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-more-decent-font-sizes.diff b/audio/audacity/files/patch-more-decent-font-sizes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index be0edfd91ea..8a052f58397 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-more-decent-font-sizes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-more-decent-font-sizes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +1,36 @@
</span> diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 085caa441..31ee03972 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4c8937a0b..63448d123 100644
</span> --- a/src/widgets/NumericTextCtrl.cpp
+++ b/src/widgets/NumericTextCtrl.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1258,8 +1258,8 @@ NumericTextCtrl::NumericTextCtrl(wxWindow *parent, wxWindowID id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1371,8 +1371,8 @@ NumericTextCtrl::NumericTextCtrl(wxWindow *parent, wxWindowID id,
</span> {
mAllowInvalidValue = false;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- mDigitBoxW = 10;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mDigitBoxH = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mDigitBoxW = 11;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mDigitBoxH = 19;
</span> + mDigitBoxW = 8;
+ mDigitBoxH = 14;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mReadOnly = options.readOnly;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mMenuEnabled = options.menuEnabled;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mBorderLeft = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mBorderTop = 1;
</span> diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3895bfe36..5860d3ee4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8dc4d0a65..649974d18 100644
</span> --- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1009,10 +1009,10 @@ void Ruler::Update(const TimeTrack* timetrack)// Envelope *speedEnv, long minSpe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int desiredPixelHeight;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1001,14 +1001,14 @@ static constexpr int MinPixelHeight =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __WXMSW__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const int MinPixelHeight = 10; // 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const int MinPixelHeight = 7; // 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const int MaxPixelHeight =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __WXMAC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static constexpr int MaxPixelHeight =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __WXMSW__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif __WXMAC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 9;
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12;
</span> #endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-no-libatomic.diff b/audio/audacity/files/patch-no-libatomic.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7048c2297de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-no-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,141 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e9f23be5471f718b42e290c44d19634e16bc2610..810d7088245c4173efecf94991d8c1cb7230f66e 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19205,10 +19205,6 @@ if test x$enable_universal_binary = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ($CXX --version | grep 'clang version' > /dev/null); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$enable_sse = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23741,6 +23737,36 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error $? "dlopen not found, required by Audacity" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if std::atomic requires libatomic" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking if std::atomic requires libatomic... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <atomic>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::atomic<std::int64_t> v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool f = std::atomic<double>{}.is_lock_free();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return v && f;
</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;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ac_fn_cxx_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STD_ATOMIC_NEED_LIBATOMIC=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STD_ATOMIC_NEED_LIBATOMIC=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: adding -latomic to LDFLAGS" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "adding -latomic to LDFLAGS" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk3 use in wxWidgets" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for gtk3 use in wxWidgets... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${WX_CXXFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 40fc326685dca2bd159321283d3d09bb0e8b7d55..dbb0c7a6672bae9c4a935c66fb7426ff1425f26f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,14 +200,6 @@ if test x$enable_universal_binary = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl Check if $CXX is clang by evaluating the version string because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl Use /dev/null to suppress grep output to shell.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ($CXX --version | grep 'clang version' > /dev/null); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$enable_sse = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,6 +597,25 @@ case "${host_os}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([dlopen not found, required by Audacity])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dnl Check if we need to pull in libatomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dnl (assuming std::atomic is provided by libatomic in that case)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_CHECKING([if std::atomic requires libatomic])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_LINK_IFELSE([AC_LANG_SOURCE([[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <atomic>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::atomic<std::int64_t> v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool f = std::atomic<double>{}.is_lock_free();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return v && f;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([adding -latomic to LDFLAGS])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for gtk3 use in wxWidgets])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${WX_CXXFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_EGREP_CPP(wxWidgets built with GTK3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## index 44efd36dcb2926a018b1548411b8966c8bd238dd..f550c73d248600e79294c51e9f79d9d45647e867 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## --- a/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## +++ b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## @@ -19208,9 +19208,13 @@ if test x$enable_universal_binary = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## -if ($CXX --version | grep 'clang version' > /dev/null); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## - LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## -fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## +case $host_os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + linux* | gnu*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + if ($CXX --version | grep 'clang version' > /dev/null); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## +esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## if test x$enable_sse = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## index 4aadfbe6283d24db56d59f974be8adde7d91b49b..c10962af798a1b66eea1c1eaa7c42532aef95913 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## --- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## +++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## @@ -208,9 +208,13 @@ dnl Check if $CXX is clang by evaluating the version string because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## dnl Use /dev/null to suppress grep output to shell.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## -if ($CXX --version | grep 'clang version' > /dev/null); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## - LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## -fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## +case $host_os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + linux* | gnu*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + if ($CXX --version | grep 'clang version' > /dev/null); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + LDFLAGS="${LDFLAGS} -latomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## + ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## +esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## if test x$enable_sse = xyes; then
</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;color:#808080;'>diff --git a/audio/audacity/files/patch-python.diff b/audio/audacity/files/patch-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bf1b57b71d6..351ecd99310 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,60 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib-src/lv2/build b/lib-src/lv2/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3ef13a0..5cd7506 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/lv2/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/lv2/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,29 +16,31 @@ function waf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkg=$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pushd >/dev/null ${pkg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(which python python2 | tail -1) waf --prefix="." --include="." $@ build || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@PYTHON@@ waf --prefix="." --include="." $@ build || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- popd >/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- . .buildvars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -e ${pkg}/build/*.a ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pushd obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p obj.${pkg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pushd obj.${pkg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ar vx ../${pkg}/build/*.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ar vq ../liblv2.a *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- popd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -rf obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</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:#ffe0e0;'>- [ -e liblv2.a ] && exit 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--waf lv2 --no-plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--waf serd --static --no-shared --no-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--waf sord --static --no-shared --no-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--waf sratom --static --no-shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--waf lilv --static --no-shared --no-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--waf suil --static --no-shared --no-qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+waf lv2 -vvv --no-plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+waf serd -vvv --static --no-shared --no-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+waf sord -vvv --static --no-shared --no-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+waf sratom -vvv --static --no-shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+waf lilv -vvv --static --no-shared --no-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+waf suil -vvv --static --no-shared --no-qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# now create liblv2.a in a single call
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libtool -static -o liblv2.a obj.serd/*.o obj.sord/*.o obj.sratom/*.o obj.lilv/*.o obj.suil/*.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ar -sv liblv2.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 0
</span> diff --git a/lib-src/lv2/configure b/lib-src/lv2/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 05ddb59..488883e 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3fc9091d8..162fb43a6 100755
</span> --- a/lib-src/lv2/configure
+++ b/lib-src/lv2/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@ function waf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #!/bin/bash
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(which python python2 | tail -1) waf --prefix="." --include="." $@ configure || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@PYTHON@@ waf --prefix="." --include="." $@ configure || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- popd >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Search for python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python=$(which python python2 python3 | tail -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python=@@PYTHON@@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "${pkg}" == "lv2" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define the target build directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=$(pwd)/build
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-skip-gcc-version-test.diff b/audio/audacity/files/patch-skip-gcc-version-test.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c24fc5d8abf..f65d364ace6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-skip-gcc-version-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-skip-gcc-version-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git a/src/Audacity.h b/src/Audacity.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 311a38bfb8534332f0ae41bb681d0d6a56cb6a31..56de5d1c259f41dc707e9ddce387fc9649f6ce6d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3c577790c..900d3a395 100644
</span> --- a/src/Audacity.h
+++ b/src/Audacity.h
@@ -26,11 +26,11 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-src-memoryx-disable-snowleopard-fix.diff b/audio/audacity/files/patch-src-memoryx-disable-snowleopard-fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 44eed3293df..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-src-memoryx-disable-snowleopard-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/MemoryX.h.old 2017-11-18 15:43:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/MemoryX.h 2017-11-18 15:43:51.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // std:: containers knowing about rvalue references
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef __AUDACITY_OLD_STD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED <= __MAC_10_6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __AUDACITY_OLD_STD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-temp-fixes.diff b/audio/audacity/files/patch-temp-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fdfa3c136b2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/MemoryX.h b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/MemoryX.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // C++ standard header <memory> with a few extensions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef safenew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define safenew new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><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 dc367c2dced..af103e7bf38 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;'>@@ -1,13 +1,13 @@
</span> diff --git a/src/MemoryX.h b/src/MemoryX.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 56e99171a9eb87fe574291d0ec9d086efb0c1fbb..621afa3001ba354f36e80edb86c72a45dca426cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34cbe3c34bb5e17a9cfacaec6813e5bf72525ecb..cf1eeee8f104f8420c30318db8bbe4d4a92e001d 100644
</span> --- a/src/MemoryX.h
+++ b/src/MemoryX.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1171,7 +1173,7 @@ namespace std
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace tr1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<> struct hash< wxString > {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t operator () (const wxString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -628,7 +628,7 @@ make_iterator_range( const Container &container )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // For using std::unordered_map on wxString
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace std
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// template<typename T> struct hash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> struct hash< wxString > {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t operator () (const wxString &str) const // noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-use-MPffmpeg.diff b/audio/audacity/files/patch-use-MPffmpeg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7c8966de523
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-use-MPffmpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 78493992b..918309607 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/FFmpeg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/FFmpeg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -646,17 +646,16 @@ bool FFmpegLibs::FindLibs(wxWindow *parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxString path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxString name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // If we're looking for the lib, use the standard name, as the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // configured name is not found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- name = GetLibAVFormatName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxLogMessage(wxT("Looking for FFmpeg libraries..."));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!mLibAVFormatPath.empty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxLogMessage(wxT("mLibAVFormatPath ('%s') is not empty."), mLibAVFormatPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const wxFileName fn{ mLibAVFormatPath };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = fn.GetPath();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ name = fn.GetFullName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = GetLibAVFormatPath();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ name = GetLibAVFormatName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxLogMessage(wxT("mLibAVFormatPath is empty, starting with path '%s', name '%s'."),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path, name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/FFmpeg.h b/src/FFmpeg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 858eb772b..af03ef1da 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/FFmpeg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/FFmpeg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,22 +291,16 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxString GetLibAVFormatName()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (sizeof(void*) == 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (wxT("ffmpeg.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".64bit.dylib"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (wxT("libavformat.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dylib"));
</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;'>+ wxString GetLibAVCodecName()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (sizeof(void*) == 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (wxT("ffmpeg_codecs.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".64bit.dylib"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (wxT("libavcodec.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dylib"));
</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;'>+ wxString GetLibAVUtilName()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (sizeof(void*) == 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (wxT("ffmpeg_utils.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".64bit.dylib"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (wxT("libavutil.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dylib"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-use-MPlame.diff b/audio/audacity/files/patch-use-MPlame.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..42be952cdd5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-use-MPlame.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/export/ExportMP3.h b/src/export/ExportMP3.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 11528fe83..8594fe0f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/export/ExportMP3.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/export/ExportMP3.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@ enum MP3RateMode : unsigned {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template< typename Enum > class EnumSetting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern EnumSetting< MP3RateMode > MP3RateModeSetting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__WXMSW__) || defined(__WXMAC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__WXMSW__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MP3_EXPORT_BUILT_IN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-vstcontrolosx.diff b/audio/audacity/files/patch-vstcontrolosx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 28246e3ee98..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-vstcontrolosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/effects/VST/VSTControlOSX.mm b/src/effects/VST/VSTControlOSX.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3f289ad..879f2e0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/effects/VST/VSTControlOSX.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/effects/VST/VSTControlOSX.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,9 +107,13 @@ bool VSTControl::Create(wxWindow *parent, VSTEffectLink *link)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CreateCarbon();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!mHIView)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!mView && !mHIView)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!mView)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-wxw-303.diff b/audio/audacity/files/patch-wxw-303.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d0f5203c0be..7e7a11d505d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/patch-wxw-303.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/patch-wxw-303.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,99 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.h b/lib-src/FileDialog/mac/FileDialogPrivate.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 697969fd2a31d24501361b71bfc076f37671f813..a2db97e9f21661e874984c01d8375b44d93ecd16 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/FileDialog/mac/FileDialogPrivate.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/FileDialog/mac/FileDialogPrivate.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +96,9 @@ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dbca45efd..7555e7dcc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/ShuttleGui.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/ShuttleGui.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,9 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxStaticBoxWrapper( Args &&...args )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : wxStaticBox( std::forward<Args>(args)... )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_container.EnableSelfFocus();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if wxCHECK_VERSION(3, 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_container.EnableSelfFocus();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/widgets/FileDialog/mac/FileDialogPrivate.h b/src/widgets/FileDialog/mac/FileDialogPrivate.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e4a7ee129..1ee046b5b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/widgets/FileDialog/mac/FileDialogPrivate.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/widgets/FileDialog/mac/FileDialogPrivate.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,8 +96,10 @@ protected:
</span> int m_firstFileTypeFilter;
wxArrayString m_currentExtensions;
WX_NSObject m_delegate;
+#if !wxCHECK_VERSION(3, 0, 3)
WX_NSObject m_sheetDelegate;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxString m_noOverwritePromptFilename;
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 508d8b8002dc18b17c8700f9eb7061c4178e0e6b..a9429f90f5418035152b678108dd7a97c9158653 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/FileDialog/mac/FileDialogPrivate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,7 +143,9 @@ void FileDialog::Init()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_filterIndex = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_delegate = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !wxCHECK_VERSION(3, 0, 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_sheetDelegate = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_filterPanel = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_filterChoice = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,14 +156,17 @@ void FileDialog::Create(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !wxCHECK_VERSION(3, 0, 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_sheetDelegate = [[ModalDialogDelegate alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [(ModalDialogDelegate*)m_sheetDelegate setImplementation: this];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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:#ffe0e0;'>- FileDialog::~FileDialog()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !wxCHECK_VERSION(3, 0, 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [m_sheetDelegate release];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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:#ffe0e0;'>- bool FileDialog::SupportsExtraControl() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -311,12 +316,26 @@ void FileDialog::ShowWindowModal()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [sPanel setAllowsOtherFileTypes:NO];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSWindow* nativeParent = parentWindow->GetWXWindow();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if wxCHECK_VERSION(3, 0, 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // the ModalDialogDelegate class is no longer exported, but the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // beginSheetForDirectory: message has been deprecated since 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Use the modern equivalent:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [sPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() isDirectory:YES]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [sPanel setNameFieldStringValue:file.AsNSString()];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [sPanel beginSheetModalForWindow:nativeParent completionHandler:^(NSInteger result) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (result == NSFileHandlingPanelOKButton) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSLog(@"Saved file %@", [sPanel URL]);
</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:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [sPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- modalForWindow: nativeParent modalDelegate: m_sheetDelegate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modalForWindow: nativeParent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modalDelegate: m_sheetDelegate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contextInfo: nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSOpenPanel* oPanel = [NSOpenPanel openPanel];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -330,11 +349,22 @@ void FileDialog::ShowWindowModal()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSWindow* nativeParent = parentWindow->GetWXWindow();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if wxCHECK_VERSION(3, 0, 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() isDirectory:YES]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [oPanel setNameFieldStringValue:file.AsNSString()];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [oPanel setAllowedFileTypes:types];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [oPanel beginSheetModalForWindow:nativeParent completionHandler:^(NSInteger result) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (result == NSFileHandlingPanelOKButton) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSLog(@"Opened file(s) %@", [oPanel URLs]);
</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:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [oPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- types: types modalForWindow: nativeParent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modalDelegate: m_sheetDelegate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contextInfo: nil];
</span> +#endif
<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;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Common part of all ctors.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/portaudio-no-universal-build.diff b/audio/audacity/files/portaudio-no-universal-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c0bcd33b410..1df15cfbdf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/portaudio-no-universal-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/portaudio-no-universal-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,8 @@
</span> diff --git a/lib-src/portaudio-v19/configure b/lib-src/portaudio-v19/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 96cd326..cd47b0a 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib-src/portaudio-v19/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib-src/portaudio-v19/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2774,7 +2774,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_mac_universal+set}" = set; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enableval=$enable_mac_universal; enable_mac_universal=$enableval
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- enable_mac_universal="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ enable_mac_universal="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</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;'>+index 9d32fccd4..8582db0a4 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Binary files a/lib-src/portaudio-v19/configure and b/lib-src/portaudio-v19/configure differ
</span> diff --git a/lib-src/portaudio-v19/configure.in b/lib-src/portaudio-v19/configure.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0f90c10..57b1403 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a3628bd09..9df623576 100644
</span> --- a/lib-src/portaudio-v19/configure.in
+++ b/lib-src/portaudio-v19/configure.in
@@ -86,7 +86,7 @@ AC_ARG_ENABLE(mac-debug,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/src-Makefile-for-osx.diff b/audio/audacity/files/src-Makefile-for-osx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 50c8ce9643c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/src-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Makefile.am b/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e61be0e4e..c45cb3080 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,8 +79,9 @@ audacity_CPPFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--audacity_CXXFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-unused-local-typedefs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#audacity_CXXFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -Wno-unused-local-typedefs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+audacity_CXXFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- audacity_LDFLAGS = -rdynamic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- audacity_LDADD = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Makefile.in b/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d28e7abc1..63b795932 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1287,8 +1287,9 @@ audacity_CPPFLAGS = -std=c++11 -Wno-deprecated-declarations \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--audacity_CXXFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-unused-local-typedefs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#audacity_CXXFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -Wno-unused-local-typedefs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+audacity_CXXFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- audacity_LDFLAGS = -rdynamic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- audacity_LDADD = $(EXPAT_LIBS) $(FILEDIALOG_LIBS) $(PORTAUDIO_LIBS) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/vocalremover.ny b/audio/audacity/files/vocalremover.ny
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..00177df668c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/vocalremover.ny
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,140 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$nyquist plug-in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$version 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$type process
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$preview linear
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$name (_ "Vocal Remover")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$manpage "Vocal_Remover"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$action (_ "Removing center-panned audio...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$author (_ "Steve Daulton")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$release 2.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$copyright (_ "Released under terms of the GNU General Public License version 2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; This version of vocalremover.ny by Steve Daulton June 2013.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; based on Center pan Remover by David R. Sky November 12, 2004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; Modified by Gale Andrews January 2008 to make full spectrum removal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; the default, restore a single Help screen and restore error checking.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; Thanks to David Hostetler for notes in his own vocal remover plug-in,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; http://www.freelists.org/archives/audacity4blind/06-2006/msg00049.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; Released under terms of the GNU General Public License version 2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; For information about writing and modifying Nyquist plug-ins:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$control action (_ "Remove vocals or view Help") choice (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (_ "Remove Vocals")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (_ "View Help")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$control band-choice (_ "Removal choice") choice (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ("Simple" (_ "Simple (Entire Spectrum)"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ("Remove" (_ "Remove Frequency Band"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ("Retain" (_ "Retain Frequency Band"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$control low-range (_ "Frequency band from (Hz)") float-text "" 500 0 nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$control high-range (_ "Frequency band to (Hz)") float-text "" 2000 0 nil
</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;'>+(defun help ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (let ((msg (format nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(_ "Vocal Remover requires a stereo track. It works best with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lossless files like WAV or AIFF, rather than MP3 or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+other compressed formats. It only removes vocals or other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+audio that is panned to center (sounds equally loud in left
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and right). Vocals may be mixed this way. Inverting one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+channel then panning both to center cancels out any audio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which was originally center-panned, making it inaudible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This can remove some parts of the audio you may want to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+keep, such as drums, which are also often mixed to center.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If the vocals and other centered parts differ in pitch,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+this can be solved by removing only selected frequencies.~%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Vocal Remover thus has three choices of removal method.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+'Simple' inverts the entire frequency spectrum of one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+channel. This may remove too much music if other parts of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the audio are centered as well as the vocals. In that case,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+try the other choices. If the vocals are at a different
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pitch than the other audio (such as a high female voice),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+try 'Remove frequency band'. This only removes frequencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+between a lower and upper limit which you can enter in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+'Frequency band...' boxes. Experiment by entering what
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sounds like the most significant frequency range of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+original vocals. If the other choices remove too much
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+audio in a particular frequency range (such as low drums
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+or bass), try 'Retain frequency band'. This only removes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+frequencies outside the limits, retaining the others."))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (format t "~a" msg) ;print to debug (coppying supported on all platforms)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg)) ;return message
</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;'>+(defun check-stereo ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (when (soundp *track*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (throw 'err (format nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(_ "~%Vocal Remover requires an unsplit, stereo track.~%~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If you have a stereo track split into left and right~%~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+channels, use 'Make Stereo Track' on the Track~%~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Drop-Down Menu, then run Vocal Remover again.~%")))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(defmacro validate (Hz)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; Filters become unstable when very close to 0 Hz or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; to Nyquist frequency, so return NIL to disable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `(if (or (< ,Hz 1)(> ,hz (- (/ *sound-srate* 2) 1)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (setf ,Hz nil)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;;; Ensure frequency range is valid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(defun check-range ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; Ensure min < max
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (when (< high-range low-range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (let ((temp low-range))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (setf low-range high-range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (setf high-range temp)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (validate low-range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (validate high-range))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(defun bandpass (sig low high)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cond
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((and low high) ;bandpass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (lowpass8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (highpass8 sig low)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ high))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (low (highpass8 sig low))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (high (lowpass8 sig high))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (t sig)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(defun bandstop (sig low high)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (if (and low high (< (/ (- high low) low) 0.1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (format t (_ "Warning:~%~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Selected band-stop filter is~%~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~a Hz to ~a Hz.~%~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ A very narrow stop-band filter may have~%~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unexpected results.~%~%")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ low high))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (let ((low-sig (if low (lowpass8 sig low)(s-rest 1))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ low-sig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (if high (highpass8 (diff sig low-sig) high)(s-rest 1)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(defun CentrePanRemove ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (check-stereo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (check-range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cond
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((= band-choice 1) ; remove frequencies inside range
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sum (aref *track* 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (mult -1 (aref *track* 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (bandstop (aref *track* 1) low-range high-range)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Nothing to remove - skip effect.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((and (= band-choice 2)(not low-range)(not high-range))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (format t (_ "Current settings returned the original audio."))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((= band-choice 2) ; remove frequencies inside range
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sum (aref *track* 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (mult -1 (aref *track* 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (bandpass (aref *track* 1) low-range high-range)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (t ; invert and add right to left channel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sum (aref *track* 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (mult -1 (aref *track* 1))))))
</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;'>+(if (= action 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (help)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (catch 'err (CentrePanRemove)))
</span></pre><pre style='margin:0'>
</pre>