diff options
Diffstat (limited to 'main/portaudio/portaudio-audacity.patch')
| -rw-r--r-- | main/portaudio/portaudio-audacity.patch | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/main/portaudio/portaudio-audacity.patch b/main/portaudio/portaudio-audacity.patch index 9535f9664b1..6a0434e33ff 100644 --- a/main/portaudio/portaudio-audacity.patch +++ b/main/portaudio/portaudio-audacity.patch @@ -1,6 +1,5 @@ -diff -wruN portaudio/include/pa_unix_oss.h portaudio-v19/include/pa_unix_oss.h ---- portaudio/include/pa_unix_oss.h 1969-12-31 18:00:00.000000000 -0600 -+++ portaudio-v19/include/pa_unix_oss.h 2012-12-14 22:34:14.290247100 -0600 +--- a/include/pa_unix_oss.h ++++ b/include/pa_unix_oss.h @@ -0,0 +1,52 @@ +#ifndef PA_UNIX_OSS_H +#define PA_UNIX_OSS_H @@ -54,10 +53,11 @@ diff -wruN portaudio/include/pa_unix_oss.h portaudio-v19/include/pa_unix_oss.h +#endif + +#endif -diff -wruN portaudio/include/portaudio.h portaudio-v19/include/portaudio.h ---- portaudio/include/portaudio.h 2012-08-31 19:10:13.000000000 -0500 -+++ portaudio-v19/include/portaudio.h 2012-12-14 22:34:14.368247200 -0600 -@@ -1146,6 +1146,15 @@ + + +--- a/include/portaudio.h ++++ b/include/portaudio.h +@@ -1197,6 +1197,15 @@ signed long Pa_GetStreamWriteAvailable( PaStream* stream ); @@ -71,12 +71,11 @@ diff -wruN portaudio/include/portaudio.h portaudio-v19/include/portaudio.h + + /* Miscellaneous utilities */ + - -diff -wruN portaudio/src/common/pa_front.c portaudio-v19/src/common/pa_front.c ---- portaudio/src/common/pa_front.c 2012-12-04 12:39:48.000000000 -0600 -+++ portaudio-v19/src/common/pa_front.c 2012-12-14 09:44:34.604344800 -0600 -@@ -1216,8 +1216,10 @@ +--- a/src/common/pa_front.c ++++ b/src/common/pa_front.c +@@ -1257,8 +1257,10 @@ hostApiInputParametersPtr, hostApiOutputParametersPtr, sampleRate, framesPerBuffer, streamFlags, streamCallback, userData ); @@ -88,7 +87,7 @@ diff -wruN portaudio/src/common/pa_front.c portaudio-v19/src/common/pa_front.c PA_LOGAPI(("Pa_OpenStream returned:\n" )); -@@ -1729,6 +1731,32 @@ +@@ -1770,6 +1772,32 @@ return result; } @@ -121,9 +120,10 @@ diff -wruN portaudio/src/common/pa_front.c portaudio-v19/src/common/pa_front.c PaError Pa_GetSampleSize( PaSampleFormat format ) { -diff -wruN portaudio/src/common/pa_stream.c portaudio-v19/src/common/pa_stream.c ---- portaudio/src/common/pa_stream.c 2008-02-15 01:50:33.000000000 -0600 -+++ portaudio-v19/src/common/pa_stream.c 2012-12-14 09:44:34.607345000 -0600 + + +--- a/src/common/pa_stream.c ++++ b/src/common/pa_stream.c @@ -93,6 +93,8 @@ streamRepresentation->streamInfo.inputLatency = 0.; streamRepresentation->streamInfo.outputLatency = 0.; @@ -132,22 +132,20 @@ diff -wruN portaudio/src/common/pa_stream.c portaudio-v19/src/common/pa_stream.c + streamRepresentation->hostApiType = 0; } - -diff -wruN portaudio/src/common/pa_stream.h portaudio-v19/src/common/pa_stream.h ---- portaudio/src/common/pa_stream.h 2008-02-15 01:50:33.000000000 -0600 -+++ portaudio-v19/src/common/pa_stream.h 2012-12-14 09:44:34.610345200 -0600 + +--- a/src/common/pa_stream.h ++++ b/src/common/pa_stream.h @@ -152,6 +152,7 @@ PaStreamFinishedCallback *streamFinishedCallback; void *userData; PaStreamInfo streamInfo; + PaHostApiTypeId hostApiType; } PaUtilStreamRepresentation; - - -diff -wruN portaudio/src/hostapi/oss/pa_unix_oss.c portaudio-v19/src/hostapi/oss/pa_unix_oss.c ---- portaudio/src/hostapi/oss/pa_unix_oss.c 2011-05-02 12:07:11.000000000 -0500 -+++ portaudio-v19/src/hostapi/oss/pa_unix_oss.c 2012-12-14 09:44:34.625346000 -0600 -@@ -2028,3 +2028,26 @@ + + +--- a/src/hostapi/oss/pa_unix_oss.c ++++ b/src/hostapi/oss/pa_unix_oss.c +@@ -2043,3 +2043,26 @@ #endif } @@ -174,10 +172,11 @@ diff -wruN portaudio/src/hostapi/oss/pa_unix_oss.c portaudio-v19/src/hostapi/oss + + return NULL; +} -diff -up portaudio/configure.in~ portaudio/configure.in ---- portaudio/configure.in~ 2013-04-07 12:20:18.000000000 +0200 -+++ portaudio/configure.in 2013-05-04 15:14:14.356191153 +0200 -@@ -387,7 +387,7 @@ case "${host_os}" in + + +--- a/configure.in ++++ b/configure.in +@@ -402,7 +402,7 @@ DLL_LIBS="$DLL_LIBS -lasound" LIBS="$LIBS -lasound" OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o" |