Get rid of no-longer-needed patches to PortAudio.
The version of PortAudio we now specify has both of those problems fixed. Change-Id: I7364a5dfac1aac4799347a88f3e89fcb52f57d32 Reviewed-on: https://code.wireshark.org/review/23356 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
8f555e4335
commit
e1a591fc74
|
@ -1,11 +0,0 @@
|
|||
--- macosx-support-libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c.dist 2011-10-20 02:40:12.000000000 -0700
|
||||
+++ macosx-support-libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c 2013-06-27 03:13:57.000000000 -0700
|
||||
@@ -629,7 +629,7 @@
|
||||
|
||||
VVDBUG(("InitializeDeviceInfo(): macCoreDeviceId=%ld\n", macCoreDeviceId));
|
||||
|
||||
- memset(deviceInfo, 0, sizeof(deviceInfo));
|
||||
+ memset(deviceInfo, 0, sizeof(*deviceInfo));
|
||||
|
||||
deviceInfo->structVersion = 2;
|
||||
deviceInfo->hostApi = hostApiIndex;
|
|
@ -1,11 +0,0 @@
|
|||
--- include/pa_mac_core.h.dist 2011-07-09 08:01:52.000000000 -0700
|
||||
+++ include/pa_mac_core.h 2012-08-11 12:14:25.000000000 -0700
|
||||
@@ -46,7 +46,7 @@
|
||||
#include "portaudio.h"
|
||||
|
||||
#include <AudioUnit/AudioUnit.h>
|
||||
-//#include <AudioToolbox/AudioToolbox.h>
|
||||
+#include <AudioToolbox/AudioToolbox.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
|
@ -1465,15 +1465,6 @@ install_portaudio() {
|
|||
gzcat $PORTAUDIO_VERSION.tgz | tar xf - || exit 1
|
||||
cd portaudio
|
||||
#
|
||||
# Un-comment an include that's required on Lion.
|
||||
#
|
||||
patch -p0 include/pa_mac_core.h <../../macosx-support-lib-patches/portaudio-pa_mac_core.h.patch
|
||||
#
|
||||
# Fix a bug that showed up with clang (but is a bug with any
|
||||
# compiler).
|
||||
#
|
||||
patch -p0 src/hostapi/coreaudio/pa_mac_core.c <../../macosx-support-lib-patches/portaudio-pa_mac_core.c.patch
|
||||
#
|
||||
# Disable fat builds - the configure script doesn't work right
|
||||
# with Xcode 4 if you leave them enabled, and we don't build
|
||||
# any other libraries fat (GLib, for example, would be very
|
||||
|
|
Loading…
Reference in New Issue