Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Audacity 3.2.3 #28715

Closed
wants to merge 7 commits into from
Closed

Audacity 3.2.3 #28715

wants to merge 7 commits into from

Conversation

ArsenArsen
Copy link
Member

To reviewers: please do not merge, but feedback is, of course, encouraged.

Afternoon,

This PR includes a modified version of the wxGTK patch by @listout (thanks!)
with a few autodeps discovered by qa-vdb fixed, and a passing (non-GUI)
testsuite. As suggested in the original bump PR (#28360) this version retains
the autotools(ish) build system.

Note that the PR includes a horrid hack in the eselect-wxwidgets commit. I've
sent a patch to the wxwidgets project address with a more proper solution
(placing a few execs in). This is required by FindwxWidgets.cmake in the
Audacity tree.

The wxGTK ebuild specifies a USEDEP on both pcre{16,32}. This is because the
chosen library depends on architecture (namely, wchar_t size). The alternative
that I see immediately is --enable-utf8, but flipping this flag causes ABI to
break according to abidiff (I didn't give it too close of an inspection, but I
can definitely see that being the case, since it changes how wxWidgets
represents strings). I'd like to hear whether @leio has any alternatives or
thougts on that topic too.

Notably, maybe libpcre2[unicode] should also be depended on, since AFAICT it's
assumed that the linked pcre2 works on Unicode wchars. I also decided to drop
the subslot operator on this dependency since, according to the libpcre2
metadata, the subslot represents the ABI version of -posix.

I lack the experience required to be sure in my review of the wxGTK PR, but my
"generic steps" for checking find the current revision probably okay - with the
caveat that I haven't gone over the full configure.in yet (but I can before
this is merged, but I'd like to get a "first pass" out so that I can dedicate a
little bit of time back to some other projects).


Now, onto the star of the show. The Audacity ebuild allows telemetry in
Audacity to be re-enabled. I'm unconvinced this is useful, as I needed to rip
keys out of prebuilts to actually provide them, it's off by default, the
breakpad support is disabled since that fails to build, and would likely be
useless (since it requires that the receiving side of the crash reports has
debug info). Playing around in it a bit with -telemetry, I only see one
non-UNIX %socket syscall, namely a bind to localhost; though I'm sure my random
button clicking has low coverage - I haven't a clue what these buttons do.
Unless there's secret codes in the ASCII art and music notation embedded in the
main executable and lib-... modules, or hard-coded IPs, I doubt there's
anything that actually sends requests. The other networking-related feature,
Audio.com sharing, can be enabled independently (and I tested for %socket calls
with it enabled). That appeared to work in a brief test, though I don't use
the service.

Both of these features are omitted in all the distros I've looked for
information (Fedora, Alpine, Debian). While some users might find Audio.com
uploading useful, I'm unconvinced there's use in retaining the telemetry flag,
and worse, it could bring us at odds with upstream, which possibly doesn't
expect this. This is why all three "secrets" have been replaced with
placeholders in the current commit. I included it for posterity but my vote is
towards removing it.

I am yet to set up netns' for sniff testing the traffic Audacity generates in
either configuration, for the same reason as not properly reading configure.in
above.

In addition, this ebuild builds Audacity against Tenacity's fork of PortSMF,
and addresses the non-system portaudio issue raised a while ago. PortSMF
itself has some odd stuff upstream, the patches there have been submitted, and
require more testing on Windows.

Besides the few question marks above, this appears to work well.

Thanks in advance, have a great day.

Cc: @juippis, @thesamesam

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @ArsenArsen
Areas affected: ebuilds, eclasses
Packages affected: app-eselect/eselect-wxwidgets, media-libs/portsmf, media-sound/audacity, x11-libs/wxGTK

app-eselect/eselect-wxwidgets: @gentoo/wxwidgets
media-libs/portsmf: @gentoo/proxy-maint (new package)
media-sound/audacity: @gentoo/proaudio, richard[at]audacityteam.org
x11-libs/wxGTK: @gentoo/wxwidgets

Linked bugs

Bugs linked: 822978, 777366, 873124, 577030

Missing Bugzilla accounts

WARNING: The following maintainers do not match any Bugzilla accounts:

Please either fix the e-mail addresses in metadata.xml or create a Bugzilla account, and request reassignment afterwards.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added new package The PR is adding a new package. assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. invalid email One or more of the maintainers don't have corresponding Bugzilla accounts. labels Dec 19, 2022
@juippis juippis added the do not merge Please DO NOT MERGE this PR. It will not be assigned but it will be scanned by CI. label Dec 19, 2022
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-12-19 19:43 UTC
Newest commit scanned: e63a7ce
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/2818bcb58e/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-12-20 10:33 UTC
Newest commit scanned: d315b69
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/bc7e50df58/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-12-20 20:48 UTC
Newest commit scanned: fe71fae
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/929aa4e6b5/output.html

Copy link
Member

@juippis juippis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I skipped wxGTK, as @leio is much better suited to look at that.

media-libs/portsmf/portsmf-239.ebuild Outdated Show resolved Hide resolved
media-libs/portsmf/portsmf-239.ebuild Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/metadata.xml Outdated Show resolved Hide resolved
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-12-21 20:18 UTC
Newest commit scanned: f4e07bd
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/9501564266/output.html

Copy link
Member

@juippis juippis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And as said previously, I ignored the wxwidgets/wxgtk part waiting for @leio's input.

media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-12-22 18:13 UTC
Newest commit scanned: 2ddabcf
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/b50c149d3d/output.html

@juippis
Copy link
Member

juippis commented Dec 22, 2022

Hmm, reading the logs a bit more carefully, I get:

  • USE: abi_x86_64 alsa amd64 elibc_glibc flac id3tag kernel_linux lv2 mpg123 opus portmixer userland_GNU vorbis
  • One or more CMake variables were not used by the project:
  • audacity_has_threadpool
  • USE: abi_x86_64 alsa amd64 elibc_glibc flac kernel_linux mpg123 ogg telemetry userland_GNU vamp
  • One or more CMake variables were not used by the project:
  • PA_HAS_ALSA

@ArsenArsen
Copy link
Member Author

oh, I forgot to remove those (they were originally in the telemetry patch and ${PN}-3.2.2-allow-overriding-alsa-jack.patch)

@ArsenArsen
Copy link
Member Author

hmm, cmake seems to be lying about the latter actually, it was JACK that I removed (and indeed, that is a comment for that reason)

weird... maybe this is another of cmakes oddities

@ArsenArsen
Copy link
Member Author

ah, I think this file is not getting sourced under some USE configuration, because with all USEs on, and with none, I don't see it

@ArsenArsen
Copy link
Member Author

similarly for has_threadpool in the non telemetry case, it goes "unused" (it's referenced directly in the code, the path just doesn't get descended down), but it is actually used. I'm not sure if this is suppressible

@ArsenArsen ArsenArsen force-pushed the audacity-3.2.2 branch 2 times, most recently from 201d490 to 661e5bc Compare December 27, 2022 20:33
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-12-27 20:44 UTC
Newest commit scanned: 661e5bc
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/316e743a63/output.html

@ArsenArsen ArsenArsen force-pushed the audacity-3.2.2 branch 2 times, most recently from 3d3b5f6 to f872e7c Compare January 14, 2023 21:19
@ArsenArsen
Copy link
Member Author

Hacks begone! We should have eselect-wxwidgets-20230114 now.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-14 21:23 UTC
Newest commit scanned: 3d3b5f6
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/e5f8d96ef4/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-14 22:03 UTC
Newest commit scanned: f872e7c
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/69077344c2/output.html


DESCRIPTION="Eselect module and wrappers for wxWidgets"
HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-wxwidgets.git/"
SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114.tar.xz"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114.tar.xz"
SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/${P}.tar.xz"

---
This effectively makes the packaged version v238.

Forwarded: https://codeberg.org/tenacityteam/portsmf/pulls/11
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually prefer this up the top, but it's no big deal.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like it here, usually, since it doesn't change the rest of the mboxy structure, but nothing inherently changes indeed

cmake_src_prepare

local header_subs="${S}/lib-src/header-substitutes"
cat <<-EOF >"${header_subs}/allegro.h" || die
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You used <<-EOF, so you could indent the bits below, but it's not needed to do so here if you don't want to.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-17 13:43 UTC
Newest commit scanned: e0a812c
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/effad8c8d6/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-17 14:03 UTC
Newest commit scanned: 42bd32e
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/85e6585402/output.html

media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
media-sound/audacity/audacity-3.2.2.ebuild Outdated Show resolved Hide resolved
@ArsenArsen ArsenArsen changed the title Audacity 3.2.2 Audacity 3.2.3 Jan 18, 2023
@ArsenArsen
Copy link
Member Author

Audacity got a release in the meanwhile. Updated!

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-18 09:38 UTC
Newest commit scanned: a651ede
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/026b42ff3d/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-18 10:58 UTC
Newest commit scanned: 14a8bd6
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/31bbbaea79/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-20 21:23 UTC
Newest commit scanned: 620689c
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/6cd559b4bf/output.html

listout and others added 7 commits January 20, 2023 22:26
Closes: https://bugs.gentoo.org/577030#c37
Signed-off-by: brahmajit das <listout@protonmail.com>
Closes: gentoo#28360
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
Closes: https://bugs.gentoo.org/577030
Closes: https://bugs.gentoo.org/873124
Signed-off-by: brahmajit das <listout@protonmail.com>
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
This permits build systems to rely on the exit code of wx-config.

As an example:

$ /usr/lib64/wx/config/gtk3-unicode-3.0-gtk3 \
    --flavour=release 2>/dev/null 1>&2|| echo foo
foo
$ wx-config --flavour=release 2>/dev/null 1>&2|| echo foo
$

This is the first version of eselect-wxwidgets which includes the shim
files in version control.

Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
This update also links against system portaudio.

Keywords dropped to ~amd64 due to media-libs/portsmf.

Closes: https://bugs.gentoo.org/777366
Closes: https://bugs.gentoo.org/822978
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-01-20 21:38 UTC
Newest commit scanned: e6c849f
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/2875982b53/output.html

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. do not merge Please DO NOT MERGE this PR. It will not be assigned but it will be scanned by CI. invalid email One or more of the maintainers don't have corresponding Bugzilla accounts. new package The PR is adding a new package.
Projects
None yet
7 participants