[Pkg-voip-commits] r9395 - /portaudio19/trunk/debian/patches/audacity-portmixer.patch

[bdrung at alioth.debian.org]

Author: bdrung
Date: Wed Dec  7 22:52:22 2011
New Revision: 9395

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9395
Log:
Refresh audacity-portmixer.patch.

Modified:
    portaudio19/trunk/debian/patches/audacity-portmixer.patch

Modified: portaudio19/trunk/debian/patches/audacity-portmixer.patch
URL: http://svn.debian.org/wsvn/pkg-voip/portaudio19/trunk/debian/patches/audacity-portmixer.patch?rev=9395&op=diff
==============================================================================
--- portaudio19/trunk/debian/patches/audacity-portmixer.patch (original)
+++ portaudio19/trunk/debian/patches/audacity-portmixer.patch Wed Dec  7 22:52:22 2011
@@ -1,10 +1,10 @@
 Description: Add features needed to make portmixer work with audacity.
 Author: Audacity Team
-Last-Update: 2010-02-21
+Last-Update: 2011-12-07
 
 --- a/include/pa_win_ds.h
 +++ b/include/pa_win_ds.h
-@@ -91,6 +91,21 @@
+@@ -89,6 +89,21 @@
  
  }PaWinDirectSoundStreamInfo;
  
@@ -28,7 +28,7 @@
  #ifdef __cplusplus
 --- a/include/portaudio.h
 +++ b/include/portaudio.h
-@@ -1121,6 +1121,15 @@
+@@ -1146,6 +1146,15 @@
  signed long Pa_GetStreamWriteAvailable( PaStream* stream );
  
  
@@ -153,7 +153,7 @@
 +#endif
 --- a/src/common/pa_front.c
 +++ b/src/common/pa_front.c
-@@ -1199,8 +1199,10 @@
+@@ -1216,8 +1216,10 @@
                                    hostApiInputParametersPtr, hostApiOutputParametersPtr,
                                    sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
  
@@ -165,7 +165,7 @@
  
  
      PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-@@ -1712,6 +1714,32 @@
+@@ -1729,6 +1731,32 @@
      return result;
  }
  
@@ -233,7 +233,7 @@
  #endif
 --- a/src/hostapi/alsa/pa_linux_alsa.c
 +++ b/src/hostapi/alsa/pa_linux_alsa.c
-@@ -607,6 +607,7 @@
+@@ -611,6 +611,7 @@
      StreamDirection streamDir;
  
      snd_pcm_channel_area_t *channelAreas;  /* Needed for channel adaption */
@@ -241,7 +241,7 @@
  } PaAlsaStreamComponent;
  
  /* Implementation specific stream structure */
-@@ -1802,6 +1803,7 @@
+@@ -1806,6 +1807,7 @@
  {
      PaError result = paNoError;
      PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
@@ -249,7 +249,7 @@
      assert( params->channelCount > 0 );
  
      /* Make sure things have an initial value */
-@@ -1822,6 +1824,9 @@
+@@ -1826,6 +1828,9 @@
      self->device = params->device;
  
      PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
@@ -259,7 +259,7 @@
      self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
  
      PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
-@@ -4515,9 +4520,7 @@
+@@ -4519,9 +4524,7 @@
      /* XXX: More descriptive error? */
      PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
  
@@ -270,7 +270,7 @@
  
  error:
      return result;
-@@ -4533,9 +4536,7 @@
+@@ -4537,9 +4540,7 @@
      /* XXX: More descriptive error? */
      PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
  
@@ -312,11 +312,11 @@
 +}
 --- a/configure.in
 +++ b/configure.in
-@@ -338,6 +338,7 @@
+@@ -365,6 +365,7 @@
                     DLL_LIBS="$DLL_LIBS -lossaudio"
                     LIBS="$LIBS -lossaudio"
             fi
 +           INCLUDES="$INCLUDES pa_unix_oss.h"
-            AC_DEFINE(PA_USE_OSS)
+            AC_DEFINE(PA_USE_OSS,1)
          fi