Mercurial > mxe-octave

view src/portaudio-1-win32.patch @ 2688:52c2d81ac7d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update PortAudio v19 from 20071207 to 20111121 This patch updates PortAudio to v19 20111121 from 20071207. The src/portaudio-1-win32.patch ./configure hunks have been submitted upstream and will be in the next PortAudio release. In the meantime we must carry this patch to build multiple audio host APIs for Windows. This patch also enables the WASAPI, WDM Kernel Streaming, and WinMME host APIs for a broader selection of Windows audio APIs. WASAPI and WDM Kernel Streaming are especially useful for low-latency audio. Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
author Stefan Hajnoczi <stefanha@gmail.com>
date Sun, 12 Aug 2012 12:40:15 +0100
parents 99516e73b368
children f362e10a0fa7
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 -aur portaudio/src/hostapi/wdmks/pa_win_wdmks.c portaudio-patched/src/hostapi/wdmks/pa_win_wdmks.c
--- portaudio/src/hostapi/wdmks/pa_win_wdmks.c	2011-02-17 15:56:04.000000000 +0000
+++ portaudio-patched/src/hostapi/wdmks/pa_win_wdmks.c	2012-03-02 21:49:13.000000000 +0000
@@ -136,6 +136,7 @@
 
 #include <mmreg.h>
 #include <ks.h>
+#define _WAVEFORMATEXTENSIBLE_
 #include <ksmedia.h>
 #include <tchar.h>
 #include <assert.h>
--- portaudio/configure.in 14:07:02.000000000 +0000
+++ portaudio-patched/configure.in	2012-05-27 14:08:34.000000000 +0000
@@ -247,7 +247,7 @@
         if [[ "x$with_directx" = "xyes" ]]; then
             DXDIR="$with_dxdir"
             add_objects src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_coinitialize.o src/os/win/pa_win_waveformat.o
-            LIBS="-lwinmm -lm -ldsound -lole32"
+            LIBS="$LIBS -lwinmm -lm -ldsound -lole32"
             DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -ldsound -lole32"
             #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
             #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
@@ -257,7 +257,7 @@
         if [[ "x$with_asio" = "xyes" ]]; then
             ASIODIR="$with_asiodir"
             add_objects src/hostapi/asio/pa_asio.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_coinitialize.o src/hostapi/asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o
-            LIBS="-lwinmm -lm -lole32 -luuid"
+            LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
             DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32 -luuid"
             CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/hostapi/asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -UPA_USE_ASIO -DPA_USE_ASIO=1 -DWINDOWS"
 
@@ -273,7 +273,7 @@
         if [[ "x$with_wdmks" = "xyes" ]]; then
             DXDIR="$with_dxdir"
             add_objects src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o
-            LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"
+            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\""
             #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
@@ -282,14 +282,14 @@
 
         if [[ "x$with_wmme" = "xyes" ]]; then
             add_objects src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o
-            LIBS="-lwinmm -lm -lole32 -luuid"
+            LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
             DLL_LIBS="${DLL_LIBS} -lwinmm"
             CFLAGS="$CFLAGS -UPA_USE_WMME -DPA_USE_WMME=1"
         fi
 
         if [[ "x$with_wasapi" = "xyes" ]]; then
             add_objects src/hostapi/wasapi/pa_win_wasapi.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_coinitialize.o src/os/win/pa_win_waveformat.o
-            LIBS="-lwinmm -lm -lole32 -luuid"
+            LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
             DLL_LIBS="${DLL_LIBS} -lwinmm -lole32"
             CFLAGS="$CFLAGS -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"
         fi