Re: Audacity 3.0.0 RC 005 for testing
"Jack L." <[email protected]>
| Newsgroups | gmane.comp.audio.audacity.devel |
|---|---|
| Message-ID | <CALeGphzVqUiEGFrXfTUnHLYEZAHf=zzgXut-9OoHMV=hT+7D9A@mail.gmail.com> |
Ok thanks, I've attached the patch to bring the ports version on FreeBSD up to 3.0.0. cd /usr/ports/audio/audacity;patch -p1 -B '' <audacity.txt On the windows unable to open project database issue, it looks like this is another open multiple audio files issue. I was able to reproduce on windows with 1. Ctrl+o, open audio file 2. Ctrl+o, open audio file (unable to open project's database sometimes) 3. Ctrl+o, open audio file (unable to open project's database) Also, when that unable to open project's database comes up, the next time you start audacity, it will keep saying to recover a crashed project even though it was closed cleanly and sometimes results in the same unable to open project's database error until you close/open audacity a few times. Also getting early here too, 1AM here ;) On Thu, Mar 18, 2021 at 12:50 AM Jack L. <[email protected]> wrote: > > Had to recapture the screenshot with the dialog box in front instead > of behind the window > > On Thu, Mar 18, 2021 at 12:43 AM Jack L. <[email protected]> wrote: > > > > If it can't be recovered, it's fine, but it would be good to know why > > it saved a broken file anyways. > > > > > > Also on windows, if I right click on a file and click on "Open with > > audacity", I get a dialog that says "automated crash recovery of New > > Project" and then an unable to open database error. Nothing else can > > be imported/opened until I fully close audacity and open it again. > > Seems like something is broken if audacity isn't opened before the > > file is loaded into it. > > > > On Thu, Mar 18, 2021 at 12:31 AM Leland <[email protected]> wrote: > > > > > > I get the same error here...that's good. Something to do with Unicode > > > encoding...still checking. > > > > > > > -----Original Message----- > > > > From: Jack L. <[email protected]> > > > > Sent: Thursday, March 18, 2021 1:37 AM > > > > To: Audacity-Devel list <[email protected]> > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for testing > > > > > > > > In case the link didn't go through https://we.tl/t-u9D0IXqGW9 has the > > > > problem aup3 file and egrep > > > > > > > > On Wed, Mar 17, 2021 at 11:16 PM Jack L. <[email protected]> wrote: > > > > > > > > > > The file is sending via wetransfer, hopefully it can send to the list. > > > > > The dump|egrep is included in the transfer. Total is about 500M > > > > > bzipped > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 10:51 PM Leland <[email protected]> wrote: > > > > > > > > > > > > Oh, oh! Would you be able to compress it and upload to google drive > > > > > > or some such? If it's too big, can you send me the output from: > > > > > > > > > > > > sqlite3 ee.aup3 '.dump' | egrep 'project|autosave' > > > > > > > > > > > > That will dump the project file (just a binary representation of an > > > > > > XML > > > > > > document) and it may shed some light as to what has happened. If I > > > > > > can figure it out, I may be able to modify it, send it back to you, > > > > > > and you can replace it in the .aup3. > > > > > > > > > > > > > -----Original Message----- > > > > > > > From: Jack L. <[email protected]> > > > > > > > Sent: Thursday, March 18, 2021 12:07 AM > > > > > > > To: Audacity-Devel list <[email protected]> > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for testing > > > > > > > > > > > > > > I'll have to check and get back to you. > > > > > > > > > > > > > > I just recorded a 1hr audio file on FreeBSD and saved it. Tried to > > > > > > > open it > > > > > > later > > > > > > > and it says "Unable to parse project information". > > > > > > > > > > > > > > file.aup3: SQLite 3.x database, application id 1096107097, user > > > > > > > version 50331648, last written using SQLite version 3034001 > > > > > > > > > > > > > > Same thing happens when I try to open the file on windows. Any > > > > > > > ideas on > > > > > > how > > > > > > > I can recover the audio? > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 8:25 PM Leland <[email protected]> wrote: > > > > > > > > > > > > > > > > That's weird. It "should" detect gtk3 instead of gtk2. What > > > > > > > > does the cmake config spit out to the terminal? What does > > > "wx-config - > > > > -list" > > > > > > show? > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > From: Jack L. <[email protected]> > > > > > > > > > Sent: Wednesday, March 17, 2021 8:21 PM > > > > > > > > > To: Audacity-Devel list <[email protected]> > > > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for > > > > > > > > > testing > > > > > > > > > > > > > > > > > > Looks like using the patched wxwidgets didn't work > > > > > > > > > > > > > > > > > > ld-elf.so.1: Shared object "libwx_gtk2u_adv-3.1.so" not found, > > > > > > > > > required by "audacity" > > > > > > > > > > > > > > > > > > gtk2 support was removed in FreeBSD already. > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 6:07 PM Jack L. <[email protected]> > > > > wrote: > > > > > > > > > > > > > > > > > > > > FreeBSD uses 3.1.4, will that be ok to use instead of the > > > > > > > > > > patched > > > > > > > > version? > > > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 6:01 PM Leland <[email protected]> > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > The reason we made our version "mandatory" is because we > > > > > > > > > > > were chased our tails looking for a bug that folks using > > > > > > > > > > > Ubuntu were reporting for many days only to find out it > > > > > > > > > > > was because the system version didn't have an upstream patch > > > > that ours did. > > > > > > > > > > > Seriously, Paul and I wasted MANY hours trying to track it > > > down. > > > > > > > > > > > > > > > > > > > > > > So, if FreeBSD has a more recent checkout of wx313, then > > > > > > > > > > > you should be okay with our patched build. > > > > > > > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > > > > From: Jack L. <[email protected]> > > > > > > > > > > > > Sent: Wednesday, March 17, 2021 7:56 PM > > > > > > > > > > > > To: Audacity-Devel list > > > > > > > > > > > > <[email protected]> > > > > > > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for > > > > > > > > > > > > testing > > > > > > > > > > > > > > > > > > > > > > > > Looks like =local worked but not sure how happy the > > > > > > > > > > > > freebsd build system > > > > > > > > > > > will > > > > > > > > > > > > take that, they likely won't have git installed or might > > > > > > > > > > > > have to add a dependency on git before it can be built. > > > > > > > > > > > > > > > > > > > > > > > > Are there any gotchas if the system wxwidgets are used? > > > > > > > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 5:47 PM Jack L. > > > > > > > > > > > > <[email protected]> > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > Let me try (I just got it to successfully compile with > > > > > > > > > > > > > the system version and a lot of patching), but let me > > > > > > > > > > > > > try with -Daudacity_use_wxwidgets=local and see what > > > > happens. > > > > > > > > > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 5:10 PM Leland > > > > > > > > > > > > > <[email protected]> > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > Jack, you can specify -Daudacity_use_wxwidgets=local > > > > > > > > > > > > > > when configuring cmake and that will force the build > > > > > > > > > > > > > > to do a git pull of the correct wxWidgets sources. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > > > > > > > From: Jack L. <[email protected]> > > > > > > > > > > > > > > > Sent: Wednesday, March 17, 2021 5:29 PM > > > > > > > > > > > > > > > To: Audacity-Devel list > > > > > > > > > > > > > > > <[email protected]> > > > > > > > > > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC > > > > > > > > > > > > > > > 005 for testing > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-Audacity-3.0.0/lib-src/libnyquist/nyquist > > > > > > > > > > > > > > > /xlisp > > > > > > > > > > > > > > > /xlf > > > > > > > > > > > > > > > io.c > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Line 23 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > #error configuration error -- either XL_BIG_ or > > > > > > > > > > > > > > > XL_LITTLE_ENDIAN must be defined in xlisp.h > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > the "in xlisp.h" is uncommented and causing a > > > > > > > > > > > > > > > compilation > > > > > > > > error. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > And I've noticed this hard requirement for > > > > > > > > > > > > > > > wxwidgets, is there a way to > > > > > > > > > > > > > > get it > > > > > > > > > > > > > > > bundled within the tar so the automated build > > > > > > > > > > > > > > > system can compile it > > > > > > > > > > > > > > without > > > > > > > > > > > > > > > manual intervention? > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ################################################################# > > > > > > > > > > > > > > > ####### > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Audacity version 3.0.0 or higher requires use of > > > > > > > > > > > > > > > a customized > > > > > > > > > > > version of > > > > > > > > > > > > > > > wxWidgets. For details: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://wiki.audacityteam.org/wiki/Building_for_Di > > > > > > > > > > > > > > > stros > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ################################################################# > > > > > > > > > > > > > > > ####### > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On Sun, Mar 7, 2021 at 4:25 AM James Crook > > > > > > > > > > > > > > > <[email protected]> > > > > > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > I'm hoping this one is going to be the actual > > > release. > > > > > > > > > > > > > > > > It's up on FossHub > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://www.fosshub.com/Audacity-devel.html > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Compressor is fixed and many links in the manual > > > fixed. > > > > > > > > > > > > > > > > If all goes > > > > > > > > > > > > > > well, > > > > > > > > > > > > > > > releasing March 21st. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > --James. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-win-3.0.0rc05.exe > > > > > > > > > > > > > > > > (application/x-msdownload) > > > > > > > > > > > > > > > > - > > > > > > > > > > > > > > > > 29379816 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > d767acfa3ea92b23cfa8b419e9a0ecb0adecaa9478f981427985faee580271e7 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-macos-3.0.0rc05.dmg (n/a) - 41326838 > > > > > > > > > > > > > > > > bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > 4d2d6d695aa1ea9bb25b5083c31fa57fc5bc53750977a218f2d0a3ad6f88518b > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-minsrc-3.0.0rc05.tar.xz (n/a) - > > > > > > > > > > > > > > > > 13308608 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > d57a6619f857c07de873d4f53389ae57b480901c2faa4f79801985f9f1daa2f1 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-manual-3.0.0rc05.zip > > > > > > > > > > > > > > > > (application/x-zip-compressed) - > > > > > > > > > > > > > > > > 23102002 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > 77d6a2bf4155568d0983608d0a232f404c64f0d200303a46ee158cf8ff79a764 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-win-3.0.0rc05.zip > > > > > > > > > > > > > > > > (application/x-zip-compressed) > > > > > > > > > > > > > > > > - > > > > > > > > > > > > > > > > 12507490 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > f7681aa47b1fe51aac8a21e3c81df7399f089c74eed5066dd3073edbf5f2cb06 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > > > > > > [email protected] > > > > > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/aud > > > > > > > > > > > > > > > > acity- > > > > > > > > > > > > > > > > deve > > > > > > > > > > > > > > > > l > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > > > > > [email protected] > > > > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audac > > > > > > > > > > > > > > > ity-de > > > > > > > > > > > > > > > vel > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > > > > [email protected] > > > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacit > > > > > > > > > > > > > > y-deve > > > > > > > > > > > > > > l > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > > [email protected] > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-de > > > > > > > > > > > > vel > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > [email protected] > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-deve > > > > > > > > > > > l > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > audacity-devel mailing list > > > > > > > > > [email protected] > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > audacity-devel mailing list > > > > > > > > [email protected] > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > audacity-devel mailing list > > > > > > > [email protected] > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > audacity-devel mailing list > > > > > > [email protected] > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > _______________________________________________ > > > > audacity-devel mailing list > > > > [email protected] > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > _______________________________________________ > > > audacity-devel mailing list > > > [email protected] > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel On Thu, Mar 18, 2021 at 12:59 AM Leland <[email protected]> wrote: > > It's coming back to you now. > > As part of the save process, we write the size of wxChar to the database. On your system, that seems to be reporting 4 bytes per character, but the actual data is 1 byte per character. So I was able to recover it by simply overriding the wxChar size stored in the database with 1 and it loaded just fine. I will try to diagnose why in the morning (3am here right now). I "may" be asking you for your patches so I can build it on my FreeBSD system here. > > > -----Original Message----- > > From: Jack L. <[email protected]> > > Sent: Thursday, March 18, 2021 2:44 AM > > To: Audacity-Devel list <[email protected]> > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for testing > > > > If it can't be recovered, it's fine, but it would be good to know why it saved a > > broken file anyways. > > > > > > Also on windows, if I right click on a file and click on "Open with audacity", I > > get a dialog that says "automated crash recovery of New Project" and then an > > unable to open database error. Nothing else can be imported/opened until I > > fully close audacity and open it again. > > Seems like something is broken if audacity isn't opened before the file is > > loaded into it. > > > > On Thu, Mar 18, 2021 at 12:31 AM Leland <[email protected]> wrote: > > > > > > I get the same error here...that's good. Something to do with Unicode > > > encoding...still checking. > > > > > > > -----Original Message----- > > > > From: Jack L. <[email protected]> > > > > Sent: Thursday, March 18, 2021 1:37 AM > > > > To: Audacity-Devel list <[email protected]> > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for testing > > > > > > > > In case the link didn't go through https://we.tl/t-u9D0IXqGW9 has > > > > the problem aup3 file and egrep > > > > > > > > On Wed, Mar 17, 2021 at 11:16 PM Jack L. <[email protected]> > > wrote: > > > > > > > > > > The file is sending via wetransfer, hopefully it can send to the list. > > > > > The dump|egrep is included in the transfer. Total is about 500M > > > > > bzipped > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 10:51 PM Leland <[email protected]> > > wrote: > > > > > > > > > > > > Oh, oh! Would you be able to compress it and upload to google > > > > > > drive or some such? If it's too big, can you send me the output from: > > > > > > > > > > > > sqlite3 ee.aup3 '.dump' | egrep 'project|autosave' > > > > > > > > > > > > That will dump the project file (just a binary representation of > > > > > > an XML > > > > > > document) and it may shed some light as to what has happened. > > > > > > If I can figure it out, I may be able to modify it, send it back > > > > > > to you, and you can replace it in the .aup3. > > > > > > > > > > > > > -----Original Message----- > > > > > > > From: Jack L. <[email protected]> > > > > > > > Sent: Thursday, March 18, 2021 12:07 AM > > > > > > > To: Audacity-Devel list <[email protected]> > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for > > > > > > > testing > > > > > > > > > > > > > > I'll have to check and get back to you. > > > > > > > > > > > > > > I just recorded a 1hr audio file on FreeBSD and saved it. > > > > > > > Tried to open it > > > > > > later > > > > > > > and it says "Unable to parse project information". > > > > > > > > > > > > > > file.aup3: SQLite 3.x database, application id 1096107097, > > > > > > > user version 50331648, last written using SQLite version > > > > > > > 3034001 > > > > > > > > > > > > > > Same thing happens when I try to open the file on windows. Any > > > > > > > ideas on > > > > > > how > > > > > > > I can recover the audio? > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 8:25 PM Leland <[email protected]> > > wrote: > > > > > > > > > > > > > > > > That's weird. It "should" detect gtk3 instead of gtk2. > > > > > > > > What does the cmake config spit out to the terminal? What > > > > > > > > does > > > "wx-config - > > > > -list" > > > > > > show? > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > From: Jack L. <[email protected]> > > > > > > > > > Sent: Wednesday, March 17, 2021 8:21 PM > > > > > > > > > To: Audacity-Devel list > > > > > > > > > <[email protected]> > > > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 for > > > > > > > > > testing > > > > > > > > > > > > > > > > > > Looks like using the patched wxwidgets didn't work > > > > > > > > > > > > > > > > > > ld-elf.so.1: Shared object "libwx_gtk2u_adv-3.1.so" not > > > > > > > > > found, required by "audacity" > > > > > > > > > > > > > > > > > > gtk2 support was removed in FreeBSD already. > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 6:07 PM Jack L. > > > > > > > > > <[email protected]> > > > > wrote: > > > > > > > > > > > > > > > > > > > > FreeBSD uses 3.1.4, will that be ok to use instead of > > > > > > > > > > the patched > > > > > > > > version? > > > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 6:01 PM Leland > > > > > > > > > > <[email protected]> > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > The reason we made our version "mandatory" is because > > > > > > > > > > > we were chased our tails looking for a bug that folks > > > > > > > > > > > using Ubuntu were reporting for many days only to find > > > > > > > > > > > out it was because the system version didn't have an > > > > > > > > > > > upstream patch > > > > that ours did. > > > > > > > > > > > Seriously, Paul and I wasted MANY hours trying to > > > > > > > > > > > track it > > > down. > > > > > > > > > > > > > > > > > > > > > > So, if FreeBSD has a more recent checkout of wx313, > > > > > > > > > > > then you should be okay with our patched build. > > > > > > > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > > > > From: Jack L. <[email protected]> > > > > > > > > > > > > Sent: Wednesday, March 17, 2021 7:56 PM > > > > > > > > > > > > To: Audacity-Devel list > > > > > > > > > > > > <[email protected]> > > > > > > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 RC 005 > > > > > > > > > > > > for testing > > > > > > > > > > > > > > > > > > > > > > > > Looks like =local worked but not sure how happy the > > > > > > > > > > > > freebsd build system > > > > > > > > > > > will > > > > > > > > > > > > take that, they likely won't have git installed or > > > > > > > > > > > > might have to add a dependency on git before it can be built. > > > > > > > > > > > > > > > > > > > > > > > > Are there any gotchas if the system wxwidgets are used? > > > > > > > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 5:47 PM Jack L. > > > > > > > > > > > > <[email protected]> > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > Let me try (I just got it to successfully compile > > > > > > > > > > > > > with the system version and a lot of patching), > > > > > > > > > > > > > but let me try with -Daudacity_use_wxwidgets=local > > > > > > > > > > > > > and see what > > > > happens. > > > > > > > > > > > > > > > > > > > > > > > > > > On Wed, Mar 17, 2021 at 5:10 PM Leland > > > > > > > > > > > > > <[email protected]> > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > Jack, you can specify > > > > > > > > > > > > > > -Daudacity_use_wxwidgets=local when configuring > > > > > > > > > > > > > > cmake and that will force the build to do a git pull of the > > correct wxWidgets sources. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > > > > > > > From: Jack L. <[email protected]> > > > > > > > > > > > > > > > Sent: Wednesday, March 17, 2021 5:29 PM > > > > > > > > > > > > > > > To: Audacity-Devel list > > > > > > > > > > > > > > > <[email protected]> > > > > > > > > > > > > > > > Subject: Re: [Audacity-devel] Audacity 3.0.0 > > > > > > > > > > > > > > > RC > > > > > > > > > > > > > > > 005 for testing > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-Audacity-3.0.0/lib-src/libnyquist/nyq > > > > > > > > > > > > > > > uist > > > > > > > > > > > > > > > /xlisp > > > > > > > > > > > > > > > /xlf > > > > > > > > > > > > > > > io.c > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Line 23 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > #error configuration error -- either XL_BIG_ > > > > > > > > > > > > > > > or XL_LITTLE_ENDIAN must be defined in xlisp.h > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > the "in xlisp.h" is uncommented and causing a > > > > > > > > > > > > > > > compilation > > > > > > > > error. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > And I've noticed this hard requirement for > > > > > > > > > > > > > > > wxwidgets, is there a way to > > > > > > > > > > > > > > get it > > > > > > > > > > > > > > > bundled within the tar so the automated build > > > > > > > > > > > > > > > system can compile it > > > > > > > > > > > > > > without > > > > > > > > > > > > > > > manual intervention? > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ################################################################# > > > > > > > > > > > > > > > ####### > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Audacity version 3.0.0 or higher requires > > > > > > > > > > > > > > > use of a customized > > > > > > > > > > > version of > > > > > > > > > > > > > > > wxWidgets. For details: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://wiki.audacityteam.org/wiki/Building_fo > > > > > > > > > > > > > > > r_Di > > > > > > > > > > > > > > > stros > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ################################################################# > > > > > > > > > > > > > > > ####### > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On Sun, Mar 7, 2021 at 4:25 AM James Crook > > > > > > > > > > > > > > > <[email protected]> > > > > > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > I'm hoping this one is going to be the > > > > > > > > > > > > > > > > actual > > > release. > > > > > > > > > > > > > > > > It's up on FossHub > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://www.fosshub.com/Audacity-devel.html > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Compressor is fixed and many links in the > > > > > > > > > > > > > > > > manual > > > fixed. > > > > > > > > > > > > > > > > If all goes > > > > > > > > > > > > > > well, > > > > > > > > > > > > > > > releasing March 21st. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > --James. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-win-3.0.0rc05.exe > > > > > > > > > > > > > > > > (application/x-msdownload) > > > > > > > > > > > > > > > > - > > > > > > > > > > > > > > > > 29379816 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > d767acfa3ea92b23cfa8b419e9a0ecb0adecaa9478f981427985faee580271e7 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-macos-3.0.0rc05.dmg (n/a) - > > > > > > > > > > > > > > > > 41326838 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > 4d2d6d695aa1ea9bb25b5083c31fa57fc5bc53750977a218f2d0a3ad6f88518b > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-minsrc-3.0.0rc05.tar.xz (n/a) - > > > > > > > > > > > > > > > > 13308608 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > d57a6619f857c07de873d4f53389ae57b480901c2faa4f79801985f9f1daa2f1 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-manual-3.0.0rc05.zip > > > > > > > > > > > > > > > > (application/x-zip-compressed) - > > > > > > > > > > > > > > > > 23102002 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > 77d6a2bf4155568d0983608d0a232f404c64f0d200303a46ee158cf8ff79a764 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > audacity-win-3.0.0rc05.zip > > > > > > > > > > > > > > > > (application/x-zip-compressed) > > > > > > > > > > > > > > > > - > > > > > > > > > > > > > > > > 12507490 bytes > > > > > > > > > > > > > > > > SHA-256 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > f7681aa47b1fe51aac8a21e3c81df7399f089c74eed5066dd3073edbf5f2cb06 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ____________________________________________ > > > > > > > > > > > > > > > > ___ audacity-devel mailing list > > > > > > > > > > > > > > > > [email protected] > > > > > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo > > > > > > > > > > > > > > > > /aud > > > > > > > > > > > > > > > > acity- > > > > > > > > > > > > > > > > deve > > > > > > > > > > > > > > > > l > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ______________________________________________ > > > > > > > > > > > > > > > _ audacity-devel mailing list > > > > > > > > > > > > > > > [email protected] > > > > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/a > > > > > > > > > > > > > > > udac > > > > > > > > > > > > > > > ity-de > > > > > > > > > > > > > > > vel > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > > > > [email protected] > > > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/aud > > > > > > > > > > > > > > acit > > > > > > > > > > > > > > y-deve > > > > > > > > > > > > > > l > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > > [email protected] > > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacit > > > > > > > > > > > > y-de > > > > > > > > > > > > vel > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > > > audacity-devel mailing list > > > > > > > > > > > [email protected] > > > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity- > > > > > > > > > > > deve > > > > > > > > > > > l > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > > audacity-devel mailing list > > > > > > > > > [email protected] > > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-deve > > > > > > > > > l > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > > audacity-devel mailing list > > > > > > > > [email protected] > > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > > audacity-devel mailing list > > > > > > > [email protected] > > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > audacity-devel mailing list > > > > > > [email protected] > > > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > _______________________________________________ > > > > audacity-devel mailing list > > > > [email protected] > > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > > > > > > > > > _______________________________________________ > > > audacity-devel mailing list > > > [email protected] > > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > _______________________________________________ > audacity-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/audacity-devel _______________________________________________ audacity-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/audacity-devel
audacity.txt
(text/plain, 11 KB)
diff -urN audacity/Makefile audacity3/Makefile
--- audacity/Makefile 2021-03-17 18:18:14.409967000 -0700
+++ audacity3/Makefile 2021-03-17 18:23:08.057356000 -0700
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= audacity
-PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTVERSION= 3.0.0
DISTVERSIONPREFIX= Audacity-
CATEGORIES= audio
@@ -17,9 +16,11 @@
libexpat.so:textproc/expat2 \
libportaudio.so:audio/portaudio \
libsndfile.so:audio/libsndfile \
- libsoxr.so:audio/libsoxr
+ libsoxr.so:audio/libsoxr \
+ libsqlite3.so:databases/sqlite3
-USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext \
+
+USES= cmake compiler:c++14-lang cpe desktop-file-utils gettext \
gnome libtool python:build pkgconfig shared-mime-info
USE_GITHUB= yes
USE_GNOME= cairo gtk30
@@ -136,8 +137,7 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
- /CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER},' ${WRKSRC}/CMakeLists.txt
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff -urN audacity/distinfo audacity3/distinfo
--- audacity/distinfo 2021-03-17 18:18:14.410544000 -0700
+++ audacity3/distinfo 2021-03-17 14:53:22.166990000 -0700
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593304211
-SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099
-SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430
+TIMESTAMP = 1616018002
+SHA256 (audacity-audacity-Audacity-3.0.0_GH0.tar.gz) = 14c5b6d661fbe85fa09b7caac5fa261e392a28150fa18fca91380e695ca76cc9
+SIZE (audacity-audacity-Audacity-3.0.0_GH0.tar.gz) = 64375465
diff -urN audacity/files/patch-cmake-proxies_CMakeLists.txt audacity3/files/patch-cmake-proxies_CMakeLists.txt
--- audacity/files/patch-cmake-proxies_CMakeLists.txt 2021-03-17 18:18:14.411503000 -0700
+++ audacity3/files/patch-cmake-proxies_CMakeLists.txt 2021-03-17 17:06:27.993127000 -0700
@@ -1,11 +1,11 @@
---- cmake-proxies/CMakeLists.txt.orig 2020-06-19 15:16:47 UTC
-+++ cmake-proxies/CMakeLists.txt
-@@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES
+--- cmake-proxies/CMakeLists.txt.orig 2021-03-09 02:19:38.000000000 -0800
++++ cmake-proxies/CMakeLists.txt 2021-03-17 17:04:26.573245000 -0700
+@@ -132,7 +132,7 @@
addlib( lame lame LAME YES YES "lame >= 3.100" )
addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
+addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio-2.0 >= 19" )
+ addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.32.0" )
# Optional libraries
- #
diff -urN audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt audacity3/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt
--- audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt 1969-12-31 16:00:00.000000000 -0800
+++ audacity3/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt 2021-03-17 18:22:57.281686000 -0700
@@ -0,0 +1,20 @@
+--- cmake-proxies/wxWidgets/CMakeLists.txt.orig 2021-03-09 02:19:38.000000000 -0800
++++ cmake-proxies/wxWidgets/CMakeLists.txt 2021-03-17 18:22:13.373870000 -0700
+@@ -237,17 +237,6 @@
+ "^#define +wxVERSION_STRING +"
+ )
+
+-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
+-if( NOT ours )
+- message( FATAL_ERROR
+- "\n########################################################################\n"
+- "Audacity version 3.0.0 or higher requires use of a customized version of "
+- "wxWidgets. For details:\n"
+- " https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
+- "########################################################################\n"
+- )
+-endif()
+-
+ target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
+ target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
+ target_compile_options( ${TARGET} INTERFACE ${COPTS} )
diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h audacity3/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
--- audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h 2021-03-17 18:18:14.411995000 -0700
+++ audacity3/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h 2021-03-17 17:29:00.558546000 -0700
@@ -1,6 +1,6 @@
---- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2018-10-01 14:07:33 UTC
-+++ lib-src/libnyquist/nyquist/cmt/cext.h
-@@ -61,7 +61,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca
+--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2021-03-09 02:19:38.000000000 -0800
++++ lib-src/libnyquist/nyquist/cmt/cext.h 2021-03-17 17:28:08.121777000 -0700
+@@ -61,7 +61,7 @@
#include <malloc.h>
#endif
diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h audacity3/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h
--- audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h 2021-03-17 18:18:14.412480000 -0700
+++ audacity3/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,10 +0,0 @@
---- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig 2016-07-26 13:34:06 UTC
-+++ lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h
-@@ -33,6 +33,7 @@
- #define STK_FILEREAD_H
-
- #include "Stk.h"
-+#include <stdio.h>
-
- namespace Nyq
- {
diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c
--- audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c 1969-12-31 16:00:00.000000000 -0800
+++ audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c 2021-03-17 17:10:24.731448000 -0700
@@ -0,0 +1,12 @@
+--- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig 2021-03-09 02:19:38.000000000 -0800
++++ lib-src/libnyquist/nyquist/xlisp/xlfio.c 2021-03-17 17:09:35.677331000 -0700
+@@ -19,8 +19,7 @@
+ /* do some sanity checking: */
+ #ifndef XL_BIG_ENDIAN
+ #ifndef XL_LITTLE_ENDIAN
+-#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined
+-in xlisp.h
++#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h
+ #endif
+ #endif
+ #ifdef XL_BIG_ENDIAN
diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
--- audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h 2021-03-17 18:18:14.412997000 -0700
+++ audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h 2021-03-17 17:24:54.245582000 -0700
@@ -1,6 +1,6 @@
---- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2016-07-26 13:34:06 UTC
-+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
-@@ -161,6 +161,15 @@ extern long ptrtoabs();
+--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2021-03-17 17:23:49.169659000 -0700
++++ lib-src/libnyquist/nyquist/xlisp/xlisp.h 2021-03-17 17:24:27.385843000 -0700
+@@ -172,6 +172,15 @@
#endif
#endif
@@ -13,6 +13,6 @@
+#endif
+#endif
+
- /* Apple CC */
+ /* Apple CC (xcode, macOS, macintosh) */
#ifdef __APPLE__
#define NNODES 2000
diff -urN audacity/files/patch-src_AboutDialog.cpp audacity3/files/patch-src_AboutDialog.cpp
--- audacity/files/patch-src_AboutDialog.cpp 2021-03-17 18:18:14.414531000 -0700
+++ audacity3/files/patch-src_AboutDialog.cpp 2021-03-17 17:07:25.690640000 -0700
@@ -1,6 +1,6 @@
--- src/AboutDialog.cpp.orig 2020-06-28 06:25:54 UTC
+++ src/AboutDialog.cpp
-@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
+@@ -62,7 +62,7 @@ hold information about one contributor to Audacity.
// RevisionIdent.h may contain #defines like these ones:
//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
diff -urN audacity/files/patch-src_AudioIO.cpp audacity3/files/patch-src_AudioIO.cpp
--- audacity/files/patch-src_AudioIO.cpp 2021-03-17 18:18:14.415030000 -0700
+++ audacity3/files/patch-src_AudioIO.cpp 2021-03-17 17:07:04.224080000 -0700
@@ -1,6 +1,6 @@
--- src/AudioIO.cpp.orig 2020-06-19 15:16:47 UTC
+++ src/AudioIO.cpp
-@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla
+@@ -490,7 +490,6 @@ time warp info and AudioIOListener and whether the pla
#define ROUND(x) (int) ((x)+0.5)
//#include <string.h>
// #include "../lib-src/portmidi/pm_common/portmidi.h"
@@ -8,7 +8,7 @@
#include "NoteTrack.h"
#endif
-@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private)
+@@ -814,13 +813,22 @@ struct AudioIoCallback::ScrubState (private)
// return the system time as a double
static double streamStartTime = 0; // bias system time to small number
diff -urN audacity/files/patch-src_widgets_Grid.cpp audacity3/files/patch-src_widgets_Grid.cpp
--- audacity/files/patch-src_widgets_Grid.cpp 1969-12-31 16:00:00.000000000 -0800
+++ audacity3/files/patch-src_widgets_Grid.cpp 2021-03-17 17:11:40.933594000 -0700
@@ -0,0 +1,11 @@
+--- src/widgets/Grid.cpp.orig 2021-03-09 02:19:38.000000000 -0800
++++ src/widgets/Grid.cpp 2021-03-17 17:03:30.286591000 -0700
+@@ -572,7 +572,7 @@
+ {
+ wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol));
+ wxClipboard::Get()->SetData(data);
+- SetCellValue(crow, ccol, {});
++ SetCellValue(crow, ccol, "");
+ return;
+ }
+ break;
diff -urN audacity/pkg-plist audacity3/pkg-plist
--- audacity/pkg-plist 2021-03-17 18:18:14.416880000 -0700
+++ audacity3/pkg-plist 2021-03-17 17:58:32.257598000 -0700
@@ -49,8 +49,6 @@
%%DATADIR%%/nyquist/velocity.lsp
%%DATADIR%%/nyquist/xlinit.lsp
%%DATADIR%%/nyquist/xm.lsp
-%%DATADIR%%/plug-ins/SilenceMarker.ny
-%%DATADIR%%/plug-ins/SoundFinder.ny
%%DATADIR%%/plug-ins/SpectralEditMulti.ny
%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny
%%DATADIR%%/plug-ins/SpectralEditShelves.ny
@@ -64,6 +62,7 @@
%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
%%DATADIR%%/plug-ins/equalabel.ny
%%DATADIR%%/plug-ins/highpass.ny
+%%DATADIR%%/plug-ins/label-sounds.ny
%%DATADIR%%/plug-ins/limiter.ny
%%DATADIR%%/plug-ins/lowpass.ny
%%DATADIR%%/plug-ins/noisegate.ny
@@ -93,6 +92,7 @@
%%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
+%%NLS%%share/locale/co/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/da/LC_MESSAGES/audacity.mo
@@ -119,6 +119,7 @@
%%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/my/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo