[Pkg-voip-commits] [portaudio19] 06/09: Refresh audacity-portmixer.patch

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script.

bdrung pushed a commit to branch master
in repository portaudio19.

commit a6a93ec06307e0c5dd346b6330a9ede2bdcbabaa
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Dec 25 21:33:10 2016 +0100

    Refresh audacity-portmixer.patch
---
 debian/patches/audacity-portmixer.patch | 50 +++++----------------------------
 1 file changed, 7 insertions(+), 43 deletions(-)

diff --git a/debian/patches/audacity-portmixer.patch b/debian/patches/audacity-portmixer.patch
index 7d13305..a9a3318 100644
--- a/debian/patches/audacity-portmixer.patch
+++ b/debian/patches/audacity-portmixer.patch
@@ -1,34 +1,10 @@
 Description: Add features needed to make portmixer work with audacity.
 Author: Audacity Team
-Last-Update: 2011-12-07
+Last-Update: 2016-12-25
 
---- a/include/pa_win_ds.h
-+++ b/include/pa_win_ds.h
-@@ -86,6 +86,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
 --- a/include/portaudio.h
 +++ b/include/portaudio.h
-@@ -1146,6 +1146,15 @@
+@@ -1197,6 +1197,15 @@
  signed long Pa_GetStreamWriteAvailable( PaStream* stream );
  
  
@@ -153,7 +129,7 @@ Last-Update: 2011-12-07
 +#endif
 --- a/src/common/pa_front.c
 +++ b/src/common/pa_front.c
-@@ -1216,8 +1216,10 @@
+@@ -1257,8 +1257,10 @@
                                    hostApiInputParametersPtr, hostApiOutputParametersPtr,
                                    sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
  
@@ -165,7 +141,7 @@ Last-Update: 2011-12-07
  
  
      PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-@@ -1729,6 +1731,32 @@
+@@ -1770,6 +1772,32 @@
      return result;
  }
  
@@ -219,18 +195,6 @@ Last-Update: 2011-12-07
  } PaUtilStreamRepresentation;
  
  
---- 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
 --- a/src/hostapi/alsa/pa_linux_alsa.c
 +++ b/src/hostapi/alsa/pa_linux_alsa.c
 @@ -621,6 +621,7 @@
@@ -259,7 +223,7 @@ Last-Update: 2011-12-07
      self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
  
      PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
-@@ -4588,9 +4593,7 @@
+@@ -4605,9 +4610,7 @@
      /* XXX: More descriptive error? */
      PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
  
@@ -270,7 +234,7 @@ Last-Update: 2011-12-07
  
  error:
      return result;
-@@ -4607,9 +4610,7 @@
+@@ -4624,9 +4627,7 @@
      /* XXX: More descriptive error? */
      PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
  
@@ -312,7 +276,7 @@ Last-Update: 2011-12-07
 +}
 --- a/configure.in
 +++ b/configure.in
-@@ -405,6 +405,7 @@
+@@ -420,6 +420,7 @@
                     DLL_LIBS="$DLL_LIBS -lossaudio"
                     LIBS="$LIBS -lossaudio"
             fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/portaudio19.git