mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
d75a0cd986
* gnu/packages/audio.scm (audacity): Update to 2.3.3. [source](snippet): Remove bundled "lame". [arguments]: Adjust "use-upstream-headers" phase. * gnu/packages/patches/audacity-build-with-system-portaudio.patch: Adjust patch.
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
Downloaded from here:
|
|
https://sourceforge.net/p/audacity/mailman/message/36106562/
|
|
|
|
Modified for use on later versions of audacity.
|
|
|
|
>From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
|
|
From: Antonio Ospite <ao2@ao2.it>
|
|
Date: Tue, 7 Nov 2017 13:06:33 +0100
|
|
Subject: [PATCH] Fix building against the system portaudio library
|
|
|
|
Building against the system portaudio results in this error:
|
|
|
|
./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
|
|
audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
|
|
unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
|
|
./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
|
|
collect2: error: ld returned 1 exit status
|
|
Makefile:2349: recipe for target 'audacity' failed
|
|
make[3]: *** [audacity] Error 1
|
|
|
|
This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
|
|
but is resolved as a C++ symbol at link time.
|
|
|
|
Audacity fixes this in the local tree with this change:
|
|
https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
|
|
|
|
However this is not general enough for the portaudio debian package.
|
|
|
|
Since PaUtil_GetTime() is the only function causing problems, just copy
|
|
over the code where it's used.
|
|
---
|
|
src/AudioIO.cpp | 17 ++++++++++++++++-
|
|
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
|
|
index 48715869c..bb4bf472c 100644
|
|
--- a/src/AudioIO.cpp
|
|
+++ b/src/AudioIO.cpp
|
|
@@ -480,9 +480,22 @@ time warp info and AudioIOListener and whether the playback is looped.
|
|
#define ROUND(x) (int) ((x)+0.5)
|
|
//#include <string.h>
|
|
// #include "../lib-src/portmidi/pm_common/portmidi.h"
|
|
- #include "../lib-src/portaudio-v19/src/common/pa_util.h"
|
|
#include "NoteTrack.h"
|
|
#endif
|
|
+PaTime PaUtil_GetTime( void )
|
|
+{
|
|
+#ifdef HAVE_MACH_ABSOLUTE_TIME
|
|
+ return mach_absolute_time() * machSecondsConversionScaler_;
|
|
+#elif defined(HAVE_CLOCK_GETTIME)
|
|
+ struct timespec tp;
|
|
+ clock_gettime(CLOCK_REALTIME, &tp);
|
|
+ return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
|
|
+#else
|
|
+ struct timeval tv;
|
|
+ gettimeofday( &tv, NULL );
|
|
+ return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
|
|
+#endif
|
|
+}
|
|
|
|
#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
|
|
#define LOWER_BOUND 0.0
|