🐛 media-sound/audacity: fix various issues

[Jamim]

Hello everyone,

The flac USE flag was mistakenly used instead of the opus USE flag for configuring.

Also, Audacity 3.4.2 introduced a brand new USE_OPUSFILE option which must be set properly.

These changes:

• fix the opus USE flag
• add proper REQUIRED_USE
• replace media-sound/mpg123 with media-sound/mpg123-base
• move dev-libs/rapidjson from RDEPEND to DEPEND
• fix missing #include <limits> for 2.4.2-r3
• limit media-video/ffmpeg to <5 for 2.4.2-r3
• add x11-base/xorg-proto to DEPEND
• add some ASM to BDEPEND
• add audacity-3.4.2-audiocom-std-string.patch to PATCHES for 3.3.3-r1
• add audacity-2.4.2-fix-libflac-undefined-references.patch to PATCHES for 2.4.2-r4
• reset KEYWORDS for 2.4.2-r4 and 3.3.3-r1

Closes:

• https://bugs.gentoo.org/741969
• https://bugs.gentoo.org/884747
• https://bugs.gentoo.org/910723
• https://bugs.gentoo.org/922595
• https://bugs.gentoo.org/927659

Best regards!

[Jamim]

This PR supersedes #35895.

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2024-03-24 23:21 UTC
Newest commit scanned: a45e2a1
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/cf73e7a620/output.html

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2024-03-25 00:20 UTC
Newest commit scanned: b723533
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/d3a5786dd4/output.html

[cjmayo]

It is using media-libs/libogg too (in modules/mod-opus/ExportOpus.cpp) and a USE_LIBOGG

audacity/audacity@34209bc

Plus as far as I am aware changing dependencies needs a revbump.

[Jamim]

Thank you for the review, @cjmayo!

It is using media-libs/libogg too (in modules/mod-opus/ExportOpus.cpp) and a USE_LIBOGG

I've addressed this by adding REQUIRED_USE="opus? ( ogg )".

Plus as far as I am aware changing dependencies needs a revbump.

I've bumped 3.3.3 and 3.4.2 to 3.3.3-r1 and 3.4.2-r1 respectively.
Not sure about 9999. Should I bump it as well?

[cjmayo]

Interesting question - I don't know. This is going to need an expert to commit anyway!

If I was looking after this one I wouldn't worry about updating 3.3.3, and just go for 3.4.2-r1 stabilisation after 30 days if there are no further issues. But, I'm not, and maybe there is something special here (and as the previous sentence). Fair enough if you want to do the work.

Because it needs a bump, I would consider solving media-sound/mpg123-base in this PR (albeit it can be as a separate commit), else that would mean another bump.

And, I spotted another one: looks like dev-libs/rapidjson is headers only. I think meaning it would be a DEPEND only, and not trigger a rebuild on slot change.

[Jamim]

Because it needs a bump, I would consider solving media-sound/mpg123-base in this PR (albeit it can be as a separate commit), else that would mean another bump.

And, I spotted another one: looks like dev-libs/rapidjson is headers only. I think meaning it would be a DEPEND only, and not trigger a rebuild on slot change.

I've addressed these imperfections in 05d838a.

[cjmayo]

Thanks!

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2024-04-02 12:35 UTC
Newest commit scanned: 0dd84d9
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/a91fa4e398/output.html

[cjmayo]

REQUIRED_USE does look like the way to go to be in full control of:

if ( USE_LIBOPUS AND USE_OPUSFILE AND USE_LIBOGG )
   list ( APPEND MODULES mod-opus )
endif()

But there is another module dependency issue, in that you only get the ogg module with vorbis too:

if ( USE_LIBOGG AND USE_LIBVORBIS )
   list( APPEND MODULES mod-ogg )
endif()

but as above for the opus module you need ogg and not vorbis.

[cjmayo]

Although I just tried building my own ebuild with -vorbis and it didn't install the opus module. Assuming all these flags work as expected could be a mistake (as with lv2).

I had -opus!

With ogg opus -vorbis I don't get the ogg module as expected.

[Jamim]

mod-ogg is a bit misleading name. Effectively, it's the mod-vorbis under the hood, so I've added vorbis? ( ogg ) to the REQUIRED_USE.

[cjmayo]

Seems like the pragmatic way to go because of the misleading names and the way the audacity_use options work.

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2024-04-03 01:30 UTC
Newest commit scanned: 05d838a
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/567f82dd8c/output.html

[Jamim]

Hello @mehw,
Would you mind reviewing this PR?
Thanks in advance!

[mehw]

Hello @Jamim,

Do you have any suggestion about the tools to use in an LXC container (rif. #35887 (comment))?

app-portage/iwdevtools
dev-util/pkgcheck
dev-util/pkgdev

This is what I read to prepare the LXC container for Audacity:

• https://wiki.gentoo.org/wiki/Test_environment#Using_LXC_containers_for_ebuild_testing
• https://wiki.gentoo.org/wiki/LXC

LXC container: gentoo 20240402_16:07 amd64 openrc.

[dlan17]

I've got these warnings when run "pkgcheck scan --commits $(git merge-base HEAD origin/master)..HEAD",

VariableShadowed: version 3.3.3-r1: variable 'REQUIRED_USE' may be shadowed, on lines: 41, 115
DroppedKeywords: version 3.4.2-r1: ppc
RdependChange: version 2.4.2-r3: RDEPEND modified without revbump

VariableShadowed:
for REQUIRED_USE change in version 3.3.3-r1, it doesn't take effect (as be shadowed, see warning msg)
REQUIRED_USE="mad? ( !mpg123 )" is dropped in 3.4.2, is it intentional? as I didn't see this restriction
DroppedKeywords:
I'd leave it to you and no need actions in this PR, you can file a bug at b.g.o to request ARCH testing team to handle it
RdependChange
strictly we should give it a revision bump, as it will fix rdeps in some cases (like binhost)

[dlan17]

@Jamim @dlan17 I'm fine with merging, I ran a bunch of tests for 3.3.3-r1 and 3.4.2-r1, all passed for 911aff1.

I can run the same tests for 2.4.2-r3 even after merging, and explore the logs thoroughly for all versions later on.

sounds good to me

By the way, upstream released a 3.5.0-beta-3, any one of you is interested in a WIP?

No, I'd leave this up to you, I'm here merely to do some last step checking & help to merge this PR..

[mehw]

@Jamim could you please take a look at audacity-2.4.2-r3/2/files/audacity-2.4.2-fix-libflac-undefined-references.patch that closes bug#741969 and bug#884747?

diff -Nuar a/audacity-2.4.2-r3.ebuild b/audacity-2.4.2-r3.ebuild
--- a/audacity-2.4.2-r3.ebuild	2024-04-08 08:46:13.038864921 +0000
+++ b/audacity-2.4.2-r3.ebuild	2024-04-14 05:10:20.119372126 +0000
@@ -68,6 +68,7 @@
 	"${FILESDIR}/${P}-add-missing-include-limits.patch"
 	"${FILESDIR}/${P}-add-missing-include-portaudio.patch"
 	"${FILESDIR}/${P}-disable-ccache.patch"
+	"${FILESDIR}/${P}-fix-libflac-undefined-references.patch"
 )
 
 src_prepare() {

Thanks.

IMHO, due to new patches: audacity-2.4.2-r3 -> audacity-2.4.2-r4 and set it as unstable KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86".

If appropriate, also unstabilize audacity-3.3.3-r1.

What do you think?

I've got these warnings when run "pkgcheck scan --commits $(git merge-base HEAD origin/master)..HEAD",

VariableShadowed: version 3.3.3-r1: variable 'REQUIRED_USE' may be shadowed, on lines: 41, 115 DroppedKeywords: version 3.4.2-r1: ppc RdependChange: version 2.4.2-r3: RDEPEND modified without revbump

@dlan17 thanks for verifying, I'll take a look.

VariableShadowed: for REQUIRED_USE change in version 3.3.3-r1, it doesn't take effect (as be shadowed, see warning msg) REQUIRED_USE="mad? ( !mpg123 )" is dropped in 3.4.2, is it intentional? as I didn't see this restriction DroppedKeywords: I'd leave it to you and no need actions in this PR, you can file a bug at b.g.o to request ARCH testing team to handle it RdependChange strictly we should give it a revision bump, as it will fix rdeps in some cases (like binhost)

About the missing REQUIRED_USE="mad? ( !mpg123 )" in 3.4.2, libmad support had been dropped:

• Add missing Findlibmad.cmake file to resolve the system installed libmad audacity/audacity#4917 (comment)
• New export UI audacity/audacity#4668

[dlan17]

@Jamim could you please take a look at audacity-2.4.2-r3/2/files/audacity-2.4.2-fix-libflac-undefined-references.patch that closes bug#741969 and bug#884747?

diff -Nuar a/audacity-2.4.2-r3.ebuild b/audacity-2.4.2-r3.ebuild
--- a/audacity-2.4.2-r3.ebuild	2024-04-08 08:46:13.038864921 +0000
+++ b/audacity-2.4.2-r3.ebuild	2024-04-14 05:10:20.119372126 +0000
@@ -68,6 +68,7 @@
 	"${FILESDIR}/${P}-add-missing-include-limits.patch"
 	"${FILESDIR}/${P}-add-missing-include-portaudio.patch"
 	"${FILESDIR}/${P}-disable-ccache.patch"
+	"${FILESDIR}/${P}-fix-libflac-undefined-references.patch"
 )
 
 src_prepare() {

Thanks.

IMHO, due to new patches: audacity-2.4.2-r3 -> audacity-2.4.2-r4 and set it as unstable KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86".

If appropriate, also unstabilize audacity-3.3.3-r1.

What do you think?

Yes, sounds good if you want to drop them to unstable keywords, and this is the normal way how we handle new patch,
in rare case you can request a fast stabilization (security bugs related), or bump the stable keywords if the
change is trivial or really safe?

I've got these warnings when run "pkgcheck scan --commits $(git merge-base HEAD origin/master)..HEAD",
VariableShadowed: version 3.3.3-r1: variable 'REQUIRED_USE' may be shadowed, on lines: 41, 115 DroppedKeywords: version 3.4.2-r1: ppc RdependChange: version 2.4.2-r3: RDEPEND modified without revbump

@dlan17 thanks for verifying, I'll take a look.

VariableShadowed: for REQUIRED_USE change in version 3.3.3-r1, it doesn't take effect (as be shadowed, see warning msg) REQUIRED_USE="mad? ( !mpg123 )" is dropped in 3.4.2, is it intentional? as I didn't see this restriction DroppedKeywords: I'd leave it to you and no need actions in this PR, you can file a bug at b.g.o to request ARCH testing team to handle it RdependChange strictly we should give it a revision bump, as it will fix rdeps in some cases (like binhost)

About the missing REQUIRED_USE="mad? ( !mpg123 )" in 3.4.2, libmad support had been dropped:

Ok, thanks for explanation

* [Add missing Findlibmad.cmake file to resolve the system installed libmad audacity/audacity#4917 (comment)](https://github.com/audacity/audacity/pull/4917#issuecomment-1636719217)

* [New export UI audacity/audacity#4668](https://github.com/audacity/audacity/pull/4668)

[gentoo-bot]

Pull Request assignment

Submitter: @Jamim
Areas affected: ebuilds
Packages affected: media-sound/audacity

media-sound/audacity: @gentoo/proaudio, richard[at]audacityteam.org, @mehw

Linked bugs

Bugs linked: 910723, 922595, 884747, 927659, 741969

---

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

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2024-04-16 19:30 UTC
Newest commit scanned: 649075c
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/3ab3ef2cde/output.html

[Jamim]

Hello @dlan17 and @mehw,
Hope I've addressed all the recently mentioned issues in 649075c.

[dlan17]

Hello @dlan17 and @mehw, Hope I've addressed all the recently mentioned issues in 649075c.

thanks, I've pushed with only change that version 2.4.2-r3 has been kept, as some ARCHs only has stable keywords in this version, later you may want to start filing stabilization bug for it..

[mehw]

@Jamim @dlan17 Nice! Thank you ;)

[Jamim]

We finally did it! 🎉
Thank you for your help @mehw, @dlan17, and @cjmayo! 🙇🏼