[Pkg-voip-commits] [portaudio19] 111/114: Refresh 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 2a8a7eb546bd3994e3ab447ac5b4ce9df6964801
Author: Benjamin Drung <bdrung at debian.org>
Date:   Wed Jan 15 22:04:40 2014 +0000

    Refresh portmixer patch.
---
 debian/patches/audacity-portmixer.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/audacity-portmixer.patch b/debian/patches/audacity-portmixer.patch
index d864b44..7d13305 100644
--- a/debian/patches/audacity-portmixer.patch
+++ b/debian/patches/audacity-portmixer.patch
@@ -4,7 +4,7 @@ Last-Update: 2011-12-07
 
 --- a/include/pa_win_ds.h
 +++ b/include/pa_win_ds.h
-@@ -89,6 +89,21 @@
+@@ -86,6 +86,21 @@
  
  }PaWinDirectSoundStreamInfo;
  
@@ -233,7 +233,7 @@ Last-Update: 2011-12-07
  #endif
 --- a/src/hostapi/alsa/pa_linux_alsa.c
 +++ b/src/hostapi/alsa/pa_linux_alsa.c
-@@ -611,6 +611,7 @@
+@@ -621,6 +621,7 @@
      StreamDirection streamDir;
  
      snd_pcm_channel_area_t *channelAreas;  /* Needed for channel adaption */
@@ -241,7 +241,7 @@ Last-Update: 2011-12-07
  } PaAlsaStreamComponent;
  
  /* Implementation specific stream structure */
-@@ -1806,6 +1807,7 @@
+@@ -1873,6 +1874,7 @@
  {
      PaError result = paNoError;
      PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
@@ -249,7 +249,7 @@ Last-Update: 2011-12-07
      assert( params->channelCount > 0 );
  
      /* Make sure things have an initial value */
-@@ -1826,6 +1828,9 @@
+@@ -1900,6 +1902,9 @@
      self->device = params->device;
  
      PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
@@ -259,7 +259,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 ) );
-@@ -4519,9 +4524,7 @@
+@@ -4588,9 +4593,7 @@
      /* XXX: More descriptive error? */
      PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
  
@@ -270,7 +270,7 @@ Last-Update: 2011-12-07
  
  error:
      return result;
-@@ -4537,9 +4540,7 @@
+@@ -4607,9 +4610,7 @@
      /* XXX: More descriptive error? */
      PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
  
@@ -283,7 +283,7 @@ Last-Update: 2011-12-07
      return result;
 --- a/src/hostapi/oss/pa_unix_oss.c
 +++ b/src/hostapi/oss/pa_unix_oss.c
-@@ -2028,3 +2028,26 @@
+@@ -2043,3 +2043,26 @@
  #endif
  }
  
@@ -312,7 +312,7 @@ Last-Update: 2011-12-07
 +}
 --- a/configure.in
 +++ b/configure.in
-@@ -365,6 +365,7 @@
+@@ -405,6 +405,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