Mercurial > mxe-octave
view src/portaudio-1-win32.patch @ 4192:438a4bfdc887
new rules for creating a tarball from Octave's hg sources
* hg-octave-dist.mk: New file.
* Makefile.in: Include hg-octave-dist.mk.
(ENV_PATH, ENV_PKG_CONFIG_PATH, ENV_LD_LIBRARY_PATH):
Capture values from environment.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 29 Aug 2016 11:21:19 -0400 |
parents | f362e10a0fa7 |
children | 90a5bdf9f501 |
line wrap: on
line source
This file is part of MXE. See index.html for further information. diff -aur portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c --- portaudio/src/hostapi/dsound/pa_win_ds.c 2011-11-10 14:51:15.000000000 +0000 +++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c 2012-03-02 21:45:29.000000000 +0000 @@ -860,6 +860,9 @@ case DSSPEAKER_STEREO: count = 2; break; case DSSPEAKER_SURROUND: count = 4; break; case DSSPEAKER_5POINT1: count = 6; break; +#ifndef DSSPEAKER_7POINT1 +#define DSSPEAKER_7POINT1 0x00000007 +#endif case DSSPEAKER_7POINT1: count = 8; break; #ifndef DSSPEAKER_7POINT1_SURROUND #define DSSPEAKER_7POINT1_SURROUND 0x00000008 diff -Nuar portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c --- portaudio/src/hostapi/dsound/pa_win_ds.c 2014-02-02 14:16:01.916602634 +0100 +++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c 2014-02-02 14:17:19.340378622 +0100 @@ -2108,7 +2108,8 @@ } else { - CalculateBufferSettings( &stream->hostBufferSizeFrames, &pollingPeriodFrames, + CalculateBufferSettings( (unsigned long*)&stream->hostBufferSizeFrames, + &pollingPeriodFrames, /* isFullDuplex = */ (inputParameters && outputParameters), suggestedInputLatencyFrames, suggestedOutputLatencyFrames, diff --git a/configure.in b/configure.in index 305b64e..3f3b31e 100644 --- a/configure.in +++ b/configure.in @@ -318,7 +318,7 @@ case "${host_os}" in if [[ "x$with_wdmks" = "xyes" ]]; then DXDIR="$with_dxdir" - add_objects src/hostapi/wdmks/pa_win_wdmks.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_wdmks_util.o src/os/win/pa_win_waveformat.o + add_objects src/hostapi/wdmks/pa_win_wdmks.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_wdmks_utils.o src/os/win/pa_win_waveformat.o LIBS="${LIBS} -lwinmm -lm -luuid -lsetupapi -lole32" DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -luuid -lsetupapi -lole32" #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""