Mercurial > mxe-octave

annotate src/portaudio-1-win32.patch @ 3319:2636b3458f4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/msvc-octave-1.patch: Update to octave 3.7.7.
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 12 Nov 2013 20:54:29 -0500
parents 52c2d81ac7d5
children f362e10a0fa7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 972
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
2688
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
4 diff -aur portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
5 --- portaudio/src/hostapi/dsound/pa_win_ds.c 2011-11-10 14:51:15.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
6 +++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c 2012-03-02 21:45:29.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
7 @@ -860,6 +860,9 @@
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
8 case DSSPEAKER_STEREO: count = 2; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
9 case DSSPEAKER_SURROUND: count = 4; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
10 case DSSPEAKER_5POINT1: count = 6; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
11 +#ifndef DSSPEAKER_7POINT1
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
12 +#define DSSPEAKER_7POINT1 0x00000007
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
13 +#endif
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
14 case DSSPEAKER_7POINT1: count = 8; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
15 #ifndef DSSPEAKER_7POINT1_SURROUND
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
16 #define DSSPEAKER_7POINT1_SURROUND 0x00000008
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
17 diff -aur portaudio/src/hostapi/wdmks/pa_win_wdmks.c portaudio-patched/src/hostapi/wdmks/pa_win_wdmks.c
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
18 --- portaudio/src/hostapi/wdmks/pa_win_wdmks.c 2011-02-17 15:56:04.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
19 +++ portaudio-patched/src/hostapi/wdmks/pa_win_wdmks.c 2012-03-02 21:49:13.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
20 @@ -136,6 +136,7 @@
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21
2688
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
22 #include <mmreg.h>
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
23 #include <ks.h>
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
24 +#define _WAVEFORMATEXTENSIBLE_
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
25 #include <ksmedia.h>
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
26 #include <tchar.h>
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
27 #include <assert.h>
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
28 --- portaudio/configure.in 14:07:02.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
29 +++ portaudio-patched/configure.in 2012-05-27 14:08:34.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
30 @@ -247,7 +247,7 @@
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
31 if [[ "x$with_directx" = "xyes" ]]; then
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
32 DXDIR="$with_dxdir"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
33 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
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
34 - LIBS="-lwinmm -lm -ldsound -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
35 + LIBS="$LIBS -lwinmm -lm -ldsound -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
36 DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -ldsound -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
37 #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
38 #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
39 @@ -257,7 +257,7 @@
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
40 if [[ "x$with_asio" = "xyes" ]]; then
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
41 ASIODIR="$with_asiodir"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
42 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
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
43 - LIBS="-lwinmm -lm -lole32 -luuid"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
44 + LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
45 DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32 -luuid"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
46 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"
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
47
2688
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
48 @@ -273,7 +273,7 @@
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
49 if [[ "x$with_wdmks" = "xyes" ]]; then
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
50 DXDIR="$with_dxdir"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
51 add_objects src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
52 - LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
53 + LIBS="$LIBS -lwinmm -lm -luuid -lsetupapi -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
54 DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -luuid -lsetupapi -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
55 #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
56 #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
57 @@ -282,14 +282,14 @@
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
58
2688
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
59 if [[ "x$with_wmme" = "xyes" ]]; then
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
60 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
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
61 - LIBS="-lwinmm -lm -lole32 -luuid"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
62 + LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
63 DLL_LIBS="${DLL_LIBS} -lwinmm"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
64 CFLAGS="$CFLAGS -UPA_USE_WMME -DPA_USE_WMME=1"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
65 fi
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
66
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
67 if [[ "x$with_wasapi" = "xyes" ]]; then
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
68 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
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
69 - LIBS="-lwinmm -lm -lole32 -luuid"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
70 + LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
71 DLL_LIBS="${DLL_LIBS} -lwinmm -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
72 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
73 fi