From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- media-sound/audacity/Manifest | 14 +- media-sound/audacity/audacity-2.2.2.ebuild | 131 ---------------- media-sound/audacity/audacity-2.3.3.ebuild | 137 ----------------- media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +- .../audacity/files/audacity-2.2.1-portmixer.patch | 36 ----- .../audacity/files/audacity-2.2.2-automake.patch | 48 ------ .../audacity/files/audacity-2.2.2-midi.patch | 168 --------------------- .../audacity/files/audacity-2.3.3-fno-common.patch | 62 -------- media-sound/audacity/metadata.xml | 3 - 9 files changed, 3 insertions(+), 598 deletions(-) delete mode 100644 media-sound/audacity/audacity-2.2.2.ebuild delete mode 100644 media-sound/audacity/audacity-2.3.3.ebuild delete mode 100644 media-sound/audacity/files/audacity-2.2.1-portmixer.patch delete mode 100644 media-sound/audacity/files/audacity-2.2.2-automake.patch delete mode 100644 media-sound/audacity/files/audacity-2.2.2-midi.patch delete mode 100644 media-sound/audacity/files/audacity-2.3.3-fno-common.patch (limited to 'media-sound/audacity') diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest index e3301b2c4a84..e71e5f59a0ed 100644 --- a/media-sound/audacity/Manifest +++ b/media-sound/audacity/Manifest @@ -1,20 +1,10 @@ -AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805 -AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca -AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a AUX audacity-2.3.3-Fix-building-against-system-portaudio.patch 1952 BLAKE2B 9a5ef294d55dfe226175d2fdd8b23a9a4e6b3e963c26b9d4d8b430054dba5c39c6ae97f911b720dc53af5173c6a639275dd119c5292f53164e749782fa8f1e46 SHA512 ff85a33922bed3a626dd82c71406d81ac59c36dc45e5d2164662aabcd14a859479304cf684b9f64d0b110a9a1a82042b130c21e820ebd4c917fd9094c0737ed2 -AUX audacity-2.3.3-fno-common.patch 2232 BLAKE2B eeaa5452a3da08bb4ba22965ad9a3ce77b838e9177d4cc53c630865bd91dfd1d348dcd4128b20f875e9a50d9ec19fb6e371cf28bf059072437480f71c7225f1a SHA512 3f534101b6194b4f557b88cdf96ae91cc3e2c86ef387ba5ccc33aa192212074eb018de9dd2d459518133baf9f46c1c8d499d74ae00b593a26b904ac3d288a700 AUX audacity-2.4.2-add-missing-include-portaudio.patch 346 BLAKE2B 51b3a09a2ed616364f7ded02663bd0a527a12d088e514fa494f7324756263cd73713a50391f3895366c3d92d491ef56d21ee380bf9c640228d5ab680328f37a8 SHA512 ccc7ebfc6453ef02b2ef4e546d8c96d45fb5ccd46a088225dc241371745bd8f39dd63b0044bfba24f1eeec70affcac29a4499f0d15a16fb4dd99eb87980fc4fa AUX audacity-2.4.2-disable-ccache.patch 545 BLAKE2B 0173fc4de28ec040f457ad54885d8d0d8d68c27b683684b4eb6404771c588a6374232b0d275cb751a1466d0e20377a2eeec56d3d423167388858bbb4ddef1056 SHA512 0026bfbc25a9bb83c49492f89c60f42f4be5dbd70baef0b0afb75d4d5b2a1f87e070d3243e8432b1b283d5a437221a209126a157737fc2db601b7b3e226749d1 AUX audacity-2.4.2-fix-gettimeofday.patch 338 BLAKE2B f9deed24aca404693a0094b83ec310d7609b6989749f42b3b6304feb9d62c02436b0c4d62116b145d44d1a0ddeaf38c86794ef449393c998f5b5a062e408ed3f SHA512 d19082009dc915b28f02e3451f06e5041b68159af138ecad10641f3c59526b4ab2873e6e676b87dff0e54320b48a6254a0da434566855605ca81b747a732e952 AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a1632c6a963ee11a1893064c41c9d8093adf081bc3fd6a2e2dcc909573bd22d1d21e8cb58c8bbf9e464058780cfce839d6c06 SHA512 a2cdabecf53c03b77434ddbdbfb7606eb52f8e52b67d62bd206799eb0e9399345967106d7644784de338ef68d3e87c26952c491e775b1a323e1e2a91e41fe200 AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df -DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d -DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86 -DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84 SHA512 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c -DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c -EBUILD audacity-2.2.2.ebuild 3289 BLAKE2B ff93b28d787c0b5d25b0f87f0fae06960cf74e8e4a730e396cd7005be47267c7056a7df4c674effdfdd10a07ab71e6ff9b212069b169fa03e4f18bdbd1731456 SHA512 cdec097cb4416242580921bb3bf128b7532a79b096cee81c1b8fc5375a6020fb922e8f63bc7cf96f21fcab9f92df22d543ff0630a87d064df8952cae2895394b -EBUILD audacity-2.3.3.ebuild 3232 BLAKE2B 4b0a5cb513a911a615ec96c6816c910b171da04390ed89ab76c7d7498e53342044dd206c446873c47a2f1a5b0233a92cb0d57c26f28a2684a3a9fa3020572211 SHA512 671e750ca235b472ccb95c8d0d6ae2417d10311bf6b7321e323e547ecf21e7d578e04840e032e3afaacdf8cf20976961143a8100795cae1c2b36aa1b5ce3a02b -EBUILD audacity-2.4.2-r1.ebuild 3952 BLAKE2B 0d9d69c47bed14c7647d0b3adccb7407c1b2c6d8ec3287e0b6a810133574d1c20148cf468e460b77d56ee47fed6ca7dde8f253861dbc14e64adfaa2c1a143d62 SHA512 fdfd36cc360d998899e62237e89fbe11ecdcdc3ca656f4a7dc8345ffb63c85fc9e24a665d167d068398e6b4798f5f5f46cae3d7427dc9c00d6baa616bce7d334 -MISC metadata.xml 1343 BLAKE2B 5bd530b1826b79a7b2ed54ebe055f752b8cdeb0d4e837d184deefb4ce8a2395e243d690bb0775d4e022d990533b55c9c6d7fed1c60c213e09fe351e161530b36 SHA512 ff75ba648bbbcff37e9529b8b52a1c6b86aadc8b650d6e121e1e5296514f1adeee0b52e37856c466c1c88baf7fcfcc3db6bcb935100e8a623dfd8926e697c6e5 +EBUILD audacity-2.4.2-r1.ebuild 3951 BLAKE2B 0c4a89c17417e84e9934f62b360afad1ab812122109650a7769f96e09bec2b3ce94e8833787522b78ce61d09bbf6e096087e29301a5b20d236b489f62812e459 SHA512 4b7c7a277d22c42b949605c263ee099eed93b1f68e036c887985d3e3516c1355dec6f3940ba92dc8eafa1b4a95f3e16f4c10ab81f9d7de119c76d914d1740d9d +MISC metadata.xml 1188 BLAKE2B eaa473c8b3c3f733056574cc6622e1c57af8241c86434c1a204dcfc8e9149da4f6f82bc610f2541add62d2a6e7dfa786082f2b9537319d45ca45ca3cf65dd039 SHA512 8c25d530d234466b7476a2355a6003702fa43e7d5fae712172e935a617d03fe571e3d57d6d6fc249ccfd6002ade8b13d3831751414b43cb037c9e6dbc739109a diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild deleted file mode 100644 index 414cf0f7772c..000000000000 --- a/media-sound/audacity/audacity-2.2.2.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2-utils wxwidgets xdg-utils - -MY_P="${PN}-minsrc-${PV}" -DOC_PV="${PV}" -DESCRIPTION="Free crossplatform audio editor" -HOMEPAGE="https://web.audacityteam.org/" -SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz - doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )" - # wget doesn't seem to work on FossHub links, so we mirror - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ppc ppc64 x86" -IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame - +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst" - -RESTRICT="test" - -RDEPEND=">=app-arch/zip-2.3 - dev-libs/expat - >=media-libs/libsndfile-1.0.0 - >=media-libs/portaudio-19_pre - =media-video/ffmpeg-1.2:= ) - flac? ( >=media-libs/flac-1.3.1[cxx] ) - id3tag? ( media-libs/libid3tag ) - jack? ( virtual/jack ) - lame? ( >=media-sound/lame-3.70 ) - lv2? ( media-libs/lv2 ) - mad? ( >=media-libs/libmad-0.14.2b ) - midi? ( media-libs/portmidi ) - sbsms? ( media-libs/libsbsms ) - soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) - twolame? ( media-sound/twolame ) - vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) - vorbis? ( >=media-libs/libvorbis-1.0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="soundtouch? ( midi )" - -S="${WORKDIR}/${MY_P}-rc1" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.1-portmixer.patch" #624264 - "${FILESDIR}/${PN}-2.2.2-automake.patch" # or else eautoreconf breaks - "${FILESDIR}/${PN}-2.2.2-midi.patch" #637110 -) - -src_prepare() { - default - # needed because of portmixer patch - eautoreconf -} - -src_configure() { - local WX_GTK_VER="3.0" - need-wxwidgets unicode - - # * always use system libraries if possible - # * options listed in the order that configure --help lists them - local myeconfargs=( - --disable-dynamic-loading - --enable-nyquist - --enable-unicode - --with-expat=system - --with-libsndfile=system - --with-libsoxr=system - --with-portaudio - --with-widgetextra=local - --with-wx-version=${WX_GTK_VER} - $(use_enable cpu_flags_x86_sse sse) - $(use_enable ladspa) - $(use_enable nls) - $(use_enable vst) - #$(use_with alsa) - $(use_with ffmpeg) - $(use_with flac libflac) - $(use_with id3tag libid3tag) - #$(use_with jack) - $(use_with lame) - $(use_with lv2) - $(use_with mad libmad) - $(use_with midi) - $(use_with sbsms) - $(use_with soundtouch) - $(use_with twolame libtwolame) - $(use_with vamp libvamp) - $(use_with vorbis libvorbis) - $(use_with portmixer) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - # Remove bad doc install - rm -r "${D%/}"/usr/share/doc || die - - # Install our docs - einstalldocs - - if use doc ; then - docinto html - dodoc -r "${WORKDIR}"/help/manual/{m,man,manual} - dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html} - dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual - fi -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild deleted file mode 100644 index 0418e4cc8654..000000000000 --- a/media-sound/audacity/audacity-2.3.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0-gtk3" - -inherit flag-o-matic wxwidgets xdg - -MY_P="Audacity-${PV}" -DOC_PV="${PV}" -DESCRIPTION="Free crossplatform audio editor" -HOMEPAGE="https://web.audacityteam.org/" -# wget doesn't seem to work on FossHub links, so we mirror -SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz - doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )" -S="${WORKDIR}/${PN}-${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" -IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame - +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst" - -RESTRICT="test" - -RDEPEND="dev-libs/expat - >=media-libs/libsndfile-1.0.0 - >=media-libs/portaudio-19.06.00-r2[alsa?] - =media-video/ffmpeg-1.2:= ) - flac? ( >=media-libs/flac-1.3.1[cxx] ) - id3tag? ( media-libs/libid3tag ) - jack? ( virtual/jack ) - lame? ( >=media-sound/lame-3.70 ) - lv2? ( - media-libs/lilv - media-libs/lv2 - media-libs/suil - ) - mad? ( >=media-libs/libmad-0.14.2b ) - sbsms? ( media-libs/libsbsms ) - soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) - twolame? ( media-sound/twolame ) - vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) - vorbis? ( >=media-libs/libvorbis-1.0 ) -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch - "${FILESDIR}"/${PN}-2.3.3-fno-common.patch -) - -src_prepare() { - default - - use midi || sed -i \ - -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \ - src/Experimental.h || die -} - -src_configure() { - setup-wxwidgets - append-cxxflags -std=gnu++14 - - # * always use system libraries if possible - # * options listed in the order that configure --help lists them - local myeconfargs=( - --disable-dynamic-loading - --enable-nyquist=local - --enable-unicode - --with-expat - --with-lib-preference=system - --with-libsndfile - --with-libsoxr - --with-mod-script-pipe - --with-mod-nyq-bench - --with-portaudio - --with-widgetextra=local - --with-wx-version=${WX_GTK_VER} - $(use_enable cpu_flags_x86_sse sse) - $(use_enable ladspa) - $(use_enable nls) - $(use_enable vst) - $(use_with ffmpeg) - $(use_with flac libflac) - $(use_with id3tag libid3tag) - $(use_with lame) - $(use_with lv2) - $(use_with mad libmad) - $(use_with midi portmidi local) - $(use_with midi "" local) - $(use_with portmixer) - $(use_with sbsms) - $(use_with soundtouch) - $(use_with twolame libtwolame) - $(use_with vamp libvamp) - $(use_with vorbis libvorbis) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - # Remove bad doc install - rm -r "${ED}"/usr/share/doc || die - - # Install our docs - einstalldocs - - if use doc ; then - docinto html - dodoc -r "${WORKDIR}"/manual/{m,man,manual} - dodoc "${WORKDIR}"/manual/{favicon.ico,index.html,quick_help.html} - dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual - fi -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild index a8acc69fa8ea..4c5130a8044f 100644 --- a/media-sound/audacity/audacity-2.4.2-r1.ebuild +++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~mips ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86" IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst" diff --git a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch deleted file mode 100644 index 0df43f5c07aa..000000000000 --- a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/624264 - -Patch by Vladimir - ---- audacity-minsrc-2.2.1-rc3/configure.ac -+++ audacity-minsrc-2.2.1-rc3/configure.ac -@@ -540,7 +540,7 @@ - [compile with PortMixer [default=yes]])], - use_portmixer=$withval, - use_portmixer="yes") -- -+AM_CONDITIONAL([USE_PORTMIXER], [test "$use_portmixer" = yes]) - - AC_CANONICAL_HOST - ---- audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am -+++ audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am -@@ -92,7 +92,6 @@ - libsoxr \ - lib-widget-extra \ - lv2 \ -- portmixer \ - portsmf \ - sbsms \ - $(NULL) -@@ -156,8 +155,10 @@ - SUBDIRS += portaudio-v19 - endif - -+if USE_PORTMIXER - # Note: portmixer needs to be linked against (the local or system) portaudio. - SUBDIRS += portmixer -+endif - - if USE_LOCAL_PORTSMF - SUBDIRS += portsmf diff --git a/media-sound/audacity/files/audacity-2.2.2-automake.patch b/media-sound/audacity/files/audacity-2.2.2-automake.patch deleted file mode 100644 index 56343e3ede21..000000000000 --- a/media-sound/audacity/files/audacity-2.2.2-automake.patch +++ /dev/null @@ -1,48 +0,0 @@ -Remove subdirs that are non-exisitng in the tarball -or else autoreconf breaks. - ---- audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am -+++ audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am -@@ -107,18 +107,6 @@ - SUBDIRS = FileDialog - OPTIONAL_SUBDIRS = - --if USE_LOCAL_EXPAT --OPTIONAL_SUBDIRS += expat --endif -- --if USE_LOCAL_LIBID3TAG --OPTIONAL_SUBDIRS += libid3tag --endif -- --if USE_LOCAL_LIBMAD --OPTIONAL_SUBDIRS += libmad --endif -- - if USE_LOCAL_LIBNYQUIST - SUBDIRS += libnyquist - endif -@@ -131,23 +119,10 @@ - OPTIONAL_SUBDIRS += libsoxr - endif - --if USE_LOCAL_LIBSOUNDTOUCH --OPTIONAL_SUBDIRS += soundtouch --endif -- - if USE_LOCAL_LIBTWOLAME - OPTIONAL_SUBDIRS += twolame - endif - --if USE_LOCAL_LIBVORBIS --OPTIONAL_SUBDIRS += libogg libvorbis --endif -- --if USE_LOCAL_LIBFLAC --# Note: libflac needs to be linked against (the local or system) libogg. --OPTIONAL_SUBDIRS += libflac --endif -- - if USE_LOCAL_LV2 - SUBDIRS += lv2 - endif diff --git a/media-sound/audacity/files/audacity-2.2.2-midi.patch b/media-sound/audacity/files/audacity-2.2.2-midi.patch deleted file mode 100644 index 10a0f1f6eb04..000000000000 --- a/media-sound/audacity/files/audacity-2.2.2-midi.patch +++ /dev/null @@ -1,168 +0,0 @@ -https://bugs.gentoo.org/637110 - -Original patch by Matt Whitlock -Forward-ported from version 2.2.0 to 2.2.2 - ---- audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp -+++ audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp -@@ -976,6 +976,7 @@ - }; - #endif - -+#ifdef EXPERIMENTAL_MIDI_OUT - // return the system time as a double - static double streamStartTime = 0; // bias system time to small number - -@@ -995,6 +996,7 @@ - - return PaUtil_GetTime() - streamStartTime; - } -+#endif - - const int AudioIO::StandardRates[] = { - 8000, -@@ -1803,6 +1805,7 @@ - } - #endif - -+#ifdef EXPERIMENTAL_MIDI_OUT - // We use audio latency to estimate how far ahead of DACS we are writing - if (mPortStreamV19 != NULL && mLastPaError == paNoError) { - const PaStreamInfo* info = Pa_GetStreamInfo(mPortStreamV19); -@@ -1811,6 +1814,7 @@ - mAudioOutLatency = info->outputLatency; - mSystemMinusAudioTimePlusLatency += mAudioOutLatency; - } -+#endif - - return (mLastPaError == paNoError); - } -@@ -1955,8 +1959,10 @@ - - double playbackTime = 4.0; - -+#ifdef EXPERIMENTAL_MIDI_OUT - streamStartTime = 0; - streamStartTime = SystemTime(mUsingAlsa); -+#endif - - #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT - bool scrubbing = (options.pScrubbingOptions != nullptr); -@@ -2830,7 +2836,9 @@ - - mPlaybackTracks.clear(); - mCaptureTracks.clear(); -+#ifdef HAVE_MIDI - mMidiPlaybackTracks.clear(); -+#endif - - #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT - mScrubQueue.reset(); -@@ -4669,13 +4677,13 @@ - (float *)alloca(framesPerBuffer*numPlaybackChannels * sizeof(float)) : - (float *)outputBuffer; - -+#ifdef EXPERIMENTAL_MIDI_OUT - if (gAudioIO->mCallbackCount++ == 0) { - // This is effectively mSystemMinusAudioTime when the buffer is empty: - gAudioIO->mStartTime = SystemTime(gAudioIO->mUsingAlsa) - gAudioIO->mT0; - // later, mStartTime - mSystemMinusAudioTime will tell us latency - } - --#ifdef EXPERIMENTAL_MIDI_OUT - /* GSW: Save timeInfo in case MidiPlayback needs it */ - gAudioIO->mAudioCallbackClockTime = PaUtil_GetTime(); - -@@ -5051,7 +5059,9 @@ - : gAudioIO->mTime >= gAudioIO->mT1)) - // PRL: singalling MIDI output complete is necessary if - // not USE_MIDI_THREAD, otherwise it's harmlessly redundant -+#ifdef EXPERIMENTAL_MIDI_OUT - gAudioIO->mMidiOutputComplete = true, -+#endif - callbackReturn = paComplete; - } - -@@ -5114,7 +5124,9 @@ - - // PRL: singalling MIDI output complete is necessary if - // not USE_MIDI_THREAD, otherwise it's harmlessly redundant -+#ifdef EXPERIMENTAL_MIDI_OUT - gAudioIO->mMidiOutputComplete = true, -+#endif - callbackReturn = paComplete; - } - } ---- audacity-minsrc-2.2.2-rc1/src/Project.cpp -+++ audacity-minsrc-2.2.2-rc1/src/Project.cpp -@@ -460,10 +460,11 @@ - } ); - - for (const auto &name : sortednames) { -- -+#ifdef USE_MIDI - if (Importer::IsMidi(name)) - AudacityProject::DoImportMIDI(mProject, name); - else -+#endif - mProject->Import(name); - } - -@@ -3046,9 +3047,11 @@ - #endif - - { -+#ifdef USE_MIDI - if (Importer::IsMidi(fileName)) - DoImportMIDI(this, fileName); - else -+#endif - Import(fileName); - - ZoomAfterImport(nullptr); ---- audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp -+++ audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp -@@ -9,6 +9,9 @@ - **********************************************************************/ - - #include "../../../../Audacity.h" -+ -+#ifdef USE_MIDI -+ - #include "NoteTrackButtonHandle.h" - - #include "../../../../HitTestResult.h" -@@ -113,3 +116,4 @@ - return RefreshCode::RefreshNone; - } - -+#endif ---- audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp -+++ audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp -@@ -9,6 +9,9 @@ - **********************************************************************/ - - #include "../../../../Audacity.h" -+ -+#ifdef USE_MIDI -+ - #include "NoteTrackVZoomHandle.h" - #include "../../../../Experimental.h" - #include "NoteTrackVRulerControls.h" -@@ -332,3 +335,5 @@ - TrackVRulerControls::DrawZooming - ( dc, mRect, panelRect, mZoomStart, mZoomEnd ); - } -+ -+#endif ---- audacity-minsrc-2.2.2-rc1/src/tracks/ui/TimeShiftHandle.cpp -+++ audacity-minsrc-2.2.2-rc1/src/tracks/ui/TimeShiftHandle.cpp -@@ -604,7 +604,7 @@ - { - trySnap = true; - if (pTrack->GetKind() == Track::Wave) { -- auto wt = static_cast(pTrack); -+ auto wt = static_cast(pTrack.get()); - const double rate = wt->GetRate(); - // set it to a sample point - desiredSlideAmount = rint(desiredSlideAmount * rate) / rate; diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch deleted file mode 100644 index 5b922638aa5c..000000000000 --- a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch +++ /dev/null @@ -1,62 +0,0 @@ -From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001 -From: Leland Lucius -Date: Mon, 16 Dec 2019 00:59:33 -0600 -Subject: [PATCH] Misc changes to get new Nyquist to build - -[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d] ---- - lib-src/libnyquist/nyquist/cmt/cmtio.h | 4 ++-- - lib-src/libnyquist/nyquist/cmt/userio.c | 4 ++++ - lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++--- - 3 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h b/lib-src/libnyquist/nyquist/cmt/cmtio.h -index 3e50ad957..232862b50 100644 ---- a/lib-src/libnyquist/nyquist/cmt/cmtio.h -+++ b/lib-src/libnyquist/nyquist/cmt/cmtio.h -@@ -1,7 +1,7 @@ - #define NOCHAR -2 - --int IOinputfd; --int IOnochar; -+extern int IOinputfd; -+extern int IOnochar; - - int IOsetup(int inputfd); - int IOcleanup(void); -diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c b/lib-src/libnyquist/nyquist/cmt/userio.c -index f442376c5..a33ac98c9 100644 ---- a/lib-src/libnyquist/nyquist/cmt/userio.c -+++ b/lib-src/libnyquist/nyquist/cmt/userio.c -@@ -153,6 +153,10 @@ extern int debug; - #include "xlisp.h" - #endif - -+int IOinputfd; /* input file descriptor (usually 0) */ -+ -+int IOnochar; /* Value to be returned by IOgetchar() -+ where there is no input to be had */ - - /**************************************************************************** - * -diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c b/lib-src/libnyquist/nyquist/sys/unix/io.c -index 21b2abed8..f3e499c0d 100644 ---- a/lib-src/libnyquist/nyquist/sys/unix/io.c -+++ b/lib-src/libnyquist/nyquist/sys/unix/io.c -@@ -16,10 +16,10 @@ - #include - #include "cext.h" - --int IOinputfd; /* input file descriptor (usually 0) */ -+extern int IOinputfd; /* input file descriptor (usually 0) */ - --int IOnochar; /* Value to be returned by IOgetchar() -- where there is no input to be had */ -+extern int IOnochar; /* Value to be returned by IOgetchar() -+ where there is no input to be had */ - - static struct sgttyb IOoldmodes, IOcurrentmodes; - /* Initial and current tty modes */ --- -2.24.1 - diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml index 7f3a6ec835ae..2457f6d4ce87 100644 --- a/media-sound/audacity/metadata.xml +++ b/media-sound/audacity/metadata.xml @@ -13,14 +13,11 @@ Enables ID3 tagging with id3tag library Add support for Ladspa V2 - Enables MIDI support Enable support for MIDI via media-libs/portmidi Enable the internal portmixer feature Enable support for Portable Standard Midi File Library Enables sbsms library support for slower, more accurate pitch and tempo changing - Enables soundtouch library support for pitch and - tempo changing Enables twolame support (MPEG Audio Layer 2 encoder) Enables vamp plugins support (Audio analysing plugins) Enable VST plugin support -- cgit v1.2.3