portaudio: fix patches -Np1

This commit is contained in:
Đoàn Trần Công Danh 2021-06-25 08:14:40 +07:00
parent a6ccff0cfc
commit 1ad0e95113
2 changed files with 15 additions and 15 deletions

View file

@ -3,7 +3,7 @@ Upstream: No
Reason: Audacity needs Pa_GetStreamHostApiType to use system wide portaudio Reason: Audacity needs Pa_GetStreamHostApiType to use system wide portaudio
diff --git configure.in configure.in diff --git a/configure.in b/configure.in
index 13816fb..83c239a 100644 index 13816fb..83c239a 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@ -15,7 +15,7 @@ index 13816fb..83c239a 100644
AC_DEFINE(PA_USE_OSS,1) AC_DEFINE(PA_USE_OSS,1)
fi fi
diff --git include/pa_unix_oss.h include/pa_unix_oss.h diff --git a/include/pa_unix_oss.h b/include/pa_unix_oss.h
new file mode 100644 new file mode 100644
index 0000000..64e04cb index 0000000..64e04cb
--- /dev/null --- /dev/null
@ -125,7 +125,7 @@ index 0000000..64e04cb
+#endif +#endif
+ +
+#endif +#endif
diff --git include/pa_win_ds.h include/pa_win_ds.h diff --git a/include/pa_win_ds.h b/include/pa_win_ds.h
index 5d38641..ba1c245 100644 index 5d38641..ba1c245 100644
--- a/include/pa_win_ds.h --- a/include/pa_win_ds.h
+++ b/include/pa_win_ds.h +++ b/include/pa_win_ds.h
@ -151,7 +151,7 @@ index 5d38641..ba1c245 100644
#ifdef __cplusplus #ifdef __cplusplus
diff --git include/portaudio.h include/portaudio.h diff --git a/include/portaudio.h b/include/portaudio.h
index 8a94aaf..9c8a295 100644 index 8a94aaf..9c8a295 100644
--- a/include/portaudio.h --- a/include/portaudio.h
+++ b/include/portaudio.h +++ b/include/portaudio.h
@ -171,7 +171,7 @@ index 8a94aaf..9c8a295 100644
/* Miscellaneous utilities */ /* Miscellaneous utilities */
diff --git src/common/pa_front.c src/common/pa_front.c diff --git a/src/common/pa_front.c b/src/common/pa_front.c
index 188cee9..52f44a6 100644 index 188cee9..52f44a6 100644
--- a/src/common/pa_front.c --- a/src/common/pa_front.c
+++ b/src/common/pa_front.c +++ b/src/common/pa_front.c
@ -220,7 +220,7 @@ index 188cee9..52f44a6 100644
PaError Pa_GetSampleSize( PaSampleFormat format ) PaError Pa_GetSampleSize( PaSampleFormat format )
{ {
diff --git src/common/pa_stream.c src/common/pa_stream.c diff --git a/src/common/pa_stream.c b/src/common/pa_stream.c
index 03a0ee6..c4376f9 100644 index 03a0ee6..c4376f9 100644
--- a/src/common/pa_stream.c --- a/src/common/pa_stream.c
+++ b/src/common/pa_stream.c +++ b/src/common/pa_stream.c
@ -233,7 +233,7 @@ index 03a0ee6..c4376f9 100644
} }
diff --git src/common/pa_stream.h src/common/pa_stream.h diff --git a/src/common/pa_stream.h b/src/common/pa_stream.h
index 678e2ad..70572c7 100644 index 678e2ad..70572c7 100644
--- a/src/common/pa_stream.h --- a/src/common/pa_stream.h
+++ b/src/common/pa_stream.h +++ b/src/common/pa_stream.h
@ -245,7 +245,7 @@ index 678e2ad..70572c7 100644
} PaUtilStreamRepresentation; } PaUtilStreamRepresentation;
diff --git src/hostapi/alsa/pa_linux_alsa.c src/hostapi/alsa/pa_linux_alsa.c diff --git a/src/hostapi/alsa/pa_linux_alsa.c b/src/hostapi/alsa/pa_linux_alsa.c
index 584cde8..558fb3d 100644 index 584cde8..558fb3d 100644
--- a/src/hostapi/alsa/pa_linux_alsa.c --- a/src/hostapi/alsa/pa_linux_alsa.c
+++ b/src/hostapi/alsa/pa_linux_alsa.c +++ b/src/hostapi/alsa/pa_linux_alsa.c
@ -297,7 +297,7 @@ index 584cde8..558fb3d 100644
error: error:
return result; return result;
diff --git src/hostapi/coreaudio/pa_mac_core_blocking.c src/hostapi/coreaudio/pa_mac_core_blocking.c diff --git a/src/hostapi/coreaudio/pa_mac_core_blocking.c b/src/hostapi/coreaudio/pa_mac_core_blocking.c
index 679c6ba..a69e085 100644 index 679c6ba..a69e085 100644
--- a/src/hostapi/coreaudio/pa_mac_core_blocking.c --- a/src/hostapi/coreaudio/pa_mac_core_blocking.c
+++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c +++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c
@ -311,7 +311,7 @@ index 679c6ba..a69e085 100644
#else #else
# include <libkern/OSAtomic.h> # include <libkern/OSAtomic.h>
#endif #endif
diff --git src/hostapi/oss/pa_unix_oss.c src/hostapi/oss/pa_unix_oss.c diff --git a/src/hostapi/oss/pa_unix_oss.c b/src/hostapi/oss/pa_unix_oss.c
index 51e9630..f257d80 100644 index 51e9630..f257d80 100644
--- a/src/hostapi/oss/pa_unix_oss.c --- a/src/hostapi/oss/pa_unix_oss.c
+++ b/src/hostapi/oss/pa_unix_oss.c +++ b/src/hostapi/oss/pa_unix_oss.c

View file

@ -1,4 +1,4 @@
diff --git Makefile.in Makefile.in diff --git a/Makefile.in b/Makefile.in
index 5e1a764..2747f73 100644 index 5e1a764..2747f73 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@ -19,7 +19,7 @@ index 5e1a764..2747f73 100644
src/hostapi/wasapi \ src/hostapi/wasapi \
src/hostapi/wdmks \ src/hostapi/wdmks \
src/hostapi/wmme \ src/hostapi/wmme \
diff --git configure.in configure.in diff --git a/configure.in b/configure.in
index 83c239a..db11d65 100644 index 83c239a..db11d65 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@ -67,7 +67,7 @@ index 83c239a..db11d65 100644
OSS ......................... $have_oss OSS ......................... $have_oss
JACK ........................ $have_jack JACK ........................ $have_jack
]) ])
diff --git include/portaudio.h include/portaudio.h diff --git a/include/portaudio.h b/include/portaudio.h
index 9c8a295..e535a02 100644 index 9c8a295..e535a02 100644
--- a/include/portaudio.h --- a/include/portaudio.h
+++ b/include/portaudio.h +++ b/include/portaudio.h
@ -81,7 +81,7 @@ index 9c8a295..e535a02 100644
} PaHostApiTypeId; } PaHostApiTypeId;
diff --git src/hostapi/sndio/pa_sndio.c src/hostapi/sndio/pa_sndio.c diff --git a/src/hostapi/sndio/pa_sndio.c b/src/hostapi/sndio/pa_sndio.c
new file mode 100644 new file mode 100644
index 0000000..725ef47 index 0000000..725ef47
--- /dev/null --- /dev/null
@ -855,7 +855,7 @@ index 0000000..725ef47
+ DPR("PaSndio_Initialize: done\n"); + DPR("PaSndio_Initialize: done\n");
+ return paNoError; + return paNoError;
+} +}
diff --git src/os/unix/pa_unix_hostapis.c src/os/unix/pa_unix_hostapis.c diff --git a/src/os/unix/pa_unix_hostapis.c b/src/os/unix/pa_unix_hostapis.c
index a9b4a05..f10ced1 100644 index a9b4a05..f10ced1 100644
--- a/src/os/unix/pa_unix_hostapis.c --- a/src/os/unix/pa_unix_hostapis.c
+++ b/src/os/unix/pa_unix_hostapis.c +++ b/src/os/unix/pa_unix_hostapis.c