mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-sound/audacity: removed obsolete 2.2.2 and 2.3.3
Closes: https://bugs.gentoo.org/699946 Closes: https://bugs.gentoo.org/646820 Closes: https://bugs.gentoo.org/618326 Closes: https://bugs.gentoo.org/626586 Closes: https://bugs.gentoo.org/632712 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
@@ -1,6 +1,2 @@
|
||||
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
|
||||
|
||||
@@ -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-libs/portaudio-19.06.00-r2
|
||||
media-libs/soxr
|
||||
x11-libs/wxGTK:3.0[X]
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
ffmpeg? ( >=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
|
||||
}
|
||||
@@ -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-libs/portaudio-20
|
||||
media-libs/soxr
|
||||
x11-libs/wxGTK:${WX_GTK_VER}[X]
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
ffmpeg? ( >=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
|
||||
}
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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<const WaveTrack *>(pTrack);
|
||||
+ auto wt = static_cast<const WaveTrack *>(pTrack.get());
|
||||
const double rate = wt->GetRate();
|
||||
// set it to a sample point
|
||||
desiredSlideAmount = rint(desiredSlideAmount * rate) / rate;
|
||||
@@ -1,62 +0,0 @@
|
||||
From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
|
||||
From: Leland Lucius <github@homerow.net>
|
||||
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 <sgtty.h>
|
||||
#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
|
||||
|
||||
@@ -13,14 +13,11 @@
|
||||
<use>
|
||||
<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
|
||||
<flag name="lv2">Add support for Ladspa V2</flag>
|
||||
<flag name="midi">Enables MIDI support</flag>
|
||||
<flag name="portmidi">Enable support for MIDI via media-libs/portmidi</flag>
|
||||
<flag name="portmixer">Enable the internal portmixer feature</flag>
|
||||
<flag name="portsmf">Enable support for Portable Standard Midi File Library</flag>
|
||||
<flag name="sbsms">Enables sbsms library support for slower, more accurate
|
||||
pitch and tempo changing</flag>
|
||||
<flag name="soundtouch">Enables soundtouch library support for pitch and
|
||||
tempo changing</flag>
|
||||
<flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
|
||||
<flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>
|
||||
<flag name="vst">Enable VST plugin support</flag>
|
||||
|
||||
Reference in New Issue
Block a user