<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9564abd4d262750d2ea741e160f2be14927bf157">https://github.com/macports/macports-ports/commit/9564abd4d262750d2ea741e160f2be14927bf157</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 9564abd4d26 audacity: update to 3.5.1
</span>9564abd4d26 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9564abd4d262750d2ea741e160f2be14927bf157
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Thu May 9 22:57:05 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> audacity: update to 3.5.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove obsolete audacity-devel port
</span><span style='display:block; white-space:pre;color:#404040;'> - Move audacity-legacy to separate port
</span><span style='display:block; white-space:pre;color:#404040;'> - Take over maintainership per ticket
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69939
</span>---
audio/{audacity => audacity-legacy}/Portfile | 161 ++----
.../files/add_enGB_translation.diff | 0
.../files/buildinfo-clarify-no-gstreamer.diff | 0
.../files/patch-aboutdlg-compiler.diff | 0
.../files/patch-add-MenusMac.diff | 0
.../files/patch-avoid-clang-choke-on-confbase.diff | 0
.../files/patch-cmakefiles.diff | 0
.../files/patch-embed-wxW.diff | 0
.../files/patch-implement-progdial=beep.diff | 0
.../files/patch-libnyquist-symbol-visibility.diff | 0
.../files/patch-more-decent-font-sizes.diff | 0
.../files/patch-no-libatomic.diff | 0
.../files/patch-python.diff | 0
.../files/patch-skip-gcc-version-test.diff | 0
.../files/patch-unordered_map-fixes.diff | 0
.../files/patch-use-MPffmpeg.diff | 0
.../files/patch-use-MPlame.diff | 0
.../files/patch-wxw-303.diff | 0
.../files/portaudio-no-universal-build.diff | 0
.../files/vocalremover.ny | 0
audio/audacity/Portfile | 539 +++------------------
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 | 13 -
audio/audacity/files/devel/patch-wxw-31x.diff | 18 -
audio/audacity/files/patch-offline-manual.diff | 19 +
28 files changed, 118 insertions(+), 934 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/Portfile b/audio/audacity-legacy/Portfile
</span>similarity index 69%
copy from audio/audacity/Portfile
copy to audio/audacity-legacy/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 9981edb736d..636bfecc6ba 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-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,44 +4,14 @@ PortSystem 1.0
</span>
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name audacity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name audacity-legacy
</span> categories audio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span> license GPL-2+
universal_variant no
set aud_app_path ${applications_dir}/Audacity.app
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-subport "${name}-manual" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "${name}-manual"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description The manual for audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description {*}${description}. Users of port:audacity-legacy may prefer to use the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- online manual instead of installing this port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity-manual 3.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://manual.audacityteam.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8e8916ad861888538ca2844c107470a262651222 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f30068e8eabe70b001e4fc2f6ace6b6e87b815d3bd756902485a960e41523e93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23695970
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run path:bin/audacity:audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installs_libs no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms {darwin any}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/manual ${destroot}${aud_app_path}/Contents/help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform linux {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/audacity/help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/manual ${destroot}${prefix}/share/audacity/help
</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;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant wxsystem description {Depend on wxWidgets from MacPorts} {}
# PortGroups for the main ports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,56 +31,28 @@ 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-legacy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n This version of the port provides the last release using the legacy file format. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The newer v3 versions can import the legacy .aup projects but can only \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write in a new .aup3 format that the older versions cannot import! Use this port \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if you have a need to exchange native projects with people using Audacity versions \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- older than 3.0.0 .
</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;'>-subport audacity-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</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;'>-if {${subport} eq "${name}-legacy"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # get the source tarball from github because it contains all required external libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # incl. those not in MacPorts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity 2.4.2 Audacity-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d9e04c029a144800e378a6b5464c74f3fdb2a7e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 032273e2408ad51f97c6846ac8d8fe9e4a3fbc6e4c620e630ea4c1d0124d9a94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 61254313
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PPREFIX ./
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant wx30 conflicts wx32 requires wxsystem description {build against wxWidgets-3.0} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts "${name}-legacy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## 576b7e66 looks like possibly the last commit before the takeover by the new project owner:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity 576b7e66d2b96c39241d3d992259fc2bfa7855b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.0.2.129
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this port is intended to facilitate development efforts shared with "upstreams"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#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;'>- worksrcdir audacity-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3615af185a7338b83fba23c943b9898c7bbb260d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 58349631840adf45a81b57037819e14e18cb684586cde249630e66488b911902 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64490814
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PPREFIX devel/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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;'>+conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# get the source tarball from github because it contains all required external libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# incl. those not in MacPorts.
</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;'>+revision 2
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+set PPREFIX ./
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant wx30 conflicts wx32 requires wxsystem description {build against wxWidgets-3.0} {}
</span>
variant wx32 conflicts wx30 requires wxsystem description {build against wxWidgets-3.2} {}
if {![variant_exists wxsystem] || [variant_isset wxsystem]} {
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
depends_fetch-append \
bin:wget:wget
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,6 +199,7 @@ if {[variant_isset wxsystem] && ${wxWidgets.use} ne "wxWidgets-3.2"} {
</span> platform darwin {
variant suil description {Build the GUI library for LV2 plugins\; requires Qt5} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,14 +243,7 @@ if {${os.arch} ne "arm"} {
</span> -D${_OPT}use_mad=off \
-D${_OPT}use_id3tag=off
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using port:sqlite3 leads to unstable behaviour?!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_sqlite=local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:sqlite3
</span> if {[variant_isset wxsystem]} {
configure.args-append \
-DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -428,48 +364,17 @@ pre-build {
</span> platform darwin {
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "${name}-legacy"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/Audacity.app ${destroot}${aud_app_path}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/share/audacity/plug-ins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/share/audacity/nyquist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/share/audacity/modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${aud_app_path}/Contents/plug-ins ${destroot}${prefix}/share/audacity/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${build.dir}/bin/MacPorts/lib/audacity/suil_qt5_in_cocoa.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${aud_app_path}/Contents/Frameworks/suil_qt5_in_cocoa.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/Audacity.app ${destroot}${aud_app_path}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # but they can be pruned because CopyLibs.cmake is not invoked.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${aud_app_path}/Contents/plug-ins ${destroot}${prefix}/share/audacity/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/mime/packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/src/audacity.xml ${destroot}${prefix}/share/mime/packages/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/appdata
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/help/audacity.appdata.xml ${destroot}${prefix}/share/appdata/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/Audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/README.txt ${worksrcpath}/LICENSE.txt ${destroot}${prefix}/share/doc/Audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/help/audacity.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/icons/hicolor/scalable/apps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/images/audacity.svg ${destroot}${prefix}/share/icons/hicolor/scalable/apps/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach s {16 22 24 32 48} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/icons/hicolor/${s}x${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- ${destroot}${aud_app_path}/Contents/Frameworks/libsuil_qt5_in_cocoa.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- }
</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> }
if {[variant_isset wxsystem]} {
foreach l [glob -nocomplain ${wxWidgets.prefix}/share/locale/*] {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/add_enGB_translation.diff b/audio/audacity-legacy/files/add_enGB_translation.diff
</span>similarity index 100%
rename from audio/audacity/files/add_enGB_translation.diff
rename to audio/audacity-legacy/files/add_enGB_translation.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/buildinfo-clarify-no-gstreamer.diff b/audio/audacity-legacy/files/buildinfo-clarify-no-gstreamer.diff
</span>similarity index 100%
rename from audio/audacity/files/buildinfo-clarify-no-gstreamer.diff
rename to audio/audacity-legacy/files/buildinfo-clarify-no-gstreamer.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-aboutdlg-compiler.diff b/audio/audacity-legacy/files/patch-aboutdlg-compiler.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-aboutdlg-compiler.diff
rename to audio/audacity-legacy/files/patch-aboutdlg-compiler.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-add-MenusMac.diff b/audio/audacity-legacy/files/patch-add-MenusMac.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-add-MenusMac.diff
rename to audio/audacity-legacy/files/patch-add-MenusMac.diff
<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-legacy/files/patch-avoid-clang-choke-on-confbase.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-avoid-clang-choke-on-confbase.diff
rename to audio/audacity-legacy/files/patch-avoid-clang-choke-on-confbase.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-cmakefiles.diff b/audio/audacity-legacy/files/patch-cmakefiles.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-cmakefiles.diff
rename to audio/audacity-legacy/files/patch-cmakefiles.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-embed-wxW.diff b/audio/audacity-legacy/files/patch-embed-wxW.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-embed-wxW.diff
rename to audio/audacity-legacy/files/patch-embed-wxW.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-implement-progdial=beep.diff b/audio/audacity-legacy/files/patch-implement-progdial=beep.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-implement-progdial=beep.diff
rename to audio/audacity-legacy/files/patch-implement-progdial=beep.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-libnyquist-symbol-visibility.diff b/audio/audacity-legacy/files/patch-libnyquist-symbol-visibility.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-libnyquist-symbol-visibility.diff
rename to audio/audacity-legacy/files/patch-libnyquist-symbol-visibility.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-more-decent-font-sizes.diff b/audio/audacity-legacy/files/patch-more-decent-font-sizes.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-more-decent-font-sizes.diff
rename to audio/audacity-legacy/files/patch-more-decent-font-sizes.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-no-libatomic.diff b/audio/audacity-legacy/files/patch-no-libatomic.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-no-libatomic.diff
rename to audio/audacity-legacy/files/patch-no-libatomic.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-python.diff b/audio/audacity-legacy/files/patch-python.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-python.diff
rename to audio/audacity-legacy/files/patch-python.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-skip-gcc-version-test.diff b/audio/audacity-legacy/files/patch-skip-gcc-version-test.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-skip-gcc-version-test.diff
rename to audio/audacity-legacy/files/patch-skip-gcc-version-test.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-unordered_map-fixes.diff b/audio/audacity-legacy/files/patch-unordered_map-fixes.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-unordered_map-fixes.diff
rename to audio/audacity-legacy/files/patch-unordered_map-fixes.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-use-MPffmpeg.diff b/audio/audacity-legacy/files/patch-use-MPffmpeg.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-use-MPffmpeg.diff
rename to audio/audacity-legacy/files/patch-use-MPffmpeg.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-use-MPlame.diff b/audio/audacity-legacy/files/patch-use-MPlame.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-use-MPlame.diff
rename to audio/audacity-legacy/files/patch-use-MPlame.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-wxw-303.diff b/audio/audacity-legacy/files/patch-wxw-303.diff
</span>similarity index 100%
rename from audio/audacity/files/patch-wxw-303.diff
rename to audio/audacity-legacy/files/patch-wxw-303.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/portaudio-no-universal-build.diff b/audio/audacity-legacy/files/portaudio-no-universal-build.diff
</span>similarity index 100%
rename from audio/audacity/files/portaudio-no-universal-build.diff
rename to audio/audacity-legacy/files/portaudio-no-universal-build.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/vocalremover.ny b/audio/audacity-legacy/files/vocalremover.ny
</span>similarity index 100%
rename from audio/audacity/files/vocalremover.ny
rename to audio/audacity-legacy/files/vocalremover.ny
<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 9981edb736d..ae0a990c109 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;'>@@ -1,504 +1,97 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup github 1.0
name audacity
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.5.1
</span> categories audio
<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;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-subport "${name}-manual" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "${name}-manual"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description The manual for audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description {*}${description}. Users of port:audacity-legacy may prefer to use the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- online manual instead of installing this port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity-manual 3.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://manual.audacityteam.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8e8916ad861888538ca2844c107470a262651222 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f30068e8eabe70b001e4fc2f6ace6b6e87b815d3bd756902485a960e41523e93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23695970
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run path:bin/audacity:audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installs_libs no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms {darwin any}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/manual ${destroot}${aud_app_path}/Contents/help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform linux {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/audacity/help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/manual ${destroot}${prefix}/share/audacity/help
</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;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {makr @mohd-akram} openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wxsystem description {Depend on wxWidgets from MacPorts} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup wxWidgets 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroups for the main ports
</span><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 cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup audacity audacity ${version} Audacity-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts audacity-legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description multi-track audio editor
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description A Free, Cross-Platform Digital Audio Editor.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Audacity is a free, easy-to-use, multi-track audio editor and recorder \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for Windows, Mac OS X, GNU/Linux and other operating systems. The interface is translated \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- into many languages. You can use Audacity to: \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Record live audio. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Record computer playback on any Windows Vista or later machine. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Convert tapes and records into digital recordings or CDs. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Edit WAV, AIFF, FLAC, MP2, MP3 or Ogg Vorbis sound files. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC3, M4A/M4R (AAC), WMA and other formats supported using optional libraries. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cut, copy, splice or mix sounds together. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Numerous effects including change the speed or pitch of a recording. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- And more!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Audacity is an easy-to-use, multi-track audio editor and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ recorder for Windows, macOS, GNU/Linux and other operating \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ systems.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport audacity-legacy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n This version of the port provides the last release using the legacy file format. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The newer v3 versions can import the legacy .aup projects but can only \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write in a new .aup3 format that the older versions cannot import! Use this port \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if you have a need to exchange native projects with people using Audacity versions \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- older than 3.0.0 .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://www.audacityteam.org
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport audacity-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 af879e0dc74ff1a0ff290cecbd2c9159781ae3ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8786a1be8d63f4793fc3f2a5f1f61c441e0a4b9a7ed9137d59277ad5f72bd512 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 57533902
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-sources-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "${name}-legacy"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # get the source tarball from github because it contains all required external libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # incl. those not in MacPorts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity 2.4.2 Audacity-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d9e04c029a144800e378a6b5464c74f3fdb2a7e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 032273e2408ad51f97c6846ac8d8fe9e4a3fbc6e4c620e630ea4c1d0124d9a94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 61254313
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PPREFIX ./
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant wx30 conflicts wx32 requires wxsystem description {build against wxWidgets-3.0} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts "${name}-legacy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## 576b7e66 looks like possibly the last commit before the takeover by the new project owner:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup audacity audacity 576b7e66d2b96c39241d3d992259fc2bfa7855b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.0.2.129
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this port is intended to facilitate development efforts shared with "upstreams"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#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;'>- worksrcdir audacity-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3615af185a7338b83fba23c943b9898c7bbb260d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 58349631840adf45a81b57037819e14e18cb684586cde249630e66488b911902 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64490814
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PPREFIX devel/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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;'>+ port:lame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opusfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:portaudio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rapidjson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libid3tag \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:portmidi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wavpack
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wx32 conflicts wx30 requires wxsystem description {build against wxWidgets-3.2} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_exists wxsystem] || [variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:wget:wget
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:ffmpeg6
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.post_args-append -k
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.generator Ninja
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # on 10.14 and newer to "prevent high CPU usage and slow drawing". Linking will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fail if MacPort lets source be compiled against the platform SDK, so we handle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SDK selection ourselves entirely. MP builds aren't required to support anything
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # no OS specifics.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_deployment_target 10.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdkroot
</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;'>+ patchfiles patch-offline-manual.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc add_patchfile_ifexists {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global PPREFIX filespath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fname ${args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${filespath}/${fname}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append ${fname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # truncate/disable this script which changes library paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close [open ${worksrcpath}/scripts/build/macOS/fix_bundle.py w]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# openssl is a dependency of curl in cmake and of python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict cmake python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args -Daudacity_conan_enabled=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Daudacity_has_vst3=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.audacityteam.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2017
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset wxsystem]} {
</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;'>- wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_exists wx30] && [variant_isset wx30]} {
</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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we want to use the temporary wxWidgets-3.1 "Audacity-special" port!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-3.1
</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;'>- require_active_variants ${wxWidgets.port} "" stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wxCommit 07e7d83
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # different master_sites so we need to fetch and extract the audacity-wxWidgets sources "manually"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${distpath}/wxWidgets-${wxCommit}.tar.gz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "---> Fetching wxWidgets-${wxCommit}.tar.gz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- --progress=bar:force -O ${distpath}/wxWidgets-${wxCommit}.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/Audacity.app ${destroot}${applications_dir}/
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "---> Extracting wxWidgets-${wxCommit}.tar.gz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/lib-src "tar -xf ${distpath}/wxWidgets-${wxCommit}.tar.gz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s audacity-wxWidgets-${wxCommit} ${worksrcpath}/lib-src/wxWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # add the wxWidgets dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv
</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;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_bin ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:soundtouch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:soxr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:twolame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libavcodec.dylib:ffmpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lame \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libogg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsndfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libvorbis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.arch} ne "arm"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libid3tag \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmad
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# audacity could use port:lv2 and port:lilv but would also require a port:suil for that to be possible.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -Np1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# address issues in the build system:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - build and link VSTControlOSX.mm instead of the GTk interface
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - address a visibility issue with the slider_array variable in libnyquist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - make the AudioUnits plugin support build; on 64bit and also include AUControl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- portaudio-no-universal-build.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildinfo-clarify-no-gstreamer.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-aboutdlg-compiler.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-libnyquist-symbol-visibility.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use lame from MacPorts (partial revert of ae431bc5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # load ffmpeg libs from MacPorts (reverts of 1d40f33e)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-use-MPlame.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-use-MPffmpeg.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # work around a missing implementation in wxCocoa's wxSound class
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-implement-progdial=beep.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-wxw-303.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make certain we're not embedding any wxWidgets libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_patchfile_ifexists \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PPREFIX}patch-no-embedded-wxW.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make certain we're embedding our wxWidgets libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_patchfile_ifexists \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PPREFIX}patch-embed-wxW.diff
</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;'>-add_patchfile_ifexists \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PPREFIX}patch-skip-gcc-version-test.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PPREFIX}patch-enable-compact-menu.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PPREFIX}patch-temp-fixes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset wxsystem] && ${wxWidgets.use} ne "wxWidgets-3.2"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_patchfile_ifexists \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PPREFIX}patch-wxw-31x.diff
</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;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant suil description {Build the GUI library for LV2 plugins\; requires Qt5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</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;'>-# 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:#ffe0e0;'>-# the wx build system no longer exports private libraries. Carbon could be temporary because wxW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-# required when building against port:wxWidgets-3.1 but it won't hurt either.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append ${PPREFIX}patch-cmakefiles.diff
</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;'>-# quelch a huge number of warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-inconsistent-missing-override \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-overloaded-virtual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set _OPT "audacity_"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}lib_preference=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_audio_units=on \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_pa_jack=off \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_ffmpeg=linked \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_lame=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_flac=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_soxr=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_vamp=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_ogg=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_vorbis=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_lv2=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_suil_qt5=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_sbsms=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_soundtouch=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_twolame=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_midi=local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_pch=on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.arch} ne "arm"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_mad=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_id3tag=system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_mad=off \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_id3tag=off
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using port:sqlite3 leads to unstable behaviour?!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_sqlite=local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_wxwidgets=system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WX_CONFIG=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_wxwidgets=local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use the MacPorts options for building wxWidgets, in particular
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # about using dependencies from MacPorts:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_LIBICONV=sys \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_LIBJPEG=sys \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_LIBTIFF=sys \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_LIBPNG=sys \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_ZLIB=sys \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_OPENGL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_LIBSDL=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_AUI=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_DISPLAY=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_XRC=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxUSE_GRAPHICS_CONTEXT=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxBUILD_PRECOMP=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxBUILD_STRIPPED_RELEASE_DEFAULT=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WXWIN=${worksrcpath}/lib-src/wxWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WXWIN=${worksrcpath}/lib-src/wxWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ensure pre-compiled headers and the possible use of ccache can co-exist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CCACHE_SLOPPINESS=pch_defines,time_macros"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append "CCACHE_SLOPPINESS=pch_defines,time_macros"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_suil_qt5=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D${_OPT}use_suil_qt5=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</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;'>- -Daudacity_use_portaudio=local
</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;'>-# make sure the C++ stdlib argument is added to the LDFLAGS too
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.cxx_stdlib} ne "" && [string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -stdlib=${configure.cxx_stdlib}
</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;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPPFLAGS=\"${configure.cppflags}\""
</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 {${build.cmd} ne "ninja"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append V=1 VERBOSE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.pre_args-prepend -k 0
</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;'>-# with everything defined/declared as intended we can now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# handle the post-patch step with its reinplace statements.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@@PYTHON@@|${python_bin}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/lv2/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|/usr/local|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/effects/ladspa/LadspaEffect.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/effects/VST/VSTEffect.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/export/ExportMP3.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/lv2/lilv/wscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/lv2/lilv/test/lilv_test.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|/Library/Audio/Plug-Ins/Vamp|/Library/Audio/Plug-Ins/Vamp:${prefix}/lib/vamp|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|/Library/Application Support/audacity/libs|${prefix}/lib|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/FFmpeg.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s| -Werror||g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/portaudio-v19/configure.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib-src/portaudio-v19/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@PREFIX@|/opt/local|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-manual {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</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}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup audacity audacity-manual ${version} v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</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 a2394c21f7b5d27cc45208b226c743051278a41b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a87f9bdd774ee7ce5a4a4e5e0783ffa7cb28913dcffe7310efc065471a14cf93 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22377404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port: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;'>+ platforms {darwin any}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set data_dir ${prefix}/share/audacity
</span> platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # audacity contains C++ files that include system SDK headers and ObjC code on OS X;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # they must thus be built as ObjC++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set make_objcpp { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {CommandManager src/commands {src/Makefile.in src/Makefile.am}} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {Effect src/effects {src/Makefile.in src/Makefile.am}} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {LV2Effect src/effects/lv2 {src/Makefile.in src/Makefile.am}} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {KeyboardCapture src {src/Makefile.in src/Makefile.am}} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach mm ${make_objcpp} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set f [lindex ${mm} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set d [lindex ${mm} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mk [lindex ${mm} 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it's easiest to symlink f.mm to f.cpp; clang++ will do the rest.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${worksrcpath}/${d}/${f}.mm]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${f}.cpp ${worksrcpath}/${d}/${f}.mm
</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 {[file exists ${worksrcpath}/src/menus/WindowMenus.cpp] && ![file exists ${worksrcpath}/src/menus/WindowMenus.mm]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s WindowMenus.cpp ${worksrcpath}/src/menus/WindowMenus.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set data_dir ${applications_dir}/Audacity.app/Contents
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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;'>- if {[file exists ${worksrcpath}/mac/scripts/get_gitident.sh]} {
</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:#ffe0e0;'>- system "echo '#define GIT_DESC \"${version}\"' >> ${worksrcpath}/src/RevisionIdent.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#define GIT_DESC \"${version}\"' > ${worksrcpath}/src/GitDesc.h"
</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;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "${name}-legacy"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/Audacity.app ${destroot}${aud_app_path}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/share/audacity/plug-ins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/share/audacity/nyquist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/share/audacity/modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${aud_app_path}/Contents/plug-ins ${destroot}${prefix}/share/audacity/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${build.dir}/bin/MacPorts/lib/audacity/suil_qt5_in_cocoa.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${aud_app_path}/Contents/Frameworks/suil_qt5_in_cocoa.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/Audacity.app ${destroot}${aud_app_path}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset wxsystem]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # but they can be pruned because CopyLibs.cmake is not invoked.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${aud_app_path}/Contents/plug-ins ${destroot}${prefix}/share/audacity/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/mime/packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/src/audacity.xml ${destroot}${prefix}/share/mime/packages/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/appdata
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/help/audacity.appdata.xml ${destroot}${prefix}/share/appdata/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/Audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/README.txt ${worksrcpath}/LICENSE.txt ${destroot}${prefix}/share/doc/Audacity
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/help/audacity.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/icons/hicolor/scalable/apps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/images/audacity.svg ${destroot}${prefix}/share/icons/hicolor/scalable/apps/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach s {16 22 24 32 48} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/icons/hicolor/${s}x${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset suil]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${aud_app_path}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- ${destroot}${aud_app_path}/Contents/Frameworks/libsuil_qt5_in_cocoa.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset wxsystem]} {
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # allow the application to find certain things where it expects them on OS X (= inside the app bundle)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach r [glob -nocomplain ${destroot}${prefix}/share/audacity/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set f [file tail ${r}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${destroot}${aud_app_path}/Contents/Resources/${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/audacity/${f} ${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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install a wrapper script in ${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo \"#!/bin/sh\nexec \\\"${aud_app_path}/Contents/MacOS/Wrapper\\\" \\\"\\\$\@\\\"\" > ${destroot}${prefix}/bin/audacity"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod 755 ${destroot}${prefix}/bin/audacity"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${data_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath} ${destroot}${data_dir}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/vocalremover.ny ${destroot}${aud_app_path}/Contents/plug-ins/
</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;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- In case Audacity complains about finding FFmpeg or Lame, please locate these libraries\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- under ${prefix}/lib in the Libraries section of the Preferences dialog (see\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://manual.audacityteam.org/man/installing_and_updating_audacity_on_mac_os_x.html#locate)
</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;'>-# kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d94050cb502..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/devel/patch-cmakefiles.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,226 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a85373670..60aa0c775 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,7 +78,7 @@ cmake_policy( SET CMP0075 NEW )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Definitions that must happen before the project() command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( APPLE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set( MIN_MACOS_VERSION 10.9 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set( MIN_MACOS_VERSION 10.7 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( TARGET_MACOS_VERSION 10.13 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Generate schema files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_XCODE_GENERATE_SCHEME ON )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,14 +86,14 @@ if( APPLE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Define the OSX compatibility parameters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_OSX_ARCHITECTURES x86_64 CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_OSX_DEPLOYMENT_TARGET ${MIN_MACOS_VERSION} CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set( CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set( CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" CACHE INTERNAL "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This prevents a link error when building with the 10.9 or older SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME OFF )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Shouldn't cmake do this???
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- string( APPEND CMAKE_CXX_FLAGS " -stdlib=libc++" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# string( APPEND CMAKE_CXX_FLAGS " -stdlib=libc++" )
</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;'>- # Add our module path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,12 +108,14 @@ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_CXX_STANDARD 14 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_CXX_STANDARD_REQUIRED ON )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Use ccache if available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_program( CCACHE_PROGRAM ccache )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--mark_as_advanced( FORCE CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Use ccache if requested
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if( ${CMAKE_CXX_COMPILER_LAUNCHER} MATCHES "ccache" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set( CCACHE_PROGRAM "${CMAKE_CXX_COMPILER_LAUNCHER}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mark_as_advanced( FORCE CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if( CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if( CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif()
</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;'>- # Our very own project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +137,8 @@ cmd_option( ${_OPT}obey_system_dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Off
</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;'>--include( AudacityDependencies )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# spurious commit:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include( AudacityDependencies )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Pull all the modules we'll need
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include( CheckCXXCompilerFlag )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,6 +255,7 @@ if( CMAKE_CONFIGURATION_TYPES )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( _DEST "${_DESTDIR}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( _PREFIX "${CMAKE_INSTALL_PREFIX}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake-proxies/lv2/CMakeLists.txt b/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5551e5dd8d1fa060a91a00eb9a3bd115c31d7274..db7a5341d0ed22d4f14adb72b4b61fda22a0fd2e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake-proxies/lv2/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,6 +151,9 @@ macro( bld name packages define sources )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PkgConfig::${pkg}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( ${name} STREQUAL "suil_qt5_in_cocoa")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list( APPEND libs PRIVATE "-framework Cocoa" )
</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( NOT missing )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list( APPEND DEFINES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +191,7 @@ if( WIN32 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif( APPLE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( LILV_PATH_SEP ":" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( LILV_DIR_SEP "/" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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:#ffe0e0;'>-+ 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( SUIL_MODULE_DIR "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( SUIL_DIR_SEP "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,10 +199,18 @@ elseif( APPLE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( SUIL_GTK3_LIB_NAME "libgtk-x11-3.0.so.0" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( SUIL_MODULE_PREFIX "lib" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( SUIL_MODULE_EXT ".dylib" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ if( audacity_use_suil_qt5 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pkg_check_modules( QT5 IMPORTED_TARGET "Qt5Widgets >= 5.1.0" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bld( "suil_qt5_in_cocoa"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "QT5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "SUIL_WITH_COCOA_IN_QT5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${TARGET_ROOT}/suil/src/cocoa_in_qt5.mm" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif( UNIX )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( LILV_PATH_SEP ":" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( LILV_DIR_SEP "/" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set( LILV_DEFAULT_LV2_PATH "~/.lv2:/usr/lib/lv2:/usr/local/lib/lv2" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( SUIL_MODULE_DIR "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( SUIL_DIR_SEP "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake-proxies/wxWidgets/CMakeLists.txt b/cmake-proxies/wxWidgets/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 47b6bd0ee..e957ee666 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake-proxies/wxWidgets/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake-proxies/wxWidgets/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -240,10 +240,10 @@ file(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( NOT ours )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message( FATAL_ERROR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message( WARNING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\n########################################################################\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "Audacity version 3.0.0 or higher requires use of a customized version of "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "wxWidgets. For details:\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "Audacity version 3.0.0 or higher recommends the use of a customised version "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "of wxWidgets. For details:\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "########################################################################\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e6dd6cf03..fa2f49b7e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1032,7 +1032,7 @@ list( APPEND DEFINES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If we have cmake 3.16 or higher, we can use precompiled headers, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only use them if ccache is not available and the user hasn't disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" AND NOT CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmd_option(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${_OPT}use_pch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Use precompiled headers [yes, no]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1081,6 +1081,11 @@ list( APPEND LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:z>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:pthread>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list( APPEND LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $<$<CXX_COMPILER_ID:Clang>:atomic>)
</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;'>- set( BUILDING_AUDACITY YES )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( INSTALL_PREFIX "${_PREFIX}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1147,22 +1152,23 @@ if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Bug 2400 workaround
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Replaces the SDK version in the built executable with 10.13 to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # prevent high CPU usage and slow drawing on Mojave or newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- check_for_platform_version()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( PLATFORM_VERSION_SUPPORTED )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wl,-platform_version,macos,${MIN_MACOS_VERSION},${TARGET_MACOS_VERSION}
</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;'>-- list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wl,-sdk_version,10.13
</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;'>-+## MacPorts will specify the SDK to use itself, thank you very much
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# # Bug 2400 workaround
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# # Replaces the SDK version in the built executable with 10.13 to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# # prevent high CPU usage and slow drawing on Mojave or newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# check_for_platform_version()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if( PLATFORM_VERSION_SUPPORTED )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -Wl,-platform_version,macos,${MIN_MACOS_VERSION},${TARGET_MACOS_VERSION}
</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;'>-+# list( APPEND LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -Wl,-sdk_version,10.13
</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;'>- # Define Mac specific resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list( APPEND MAC_RESOURCES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1206,6 +1212,9 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-framework AudioUnit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-framework CoreAudio"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-framework CoreAudioKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-framework AudioToolbox"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-framework Cocoa"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-framework Carbon"
</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;'>- # Use the Aqua theme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1317,13 +1326,20 @@ list( APPEND DEFINES PRIVATE "${export_symbol}" INTERFACE "${import_symbol}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_sources( ${TARGET} PRIVATE ${HEADERS} ${SOURCES} ${RESOURCES} ${MAC_RESOURCES} ${WIN_RESOURCES} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+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:#ffe0e0;'>-+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:#ffe0e0;'>-+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:#ffe0e0;'>-+set_property(SOURCE effects/lv2/LoadLV2.cpp APPEND PROPERTY COMPILE_DEFINITIONS PKGLIBDIR="${PKGLIBDIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set_property(SOURCE export/ExportMP3.cpp APPEND PROPERTY COMPILE_DEFINITIONS LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options( ${TARGET} PRIVATE ${OPTIONS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_options( ${TARGET} PRIVATE ${LDFLAGS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries( ${TARGET} ${LIBRARIES} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries( ${TARGET} PUBLIC ${AUDACITY_LIBRARIES} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" AND NOT CCACHE_PROGRAM )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( ${_OPT}use_pch )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message( STATUS "Using precompiled headers" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03c6b2086dd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/devel/patch-enable-compact-menu.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b36c10fa3..80ec737b4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/menus/FileMenus.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/menus/FileMenus.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,6 +200,7 @@ void OnClose(const CommandContext &context )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void OnCompact(const CommandContext &context)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ProjectFileManager::Get(context.project).Compact();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UndoManager::Get(context.project).ClearStates();
</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;'>- void OnSave(const CommandContext &context )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -618,15 +619,15 @@ BaseItemSharedPtr FileMenu()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AudioIONotBusyFlag() ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Command( wxT("SaveCopy"), XXO("&Backup Project..."), FN(OnSaveCopy),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AudioIONotBusyFlag() )
</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;'>- // Bug 2600: Compact has interactions with undo/history that are bound
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // to confuse some users. We don't see a way to recover useful amounts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // of space and not confuse users using undo.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // As additional space used by aup3 is 50% or so, perfectly valid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // approach to this P1 bug is to not provide the 'Compact' menu item.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- //Command( wxT("Compact"), XXO("Co&mpact Project"), FN(OnCompact),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // AudioIONotBusyFlag(), wxT("Shift+A") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Command( wxT("Compact"), XXO("Compact Project..."), FN(OnCompact),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AudioIONotBusyFlag() )
</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;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bcb9866d07e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/devel/patch-no-embedded-wxW.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/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8954b4e25..5d9e7240d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1207,16 +1215,16 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( HAVE_VISIBILITY 1 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure_file( audacity_config.h.in private/configmac.h )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Copy the required wxWidgets libs into the bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_custom_command(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TARGET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${TARGET}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_COMMAND} -D SRC="${_EXEDIR}/Audacity"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -D DST="${_PKGLIB}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -P ${CMAKE_MODULE_PATH}/CopyLibs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# # Copy the required wxWidgets libs into the bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# add_custom_command(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# TARGET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ${TARGET}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ${CMAKE_COMMAND} -D SRC="${_EXEDIR}/Audacity"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -D DST="${_PKGLIB}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -P ${CMAKE_MODULE_PATH}/CopyLibs.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# POST_BUILD
</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;'>- # Define the Wrapper target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( WRAPPER_ROOT "${TARGET_ROOT}/../mac" )
</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/devel/patch-temp-fixes.diff b/audio/audacity/files/devel/patch-temp-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8712b465520..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/devel/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/widgets/FileConfig.cpp b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29f983667..0d8388621 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "FileConfig.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(F_OK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define F_OK 0x00
</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/devel/patch-unordered_map-fixes.diff b/audio/audacity/files/devel/patch-unordered_map-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index de58be00e2f..00000000000
</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;'>+++ /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/include/audacity/Types.h b/include/audacity/Types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 137779c1c2abe4d9c14c264755842f188e385722..a1df29e54cc47bd7ae118ea29a7060215e74d295 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/audacity/Types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/audacity/Types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@
</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;'>-- template<typename T> struct hash;
</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;'>- 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;color:#808080;'>diff --git a/audio/audacity/files/devel/patch-wxw-31x.diff b/audio/audacity/files/devel/patch-wxw-31x.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 98c55a2c762..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/widgets/FileConfig.cpp b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e0e1db83b0b2a090ec93fa075352e27a7772e36e..231c8edd015793c9016291e3d133e456077b2154 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/widgets/FileConfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,11 +55,13 @@ void FileConfig::Init()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mConfig = std::make_unique<wxFileConfig>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (mAppName, mVendorName, mLocalFilename, mGlobalFilename, mStyle, mConv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if wxCHECK_VERSION(3, 1, 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Prevent wxFileConfig from attempting a Flush() during object deletion. This happens
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // because we don't use the wxFileConfig::Flush() method and so the wxFileConfig dirty
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // flag never gets reset. During deletion, the dirty flag is checked and a Flush()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // performed. This can (and probably will) create bogus temporary files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mConfig->DisableAutoSave();
</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;'>- bool canRead = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool canWrite = false;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/patch-offline-manual.diff b/audio/audacity/files/patch-offline-manual.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3a95d7de98e
</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-offline-manual.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/prefs/GUIPrefs.cpp.orig 2024-04-24 15:00:43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/prefs/GUIPrefs.cpp 2024-05-09 22:12:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Theme.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Prefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ShuttleGui.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "HelpSystem.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Decibels.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Beats.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ S.StartMultiColumn(2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ S.TieChoice( XXO("&Language:"), LanguageSetting);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // S.TieChoice( XXO("Location of &Manual:"), GUIManualLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ S.TieChoice( XXO("Location of &Manual:"), GUIManualLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ S.TieChoice( XXO("Th&eme:"), GUITheme());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ S.TieChoice( XXO("Meter dB &range:"), DBSetting);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>