Hi, is this ok to upgrade?

Comment 2 Daniel Engberg 2021-09-04 20:37:12 UTC

Since upstream doesn't generate static source archives use USE_GITHUB instead of MASTER_SITES
https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-master_sites-github-description

Should users be aware of any changes due the recent forks (Telemetry etc)?

Comment 3 Neel Chauhan 2021-09-05 01:07:24 UTC

Build fails:

-- Added inteface expat::expat /usr/local/include /usr/local/lib/libexpat.sowxWidgets_LIBRARIES=general;-L/usr/local/lib;general;-pthread;general;-lwx_baseu-3.1;general;-lwx_gtk3u_core-3.1;general;-lwx_gtk3u_html-3.1;general;-lwx_gtk3u_qa-3.1;general;-lwx_baseu_xml-3.1;general;-lwx_baseu_net-3.1
wxWidgets_LIBRARY_DIRS=/usr/local/lib
-- Using 'wxWidgets' system library
CMake Error at cmake-proxies/cmake-modules/AudacityFunctions.cmake:133 (message):                                       
  Invalid value "local" for option audacity_use_libmp3lame.  Valid values
  are: system                           
Call Stack (most recent call first):
  cmake-proxies/cmake-modules/AudacityDependencies.cmake:129 (cmd_option)
  cmake-proxies/CMakeLists.txt:84 (add_conan_lib)


-- Configuring incomplete, errors occurred!

(In reply to Daniel Engberg from comment #2)
I'll change to USE_GITHUB. I think the only additional feature is the auto check for update that can be disabled in the app preferences after install.

(In reply to Neel Chauhan from comment #3)
Will check, the patch for system lame detection probably broke non system lame.

Created attachment 227702 [details]
Patch to upgrade audacity from 3.0.2 to 3.0.4

Change to USE_GITHUB
Fix lame checking
midi support is required to compile

How does this look now?

Comment 8 Neel Chauhan 2021-09-12 23:16:18 UTC

Sorry for the delay. I will test and hopefully commit the port today.

I will write here that when it shows the print preview, if evince is not installed, it will not run with the message
exec: evince: not found

Ok, I will check and add dependency for evince

Created attachment 227903 [details]
Upgrade to audacity 3.0.4 from 3.0.2

Added dependency on evince.

(In reply to Jack from comment #11)

Thank you for taking action on my comment.
However, I'm sorry.

It was libgtk-3.so.0 that was emitting exec: evince: not found.
So audacity has nothing to do with it.

Additionally, this can be suppressed with ~/.config/gtk-3.0/settings.ini such as
[Settings]
gtk-print-preview-command="true"

Therefore, let's change the attachment to commit from 227903 back to attachment 227702 [details].

(In reply to Tatsuki Makino from comment #12)

ok sounds good, less dependencies the better, although i did get that error when i did print preview too but maybe the other port needs that dep?

(In reply to Jack from comment #13)

If the gnome3 metaport is installed and GNOME 3 is used as a desktop, evince will also be installed.
I am using GTK applications (audacity, etc.) without GNOME desktop, so evince was missing.

And as per my previous comment #12, the command used for print preview can be changed, so there is no need to depend on evince for print preview.

Another example configuration:
gtk-print-preview-command = "xmessage" "%s" "%f"

Ok sounds good, let's use the patch before the evince dependency, thanks

Is this ok to commit now?

Created attachment 228111 [details]
poudriere log

(In reply to Jack from comment #16)

I applied attachment 227702 [details] as follows and ran poudriere, and it stopped as shown in the log.

git apply -p1 --directory=audio/audacity -- audacity.txt

It doesn't use DISABLE_MAKE_JOBS=poudriere, so I don't know if that's a problem with parallel jobs.

One more thing, it should be using INSTALL_TARGET=install/strip defined in Mk/Uses/cmake.mk, so strip in post-install target may be excessive.
However, I have not checked this :)

The fatal error: 'RevisionIdent.h' file not found error I think is missing a patch, I'll add that.

Will check on the strip part and update with a new patch that should resolve both.

Created attachment 228129 [details]
Updated patch to upgrade audacity from 3.0.2 to 3.0.4

Fix compile error.

Confirmed that /bin/audacity is stripped so removed the duplicate strip on post-install.

(In reply to Jack from comment #20)

I applied attachment 228129 [details] and ran poudriere.
First, libevview3.so:graphics/evince in LIB_DEPENDS is not required. (It was my mistake #12 :) )

I deleted evince and ran it, but it stopped at check-plist phase.
Here's an excerpt from the log showing where the problem is.

====> Running Q/A tests (stage-qa)
Error: /usr/local/bin/audacity is linked to /usr/local/lib/libwx_gtk3u_core-3.1.so.5 which does not have a SONAME.  x11-toolkits/wxgtk31 needs to be fixed.
Error: /usr/local/bin/audacity is linked to /usr/local/lib/libwx_gtk3u_html-3.1.so.5 which does not have a SONAME.  x11-toolkits/wxgtk31 needs to be fixed.
Error: /usr/local/bin/audacity is linked to /usr/local/lib/libmp3lame.so.0 from audio/lame but it is not declared as a dependency
Warning: you need LIB_DEPENDS+=libmp3lame.so:audio/lame
Error: /usr/local/bin/audacity is linked to /usr/local/lib/libharfbuzz.so.0 from print/harfbuzz but it is not declared as a dependency
Warning: you need LIB_DEPENDS+=libharfbuzz.so:print/harfbuzz
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: audacity
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
*** Error code 1

Stop.
make: stopped in /usr/ports/audio/audacity
=>> Error: check-plist failures detected

The error in libwx seems to be caused by wx (Mk/bsd.wx.mk) side.
The error with lame is that even if the option LAME is off, if the FFMPEG option is on, lame will be installed with the ffmpeg dependency and will link to it by itself. Perhaps LAME_CMAKE_OFF is needed, but I have not checked.
The harfbuzz error occurs when the option DOCS is on, installed with other dependencies, and does not cause problems, but requires a direct lib-dependency because audacity also links.

One more thing.
The new file is installed in ${PREFIX}/audacity.
It is ${WRKSRC}/linux/audacity.sh installed by ${WRKSRC}/src/CMakeLists.txt.

I must have made a diff with an old copy of my port (too many changes). Will delete the evince again. Will check out the other issues.

I just checked up on lame and it appears LAME is now required and not optional. Removing the option for excluding lame.

I can't seem to figure out why the make check-plist fails, can you help?

(In reply to Jack from comment #25)

It seems that my comment #22 was poorly written :)

Normally ${PREFIX} is /usr/local, but in this case, there is a shell script that will be installed in "/usr/local/audacity".
The source file for /usr/local/audacity is located in "audacity-Audacity-3.0.4/linux/audacity.sh".
The definitions for installing audacity-Audacity-3.0.4/linux/audacity.sh can be found in "audacity-Audacity-3.0.4/src/CMakeLists.txt".

install( PROGRAMS "${PROJECT_SOURCE_DIR}/linux/audacity.sh"
 DESTINATION "."
 RENAME "audacity" )

You can get the output for the contents of pkg-plist with make makeplist.

Created attachment 228220 [details]
pkg-plist fixes tp upgrade audacity to 3.0.4

Hopefully no more issues with this newest patch.

Created attachment 228272 [details]
poudriere log run with attachment 228220 [details]

(In reply to Jack from comment #27)

The building of the audacity package is complete.
However, there is no indication that the curl added to LIB_DEPENDS is being used.

curl is used by "audacity-Audacity-3.0.4/libraries/lib-network-manager/CMakeLists.txt" , but getting there depends on the conditions of "audacity-Audacity-3.0.4/libraries/CMakeLists.txt".
It seems that audacity_has_networking is needed for CMAKE_ON to make that condition true.

(In reply to Tatsuki Makino from comment #28)
Ah, curl was required in 3.0.4 but I had to import a patch to fix some CMakeList.txt issues and it added the new audacity_has_networking that probably doesn't work. If the patch were to be reverted, then curl would be required. Not sure if a future release will require curl. Possible to just delete LIB_DEPENDS on curl without making a new patch (my PC I use to make the patch is off currently).

Actually, let's leave that depend on curl in place for now because I have -Daudacity_use_curl:STRING=system which was meant for unpatched 3.0.4. Maybe we can correctly fix the curl in the next release? 3.0.4 is a little hackish with the bugs it was released with.

(In reply to Jack from comment #30)

What is curl used for, anyway?
As far as I can see, the class NetworkManager (audacity-Audacity-3.0.4/libraries/lib-network-manager/NetworkManager.cpp) requires curl.
That NetworkManager class is only used by the UpdateManager (audacity-Audacity-3.0.4/src/update/UpdateManager.cpp).

If it is a function that checks for updates and replaces files, then it should be turned off. Because pkg keeps a hash of all the files it installs.

I think it's used to download local dependencies if not available in the system. Will dig deeper and see.

I just checked, audacity won't compile without curl even when passing -D audacity_has_networking=no

-- Checking for module 'portmidi >= 0.1'
--   Package 'portmidi', required by 'virtual:world', not found
CMake Error at cmake-proxies/cmake-modules/AudacityFunctions.cmake:659 (message):
  Failed to find the system package midi
Call Stack (most recent call first):
  cmake-proxies/CMakeLists.txt:180 (addlib)


-- Configuring incomplete, errors occurred!
See also "/usr/obj/usr/ports/audio/audacity/work/.build/CMakeFiles/CMakeOutput.log".
See also "/usr/obj/usr/ports/audio/audacity/work/.build/CMakeFiles/CMakeError.log".
*** Error code 1

Stop.
make[1]: stopped in /usr/ports/audio/audacity
*** Error code 1

(In reply to Jack from comment #33)

Isn't it set to -Daudacity_use_midi:STRING=system somewhere?
If system is used instead of local, I think audio/portmidi will be used.
LIB_DEPENDS=libportmidi.so:audio/portmidi

(In reply to Tatsuki Makino from comment #34)
Looks like depending on audio/portmidi fixed that issue but then portSMF throws an error without curl.

-- Checking for module 'portSMF >= 0.1'
--   Package 'portSMF', required by 'virtual:world', not found
CMake Error at cmake-proxies/cmake-modules/AudacityFunctions.cmake:659 (message):
  Failed to find the system package portsmf
Call Stack (most recent call first):
  cmake-proxies/CMakeLists.txt:194 (addlib)

(In reply to Jack from comment #35)

portsmf seems to be a part of PortMedia, but it just backports the changes made in Audacity.
Therefore, and because the bundled version of Audacity is the most recent and has undergone further changes, you should use the bundled source by -Daudacity_use_portsmf:STRING=local.

By the way, I can't reproduce the problem that seems to be caused by the system and local being swapped.
Did you change anything else besides removing the curl?

(In reply to Tatsuki Makino from comment #36)
I removed

-Daudacity_use_curl:STRING=system

From the Makefile, can you see if you can successfully compile if that line is removed?

It looks like 3.0.5 just came out, will have to abandon this and look into getting 3.0.5 working.

Created attachment 228346 [details]
Reproducing the Empty Directory Problem

(In reply to Jack from comment #38)

Sorry, I'm so late :)
I was immersed in the post-install target empty directory problem.
The cause is in audacity-Audacity-3.0.4/cmake-proxies/cmake-modules/CopyLibs.cmake
The attached file is a simple reproduction of the cause of the problem.

Also, regarding 3.0.4, the build succeeds even if -Daudacity_use_curl:STRING=system is removed after the attachment 228220 [details] patch is applied.

Created attachment 228347 [details]
Makefile remnants for 3.0.4

(In reply to Jack from comment #37)

I've been working on the areas I was interested in.

Since LIB_DEPENDS contains BUILD_DEPENDS, I removed audio/lame from BUILD_DEPENDS.
libcurl.so:ftp/curl is not required.
-Daudacity_use_curl:STRING is not required.
-Daudacity_use_libmp3lame:STRING=system is also not required if no static link is used.
Added audacity_has_networking and audacity_has_updates_check to CMAKE_OFF.
Fix option ID3TAG and MAD
Changed the files to strip. It will run when DEBUG option is off.
post-patch target is garbage :) This will be fixed somewhat in 3.0.5 :)

Additional.
The reason why the files found by ${FIND} ${STAGEDIR}${PREFIX}/lib/audacity -name '*.so*' are not stripped is because of the poor usage of the install() command in audacity-Audacity-3.0.4/src/CMakeLists.txt.
It might be better to add a type, but I don't know :)

Okie, I'll be looking at the 3.0.5 in the next few days.

Created attachment 228475 [details]
Upgrade to audacity 3.0.5

I incorporated your changes without the post-patching and added a dependency on portmidi. I'm not sure about your post-patch part so I left that off. It looks like the changes between 3.0.4 and 3.0.5 are minimal. Can you help me check and see if we need your post-patches with my new patch and/or fix my Makefile so it has the correct patching?

Created attachment 228534 [details]
poudriere log run with attachment 228475 [details]

(In reply to Jack from comment #43)

Building audacity packages is a success.

In this patch,

The strip in the post-install target is not needed.
bin/${PORTNAME} is still striped in 3.0.5.
lib/${PORTNAME}/modules/mod-script-pipe.so is not stripped in 3.0.5, but post-install-DEBUG-off target will find it and strip it.
The pattern '*.so*' is used in line 1396 of audacity-Audacity-3.0.5/src/CMakeLists.txt.

CPPFLAGS and LDFLAGS for lame are written in Makefile, but cmake-proxies/cmake-modules/Findlibmp3lame.cmake, which is added by the patch, can find lame without them.

Also, the empty directory issue written in the post-install target occurs at the end of the build phase, so I guess that can be moved to the post-build target.
The reason why there is an empty directory there is because the reason it is created is not working properly, and I think it is possible to omit the process.
add_custom_command in line 1313 of audacity-Audacity-3.0.5/src/CMakeLists.txt executes it.

Created attachment 228536 [details]
Upgrade to audacity 3.0.5

Ok, I made the changes you suggested, can you check to see if it looks right now?

(In reply to Jack from comment #45)

Sorry, 3.0.5 still has the empty directory issue.
If "@${FIND} ${STAGEDIR} -type d -empty -delete" is to be removed, the following part of audacity-Audacity-3.0.5/src/CMakeLists.txt must not be executed.

   # Copy the required wxWidgets libs into the bundle
   add_custom_command(
      TARGET
         ${TARGET}
      COMMAND
         ${CMAKE_COMMAND} -D SRC="${_EXEDIR}/audacity"
                          -D DST="${_DEST}/${_PKGLIB}"
                          -D WXWIN="${_SHARED_PROXY_BASE_PATH}/$<CONFIG>"
                          -P ${AUDACITY_MODULE_PATH}/CopyLibs.cmake
      POST_BUILD
   )

I think it is better to delete it once before entering stage phase, because stagedir is created during build phase.

post-build:
    # delete empty directories: https://github.com/audacity/audacity/issues/808
    @${RM} -r ${STAGEDIR}

However, that part has been added by yuri@FreeBSD (Bug 254598 comment #22), we'll leave it untouched. :)
I just want to write down here what I found out about the cause of the issue. So that other people can save time doing the same thing. :)

(In reply to Tatsuki Makino from comment #46)
Ok, do I need to create a new patch or can you add that for me with the current patch?

(In reply to Jack from comment #47)

When a patch is uploaded here that restores the 2 lines about "# delete empty directories" that are deleted in attachment 228536 [details], it will be a patch that can be committed immediately.

Other matters are overstuffed references to be fixed upstream. :)

Ok, so do I need to make a new patch or is the one I have good to go?

Created attachment 228551 [details]
poudriere log run with attachment 228536 [details]

(In reply to Jack from comment #49)

If the attachment 228536 [details] is committed as is, it will cause an empty directory issue.
So it has to be committed with the two lines of the workaround back in place.
It would be easier to understand if a new patch had been uploaded.

Created attachment 228552 [details]
post-patch to delete empty dirs added

Upgrade to audacity 3.0.5

Created attachment 228554 [details]
poudriere log run with attachment 228552 [details]

(In reply to Jack from comment #51)

I think the patch is fine now.
(One space character was missing from the comment line, so that will be changed.)

Note that the newline character in the patch file has been changed, so it was necessary to run tr -d \\r < /tmp/audacity.txt > /tmp/audacity.txt.txt
 before git apply -p1 --directory audio/audacity -- /tmp/audacity.txt.txt.

(In reply to Tatsuki Makino from comment #52)
Not sure why, maybe because I was using so many different computers to make these patches ;) As long as I don't have to make another patch!

How is this looking? Can the patch work with the unix2dos and patch -p1?

Any news on this?

Created attachment 228904 [details]
Upgrade to audacity 3.0.5

Cleaned up patch to upgrade to 3.0.5

(In reply to Jack from comment #56)
I added a cleaned up patch without the DOS chars and -p1 not needed.

Comment 58 Kurt Jaeger 2021-10-24 11:39:13 UTC

(In reply to Jack from comment #57)
testbuild@work

This port is now broken by commit in

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259173

ld-elf.so.1: Shared object "libSoundTouch.so.1" not found, required by "audacity"

Can we get this port updated soon?

(In reply to Jack from comment #59)

It is since bug 258730 was commited.
At that time, audio/audacity was not bumped for PORTREVISION.
I don't know about the official version of package, but the port works fine once it is rebuilt.

(In reply to Tatsuki Makino from comment #60)
Can we get this port upgraded to 3.0.5? 3.1.0 came out a few days ago and I keep having to make patches against 3.0.2 because this port is still not committed.

(In reply to Jack from comment #61)

Even with the latest patch, the build in poudriere is expected to have the same result as attachment 228554 [details], so I think it is safe to commit.

The other problem is the difference in the format of the patches required by different committers :)
From now on, it seems to be better to create patches using "git format-patch".

(In reply to Tatsuki Makino from comment #62)
Ok, I'm new to git so didn't know how to create a patch with git. Will do that with 3.1.0. Are you able to commit it so I can create 3.1.0 against 3.0.5? My tree is turning into a mess with all the different versions.

(In reply to Jack from comment #63)

Sorry, I'm not a committer, so that part... :)
I use audacity relatively often, so I'm here to write a supplement that committers can commit to immediately.
There is something wrong with 3.0.2 :)

(In reply to Tatsuki Makino from comment #64)
Ah, ok. 3.0.2 works but it gets harder and harder to patch when the version gets too old. Hopefully someone can commit this soon.

Comment 66 Fernando Apesteguía 2021-10-30 07:52:22 UTC

Builds fine in 12.2{amd64,i386}, 13.0amd64 and -CURRENT amd64.

Runs fine in 13.0amd64.

If nobody says otherwise I will commit this later today.

Comment 67 commit-hook 2021-10-30 09:48:47 UTC

A commit in branch main references this bug:

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

commit e9eb4687c7ca4e78a1fcc86ee071230ab16df350
Author:     Jack <xxjack12xx@gmail.com>
AuthorDate: 2021-10-27 08:18:00 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2021-10-30 09:43:03 +0000

    audio/audacity: Upgrade to 3.0.5

    ChangeLog: https://wiki.audacityteam.org/wiki/Release_Notes_3.0.4

    While here:

     * Pet linters
     * Add gdkpixbuf2 depdendency

    PR:     258107
    Reported by:    xxjack12xx@gmail.com (maintainer)
    Reviewed by:    diizzy@, nc@, tatsuki_makino@hotmail.com

 audio/audacity/Makefile                            |  71 ++++---
 audio/audacity/distinfo                            |   6 +-
 .../files/patch-cmake-proxies_CMakeLists.txt       |  72 ++++++-
 ..._cmake-modules_AudacityDependencies.cmake (new) | 227 +++++++++++++++++++++
 ...roxies_cmake-modules_Findlibmp3lame.cmake (new) |  32 +++
 ...make-modules_dependencies_wxwidgets.cmake (new) |  14 ++
 ...h-cmake-proxies_wxWidgets_CMakeLists.txt (gone) |  20 --
 audio/audacity/files/patch-src_AboutDialog.cpp     |   8 +-
 .../files/patch-src_widgets_Grid.cpp (gone)        |  11 -
 audio/audacity/pkg-plist                           |   9 +-
 10 files changed, 391 insertions(+), 79 deletions(-)

Comment 68 Fernando Apesteguía 2021-10-30 09:49:11 UTC

Committed,

Thanks!