gentoo auto-resync : 15:12:2024 - 02:02:03

3 files changed, 236 insertions, 1 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 04d27d4f7e8b..68f1fc78e107 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -18,9 +18,11 @@ AUX audacity-3.7.0-portsmf.patch 302 BLAKE2B 2dee89e346934ff5cadd1cbc5304fbec9b3
 DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
 DIST audacity-sources-3.7.0.tar.gz 61801488 BLAKE2B 97ff912d60c07a4e7509ad60814b944f3a0feb6b892328aee9375d64673eb2460bc54ef0dc2385173d92f8121ce330d0529a48940b0e08a434cbf05a8912f05c SHA512 0306cae5c42eb3b86781e37866fe1f95c0564c5a14525c69bbe9cfd614ee31d5296fa845bfd4be5f7a4c3e9ac67224e75dd114a16df9b5c6d1a1c79ce1d874bb
+DIST audacity-sources-3.7.1.tar.gz 61795370 BLAKE2B 7309418e2bcb44041b97f2d636974c9d90478051a4ecc9b6838e99f53e4d1c769bf7223df14ec822c3947293f6f784c922577b3a3824ee0b4f5783140c42d249 SHA512 cf50e2978d1c95d51f452c004a85b447fa541c669058a90485139d9c8c386d9f2dea6803c7eb96bc6eeea5db0cb2880650171973f4af8ceb0ca2e15ff4599523
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-3.3.3.ebuild 7247 BLAKE2B d13edb80efb3cc7da04706b30972265594527b09003be5c690e1a4f3c8fa3b918fea751eec1fc6bd29d3810547204fcc4421681ed657be63847b341e38d58708 SHA512 6120da23d94e41ceb840a3cc6e9a6295e4da03674fffce158625ab671eca780ba77985916396af40c0a19eb99facd9a4e31fda7b6ef6aff79b2f4a9d1ffa4888
 EBUILD audacity-3.4.2-r1.ebuild 6904 BLAKE2B 1884b799dbbcf59ea235d4351b1fe9da68f0d3c5964e671e8ddca49eb88e63512a19d774676b182711fd9742d9f18a1bdde1f6008a449200d73df19bd6130485 SHA512 b19140ac540f2c874eec6086475a1967c5fea707a80ff490e286c305dc0538666df48d5cf88f0fec9d912e9890e7e702c128efd3c3f421321a4fbcc9ce1feb66
-EBUILD audacity-3.7.0.ebuild 6902 BLAKE2B e8bca40cc3235bd5d0c9a8d18724b473c717915182e2c8754db595c5e29531265bcde06dcdd5a5503a694537d219958aa69b918df95beb3f1ca8e8f13826fbbc SHA512 d87e5c9cc0bc39e8ff49a060b7b35923863e3c3eac49878fbf2be16c97c9bf961063e6b1f7d318b53d27584d1ce6349fdf36254ac89984fec0b80117a243b736
+EBUILD audacity-3.7.0.ebuild 6925 BLAKE2B ccffb8bf679ddc8212722b21c1b11830cb79564d49e177cdbe40eb402a71d61cd20cd3ce97cec9135c48c8169fc878976bb6d624136fee0426dee7cbee8d9328 SHA512 363918e777b3da5f0bb46fd355c04a4929ae8cab74ec18a0e65b68494c22e34cc338e8ea7adda699bb90edcdf404908ce521f18a0a179c65e5f5a96a5f5a3252
+EBUILD audacity-3.7.1.ebuild 6943 BLAKE2B 27b4069867645d8d6c3544dff5e474cc485779e2367f331c713bcd51a4050a9464b613e5db29813af85850ee6b180c5165994cd0e5a5da787790cfba7397e6e2 SHA512 78277c7841f58697a8d31a8f6c006af7ab5d6ba423c7ed7445fcd39ce527f44f096a40c73c77be315a284e9cf02e0eeb1d2d9328b0b2957a2ef9f94800eed05f
 EBUILD audacity-9999.ebuild 7048 BLAKE2B 6c661ade492cc7d7287d7c69be4b4475b3f5fcfae01b29922842c8364260c3f05293679fd225d6a578d2a509e4b932bf0cac3b8910505bc91d5a5741b673b134 SHA512 9418de04b75ce522bc0b3d08278cae3802491a67e2a74ad120e3bf4b1dcc1d2b7c965e97773d5b4e44ef3fd029f135bfa4ccbcc53d79bd2f425199456cdc5ece
 MISC metadata.xml 1409 BLAKE2B a3ca34262c6bc000ba252729024afdf354aa2f61cfb31a382e8d2571cb5321451ed88b6baa2c976b5adadb0b76a07aa64b2e75b61441f46d431c09b1aebb9804 SHA512 d9e0158632dfa398fd07602e65a3e5a4a8a12a3786a5b3672f7983be976cdfe023fc38b9a3c2c1742d0a0fc0411eea5989c3cf48c2ecfe33b2533c27e9098b05
diff --git a/media-sound/audacity/audacity-3.7.0.ebuild b/media-sound/audacity/audacity-3.7.0.ebuild
index 100dac9a70a6..17010e125d96 100644
--- a/media-sound/audacity/audacity-3.7.0.ebuild
+++ b/media-sound/audacity/audacity-3.7.0.ebuild
@@ -39,6 +39,7 @@ SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
 	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
 REQUIRED_USE="
+	audiocom? ( wavpack )
 	opus? ( ogg )
 	vorbis? ( ogg )
 "
diff --git a/media-sound/audacity/audacity-3.7.1.ebuild b/media-sound/audacity/audacity-3.7.1.ebuild
new file mode 100644
index 000000000000..40b53ca471bf
--- /dev/null
+++ b/media-sound/audacity/audacity-3.7.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg virtualx
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-sources-${PV}"
+	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+	GPL-3
+	audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+	audiocom? ( wavpack )
+	opus? ( ogg )
+	test? ( mpg123 )
+	vorbis? ( ogg )
+"
+RESTRICT="!test? ( test )"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/portmidi
+	media-libs/portsmf:=
+	media-libs/soxr
+	media-sound/lame
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	alsa? ( media-libs/alsa-lib )
+	audiocom? (
+		net-misc/curl
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mpg123? ( media-sound/mpg123-base )
+	ogg? ( media-libs/libogg )
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-libs/rapidjson
+	x11-base/xorg-proto
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	# fixes include path
+	"${FILESDIR}/audacity-3.7.0-portsmf.patch"
+
+	# disables ccache
+	"${FILESDIR}/audacity-3.7.0-disable-ccache.patch"
+
+	# Disables some header-based detection
+	"${FILESDIR}/audacity-3.7.0-allow-overriding-alsa-jack.patch"
+
+	# For has_networking
+	"${FILESDIR}/audacity-3.7.0-local-threadpool-libraries.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+	# #920363
+	"${FILESDIR}/audacity-3.7.0-audiocom-std-string.patch"
+
+	# 915041
+	"${FILESDIR}/audacity-3.7.0-do-not-include-template-on-unix-to-fix-clang-compile.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
+	if use audiocom; then
+		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
+	fi
+
+	# Remove documentation incorrect installations
+	sed -i -e \
+		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	# * always use system libraries if possible
+	# * USE_VST was omitted, it appears to no longer have dependencies
+	#   (this is different from VST3)
+	local mycmakeargs=(
+		# Tell the CMake-based build system it's building a release.
+		-DAUDACITY_BUILD_LEVEL=2
+
+		-Daudacity_conan_enabled=off
+
+		-Daudacity_has_networking=$(usex audiocom on off)
+		# Not useful on Gentoo.
+		-Daudacity_has_updates_check=OFF
+		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		-Daudacity_has_tests=$(usex test on off)
+
+		# The VST3 SDK is unpackaged, and it appears to be under a breed
+		# of a proprietary license and the GPL.
+		-Daudacity_has_vst3=off
+
+		-Daudacity_lib_preference=system
+		-Daudacity_obey_system_dependencies=ON
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_libid3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libflac=$(usex flac system off)
+		-Daudacity_use_libmp3lame=system
+		-Daudacity_use_libmpg123=$(usex mpg123 system off)
+		-Daudacity_use_libogg=$(usex ogg system off)
+		-Daudacity_use_libopus=$(usex opus system off)
+		-Daudacity_use_libsndfile=system
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_opusfile=$(usex opus system off)
+		-Daudacity_use_pch=off
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_portmixer=$(usex portmixer system off)
+		-Daudacity_use_portsmf=system
+		-Daudacity_use_rapidjson=system
+		-Daudacity_use_sbsms=$(usex sbsms system off)
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
+
+		# See the allow-overriding-alsa-jack.patch patch
+		-DPA_HAS_ALSA=$(usex alsa on off)
+		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
+		## AFAICT it introduces no deps as-is, but that could change.
+		## Similar goes for PA_HAS_JACK.
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}