diff options
| author | Matthias Geier <Matthias.Geier@gmail.com> | 2015-07-01 09:48:08 (GMT) |
|---|---|---|
| committer | Matthias Geier <Matthias.Geier@gmail.com> | 2015-07-01 09:48:08 (GMT) |
| commit | d03d9f0fe37803c8d826e15ffc24ae615fedffb7 (patch) | |
| tree | 212fb2ed27dcce66f7b1fe00afb3e1ecc3bef81a | |
| parent | eb65c9cdb60161e5e96e6f4d9fdf2b9adb9a2cb6 (diff) | |
| download | mxe-d03d9f0fe37803c8d826e15ffc24ae615fedffb7.zip mxe-d03d9f0fe37803c8d826e15ffc24ae615fedffb7.tar.gz mxe-d03d9f0fe37803c8d826e15ffc24ae615fedffb7.tar.bz2 | |
Change line endings in PortAudio/WASAPI patch
Without the change, I get this error:
(cd '.../tmp-portaudio-x86_64-w64-mingw32.static/portaudio' && patch -p1 -u) < ./src/portaudio-1-fixes.patch
patching file configure.in
patching file src/hostapi/dsound/pa_win_ds.c
patching file src/hostapi/wdmks/pa_win_wdmks.c
patching file configure.in
patching file src/hostapi/wasapi/pa_win_wasapi.c
Hunk #1 FAILED at 49 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/hostapi/wasapi/pa_win_wasapi.c.rej
| -rw-r--r-- | src/portaudio-1-fixes.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/portaudio-1-fixes.patch b/src/portaudio-1-fixes.patch index acfaef1..cea397d 100644 --- a/src/portaudio-1-fixes.patch +++ b/src/portaudio-1-fixes.patch @@ -109,25 +109,25 @@ index aecdd63..a9473b9 100644 --- a/src/hostapi/wasapi/pa_win_wasapi.c +++ b/src/hostapi/wasapi/pa_win_wasapi.c @@ -49,14 +49,15 @@ - #include <assert.h> - #include <mmsystem.h> - #include <mmreg.h> // must be before other Wasapi headers --#if defined(_MSC_VER) && (_MSC_VER >= 1400) -- #include <Avrt.h> -+#if defined(_MSC_VER) && (_MSC_VER >= 1400) || defined(__MINGW64_VERSION_MAJOR) -+ #include <avrt.h> - #define COBJMACROS -- #include <Audioclient.h> -+ #include <audioclient.h> - #include <endpointvolume.h> - #define INITGUID // Avoid additional linkage of static libs, excessive code will be optimized out by the compiler -- #include <mmdeviceapi.h> -+ #include <functiondiscoverykeys_devpkey.h> - #include <functiondiscoverykeys.h> -+ #include <mmdeviceapi.h> - #include <devicetopology.h> // Used to get IKsJackDescription interface - #undef INITGUID - #endif + #include <assert.h>
+ #include <mmsystem.h>
+ #include <mmreg.h> // must be before other Wasapi headers
+-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+- #include <Avrt.h>
++#if defined(_MSC_VER) && (_MSC_VER >= 1400) || defined(__MINGW64_VERSION_MAJOR)
++ #include <avrt.h>
+ #define COBJMACROS
+- #include <Audioclient.h>
++ #include <audioclient.h>
+ #include <endpointvolume.h>
+ #define INITGUID // Avoid additional linkage of static libs, excessive code will be optimized out by the compiler
+- #include <mmdeviceapi.h>
++ #include <functiondiscoverykeys_devpkey.h>
+ #include <functiondiscoverykeys.h>
++ #include <mmdeviceapi.h>
+ #include <devicetopology.h> // Used to get IKsJackDescription interface
+ #undef INITGUID
+ #endif
-- 1.9.1 |