How is this looking? Can it be committed?

Created attachment 229253 [details]
Upgrade to audacity 3.1.0

Updated with vendor patches to fix a compilation error, removing my unofficial patch.

Can this update be committed soon?

Comment 4 Fernando Apesteguía 2021-11-08 17:17:42 UTC

^Triage: Maintainer-feedback flag (+) not required unless requested (?) first.

Build testing...

Comment 5 Fernando Apesteguía 2021-11-08 21:46:16 UTC

It fails to build for me:

...
conanfile.txt: Generated graphinfo
ERROR: Not able to automatically detect '/usr/bin/cc' version
ERROR: Unable to find a working compiler

The port is using clang:

Configuration:
[settings]
arch=x86_64
arch_build=x86_64
build_type=Release
compiler=clang
compiler.libcxx=libc++
compiler.version=11
os=FreeBSD
os_build=FreeBSD
[options]
[build_requires]
[env]

Dos this port need USE_GCC=yes?

(In reply to Fernando Apesteguía from comment #5)
It should compile fine with clang, what OS version are you building with? It builds fine with 13.0 x64

Comment 7 Fernando Apesteguía 2021-11-08 22:46:28 UTC

(In reply to Jack from comment #6)
12.2{amd64,i386} and 13.0amd64. All on poudriere.

(In reply to Fernando Apesteguía from comment #7)
Can you provide a build log? I'm unable to reproduce.

Comment 9 Fernando Apesteguía 2021-11-09 09:54:37 UTC

Created attachment 229377 [details]
Poudriere log for 13.0amd64

Comment 10 Fernando Apesteguía 2021-11-09 09:55:05 UTC

Created attachment 229378 [details]
CMakeError.log

I can't seem to reproduce the issue on any of my machines, I'll have to set up a new fresh install to see if I can reproduce.

Comment 12 Fernando Apesteguía 2021-11-09 21:32:06 UTC

(In reply to Jack from comment #11)
Does it build for you in poudriere?
If so, can you upload a poudriere log for comparison?

(In reply to Fernando Apesteguía from comment #12)
Unfortunately I still haven't figured out how to get poudriere working, is there a quick way to set it up so I can produce the output?

Does the error happen on another machine for you?

I just did a fresh install of FreeBSD 13 and was able to reproduce the error. It looks like it happens if git is not installed. Should I add a dependency on git to solve the issue?

Created attachment 229399 [details]
Upgrade to audacity 3.1.0

Make LADSPA checked by default and fix case when git is not installed.

I made a patch to fix the case when git is not installed, can you see if that solves the issue?

Comment 18 Fernando Apesteguía 2021-11-10 06:12:12 UTC

(In reply to Jack from comment #17)
Patch does not apply. Could you please update it. Specifically there seems to be a whole diff embedded in the diff itself. See:

diff -urN audacity-orig/diff audacity/diff <-------
--- audacity-orig/diff	1969-12-31 16:00:00.000000000 -0800
+++ audacity/diff	2021-11-09 19:39:09.069460000 -0800
@@ -0,0 +1,549 @@
+diff -urN audacity/Makefile audacity-new/Makefile
+--- audacity/Makefile	2021-10-30 15:19:13.310279000 -0700
++++ audacity-new/Makefile	2021-10-30 20:03:16.791246000 -0700
+@@ -2,7 +2,7 @@
+ 
+ PORTNAME=	audacity
+ DISTVERSIONPREFIX=	Audacity-
+-DISTVERSION=	3.0.5
++DISTVERSION=	3.1.0
+ CATEGORIES=	audio 
....
....

Cheers

Comment 19 Fernando Apesteguía 2021-11-10 06:15:53 UTC

(In reply to Jack from comment #15)
Those are the cases poudriere catches best. In your case it worked because you have git in your local machine. In poudriere fails because in the port git is not a dependency and poudriere will not install anything by default.
In addition, the fail message from audacity could be more informational :-)

Setting up poudriere is pretty easy. You just need to create a ports collection and a jail. Everything using poudriere commands. Have a look at:

https://docs.freebsd.org/en/books/porters-handbook/book/#testing-poudriere

Cheers.

ack, forgot to delete the orig diff before i made a diff, i'll delete the diff from the diff.

and yes, it would be a more useful error message if it didn't just say the compiler was bad ;)

Created attachment 229400 [details]
Fixed previous duplicated patch inside patch

Comment on attachment 229400 [details]
Fixed previous duplicated patch inside patch

Still extra files, need to start over, messed up. Will have a new patch in a moment.

Created attachment 229401 [details]
Update to audacity 3.1.0

Cleaned out empty files

Comment 24 Fernando Apesteguía 2021-11-10 07:28:39 UTC

(In reply to Jack from comment #23)
Thanks for the new patch. Looks good. It is build testing now.

The patch was in DOS format. Just try to not paste it the text box. Bugzilla does not handle that properly!

Cheers.

Comment 25 commit-hook 2021-11-11 14:22:25 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6bf0135b415ee56a9e84ac82f80a7eb438fe497a

commit 6bf0135b415ee56a9e84ac82f80a7eb438fe497a
Author:     Jack <xxjack12xx@gmail.com>
AuthorDate: 2021-11-10 07:18:57 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2021-11-11 14:17:10 +0000

    audio/audacity: Update to 3.1.0

    ChangeLog: https://www.audacityteam.org/audacity-3-1-is-out-now/

    PR:     259565
    Reported by:    xxjack12xx@gmail.com (maintainer)

 audio/audacity/Makefile                            |   8 +-
 audio/audacity/distinfo                            |   6 +-
 .../patch-cmake-proxies_CMakeLists.txt (gone)      |  77 -------
 ...cmake-modules_AudacityDependencies.cmake (gone) | 227 ---------------------
 ...oxies_cmake-modules_Findlibmp3lame.cmake (gone) |  32 ---
 ...ake-modules_dependencies_wxwidgets.cmake (gone) |  14 --
 ...atch-cmake-proxies_libsoxr_CMakeLists.txt (new) |  10 +
 ...atch-lib-src_portmidi_porttime_ptlinux.c (gone) |  42 ----
 .../patch-lib-src_portmixer_CMakeLists.txt (new)   |  11 +
 audio/audacity/files/patch-src_AudioIO.cpp (gone)  |  34 ---
 .../audacity/files/patch-src_CMakeLists.txt (new)  |  11 +
 audio/audacity/files/patch-src_MIDIPlay.cpp (new)  |  11 +
 audio/audacity/pkg-plist                           |  14 ++
 13 files changed, 64 insertions(+), 433 deletions(-)

Comment 26 Fernando Apesteguía 2021-11-11 14:23:20 UTC

Committed,

Sorry for the delay and thanks for all the changes.

Cheers!