diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-04-21 14:44:07 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-04-21 15:36:37 +0200 |
| commit | 80420acb5e0243c5355d069d09756a8bc06ff451 (patch) | |
| tree | d03bfad75fa6175d49162c16c9835bfb67988926 | |
| parent | eb3574fb7d20a3769972c3ce31a0891ce9347225 (diff) | |
| download | patches-80420acb5e0243c5355d069d09756a8bc06ff451.tar patches-80420acb5e0243c5355d069d09756a8bc06ff451.tar.gz | |
gnu: portaudio: Update to 190600.20161030.
* gnu/packages/audio.scm (portaudio): Update to 190600.20161030.
* gnu/packages/patches/portaudio-audacity-compat.patch: Adjust line endings.
| -rw-r--r-- | gnu/packages/audio.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/portaudio-audacity-compat.patch | 60 |
2 files changed, 32 insertions, 32 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4eebbdb615..5b2d971953 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2433,7 +2433,7 @@ portions of LAME.") (define-public portaudio (package (name "portaudio") - (version "19.20140130") + (version "190600.20161030") (source (origin (method url-fetch) @@ -2442,7 +2442,7 @@ portions of LAME.") (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) ".tgz")) (sha256 - (base32 "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g")) + (base32 "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm")) (patches (search-patches "portaudio-audacity-compat.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/patches/portaudio-audacity-compat.patch b/gnu/packages/patches/portaudio-audacity-compat.patch index 9f239ada35..513d08bcea 100644 --- a/gnu/packages/patches/portaudio-audacity-compat.patch +++ b/gnu/packages/patches/portaudio-audacity-compat.patch @@ -7,27 +7,27 @@ See <http://music.columbia.edu/pipermail/portaudio/2015-March/016611.html>. --- a/include/pa_win_ds.h +++ b/include/pa_win_ds.h @@ -89,6 +89,21 @@ -
- }PaWinDirectSoundStreamInfo;
-
-+/** Retrieve the GUID of the input device.
-+
-+ @param stream The stream to query.
-+
-+ @return A pointer to the GUID, or NULL if none.
-+*/
-+LPGUID PaWinDS_GetStreamInputGUID( PaStream* s );
-+
-+/** Retrieve the GUID of the output device.
-+
-+ @param stream The stream to query.
-+
-+ @return A pointer to the GUID, or NULL if none.
-+*/
-+LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s );
-
-
- #ifdef __cplusplus
+ + }PaWinDirectSoundStreamInfo; + ++/** Retrieve the GUID of the input device. ++ ++ @param stream The stream to query. ++ ++ @return A pointer to the GUID, or NULL if none. ++*/ ++LPGUID PaWinDS_GetStreamInputGUID( PaStream* s ); ++ ++/** Retrieve the GUID of the output device. ++ ++ @param stream The stream to query. ++ ++ @return A pointer to the GUID, or NULL if none. ++*/ ++LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s ); + + + #ifdef __cplusplus --- a/include/portaudio.h +++ b/include/portaudio.h @@ -1146,6 +1146,15 @@ @@ -224,15 +224,15 @@ See <http://music.columbia.edu/pipermail/portaudio/2015-March/016611.html>. --- a/src/hostapi/coreaudio/pa_mac_core_blocking.c +++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c @@ -66,6 +66,9 @@ - #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
- # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
- # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) )
-+#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
-+# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b )
-+# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b )
- #else
- # include <libkern/OSAtomic.h>
- #endif
+ #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS + # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) ) + # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) ) ++#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3 ++# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b ) ++# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b ) + #else + # include <libkern/OSAtomic.h> + #endif --- a/src/hostapi/alsa/pa_linux_alsa.c +++ b/src/hostapi/alsa/pa_linux_alsa.c @@ -611,6 +611,7 @@ |