commit: c0000ef88867dbdc89ea1aeb12fc8169e9cb7a84 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Sun Feb 18 20:34:31 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 23 08:29:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0000ef8
media-sound/audacity: drop 3.2.5-r1 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35414 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/audacity/Manifest | 2 - media-sound/audacity/audacity-3.2.5-r1.ebuild | 229 --------------------- .../audacity/files/audacity-3.2.5-gcc13-deux.patch | 57 ----- .../files/audacity-3.2.5-gettext-0.22.patch | 36 ---- 4 files changed, 324 deletions(-) diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest index ab7fe68fc43e..28fe9c10d805 100644 --- a/media-sound/audacity/Manifest +++ b/media-sound/audacity/Manifest @@ -1,7 +1,5 @@ DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d -DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582 DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c -DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa33337b5d0b6a00e14bd420d6f064515455055233a45f5ebf47 SHA512 9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild b/media-sound/audacity/audacity-3.2.5-r1.ebuild deleted file mode 100644 index 2eb91ea6190a..000000000000 --- a/media-sound/audacity/audacity-3.2.5-r1.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# 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 - -MY_P="Audacity-${PV}" -DOC_PV="${PV}" -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" -SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz - doc? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz ) - audiocom? ( ${MY_THREADPOOL} )" -S="${WORKDIR}/${PN}-${MY_P}" - -# GPL-2+, GPL-3 - Audacity itself -# ZLIB - The ThreadPool single-header library -# CC-BY-3.0 - Documentation -LICENSE="GPL-2+ - GPL-3 - doc? ( CC-BY-3.0 ) - audiocom? ( ZLIB ) -" -SLOT="0" -KEYWORDS="amd64 ~riscv" -IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg - opus +portmixer sbsms twolame vamp +vorbis wavpack" - -# The testsuite consists of two tests, 50% of which fail. -RESTRICT="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/libsndfile - media-libs/libsoundtouch:= - media-libs/portaudio[alsa?] - media-libs/portmidi - media-libs/portsmf:= - media-libs/soxr - media-sound/lame - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}[X] - sys-apps/util-linux - alsa? ( media-libs/alsa-lib ) - audiocom? ( - dev-libs/rapidjson - 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 - ) - mad? ( media-libs/libmad ) - mpg123? ( media-sound/mpg123 ) - ogg? ( media-libs/libogg ) - opus? ( media-libs/opus ) - sbsms? ( media-libs/libsbsms ) - twolame? ( media-sound/twolame ) - vamp? ( media-libs/vamp-plugin-sdk ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip - sys-devel/gettext - virtual/pkgconfig -" - -REQUIRED_USE=" - mad? ( !mpg123 ) -" - -PATCHES=( - # Equivalent to previous versions - "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch" - # From Debian - "${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch" - - # Disables some header-based detection - "${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch" - - # For has_networking - "${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch" - "${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch" - - # GCC 13 - "${FILESDIR}/${PN}-3.2.5-gcc13-deux.patch" - - # gettext 0.22 - "${FILESDIR}/${PN}-3.2.5-gettext-0.22.patch" -) - -src_prepare() { - cmake_src_prepare - - local header_subs="${S}/lib-src/header-substitutes" - cat <<-EOF >"${header_subs}/allegro.h" || die - /* Hack the allegro.h header substitute to use system headers. */ - #include <portsmf/allegro.h> - EOF - - # 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 -} - -src_configure() { - setup-wxwidgets - - # * always use system libraries if possible - # * options listed roughly in the order specified in - # cmake-proxies/CMakeLists.txt - # * 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_use_nyquist=local - -Daudacity_use_pch=OFF - -Daudacity_use_portmixer=$(usex portmixer system off) - -Daudacity_use_soxr=system - - -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) - -Daudacity_has_threadpool=local - - # 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_libmp3lame=system - -Daudacity_use_libmpg123=$(usex mpg123 system off) - -Daudacity_use_libmad=$(usex mad system off) - -Daudacity_use_wavpack=$(usex wavpack system off) - -Daudacity_use_libogg=$(usex ogg system off) - -Daudacity_use_libflac=$(usex flac system off) - -Daudacity_use_libopus=$(usex flac system off) - -Daudacity_use_libvorbis=$(usex vorbis system off) - -Daudacity_use_libsndfile=system - -Daudacity_use_portaudio=system - -Daudacity_use_midi=system - -Daudacity_use_vamp=$(usex vamp system off) - -Daudacity_use_lv2=$(usex lv2 system off) - -Daudacity_use_portsmf=system - -Daudacity_use_sbsms=$(usex sbsms system off) - -Daudacity_use_soundtouch=system - -Daudacity_use_twolame=$(usex twolame system off) - - # Disable telemetry features. - -Daudacity_has_sentry_reporting=off - -Daudacity_has_crashreports=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_install() { - cmake_src_install - - # Remove bad doc install - rm -r "${ED}"/usr/share/doc || die - - if use doc ; then - docinto html - dodoc -r "${WORKDIR}"/help/manual/{m,man} - dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html} - dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual - fi -} diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch deleted file mode 100644 index c9fdad5fbafd..000000000000 --- a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://github.com/audacity/audacity/issues/4489 -https://github.com/audacity/audacity/commit/a49d145ef5e3046273c879be0a21d48ecd4dcab7 -https://bugs.gentoo.org/899764 - ---- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h -+++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h -@@ -46,7 +46,8 @@ typedef uint64_t uintmax_t; - */ - #endif - --#include <stddef.h> -+#include <cstddef> -+#include <cstdint> - #include <string> - #include <iostream> - #include <sstream> -@@ -355,10 +356,6 @@ - typedef signed int SINT32; - typedef float FLOAT32; - typedef double FLOAT64; --// added by RBD --#ifdef __linux__ --#define intptr_t long --#endif - - // The default sampling rate. - const StkFloat SRATE = 44100.0; ---- a/src/effects/LoadEffects.cpp -+++ b/src/effects/LoadEffects.cpp -@@ -154,9 +154,9 @@ void BuiltinEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm) - if (rediscoverAll || - !pm.IsPluginRegistered(path, &pair.second->name.Msgid()) - ){ -- DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -+ DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID& - { -- const auto pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident); -+ const auto& pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident); - if(pair.second->excluded) - PluginManager::Get().EnablePlugin(pluginId, false); - return pluginId; ---- a/libraries/lib-module-manager/PluginHost.cpp -+++ b/libraries/lib-module-manager/PluginHost.cpp -@@ -37,11 +37,11 @@ namespace - TranslatableString errorMessage{}; - auto validator = provider->MakeValidator(); - auto numPlugins = provider->DiscoverPluginsAtPath( -- pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -+ pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID& - { - //Workaround: use DefaultRegistrationCallback to create all descriptors for us - //and then put a copy into result -- auto id = PluginManager::DefaultRegistrationCallback(provider, ident); -+ auto& id = PluginManager::DefaultRegistrationCallback(provider, ident); - if(const auto ptr = PluginManager::Get().GetPlugin(id)) - { - auto desc = *ptr; diff --git a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch deleted file mode 100644 index f84508a2c903..000000000000 --- a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/909201 -upstream fix: https://github.com/audacity/audacity/pull/4866 - ---- a/locale/be.po -+++ b/locale/be.po -@@ -3097,7 +3097,7 @@ - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "Памылка (магчыма, файл не запісаны): %hs" -+msgstr "Памылка (магчыма, файл не запісаны): %s" - - #: src/FileFormats.cpp - #, fuzzy ---- a/locale/fa.po -+++ b/locale/fa.po -@@ -3053,7 +3053,7 @@ - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs" -+msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s" - - #: src/FileFormats.cpp - msgid "&Copy uncompressed files into the project (safer)" ---- a/locale/fr.po -+++ b/locale/fr.po -@@ -3142,7 +3142,7 @@ - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %hs" -+msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %s" - - # trebmuh to check (accélérateur) - #: src/FileFormats.cpp
