Bug#433381: portaudio: diff for NMU version 18.1-7.1

[Thomas Viehmann]

tags 433381 + patch pending
thanks

Here is the NMU for portaudio (versioned as 18.1-7.1) as uploaded.
Aehem for proper bug handling.

Kind regards

T.

diff -u portaudio-18.1/debian/changelog portaudio-18.1/debian/changelog
--- portaudio-18.1/debian/changelog
+++ portaudio-18.1/debian/changelog
@@ -1,3 +1,14 @@
+portaudio (18.1-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload after this has been open for 15 months
+    while people have been busy changing the standards version.
+  * Finally fix the type definitions for non-i386 such that audio
+    is working on e.g. amd64. Thanks to Sean Finney and
+    Peter De Wachter for sending patches.
+    Closes: #433381
+
+ -- Thomas Viehmann <tv at beamnet.de>  Tue, 14 Oct 2008 23:03:19 +0200
+
 portaudio (18.1-7) unstable; urgency=low
 
   [ Kilian Krause ]
diff -u portaudio-18.1/debian/patches/00list portaudio-18.1/debian/patches/00list
--- portaudio-18.1/debian/patches/00list
+++ portaudio-18.1/debian/patches/00list
@@ -5,2 +5,3 @@
 30_oss_in_only
+40_wordsize
 dbug336890-kFreeBSD.dpatch
only in patch2:
unchanged:
--- portaudio-18.1.orig/debian/patches/40_wordsize.dpatch
+++ portaudio-18.1/debian/patches/40_wordsize.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_wordsize.dpatch by Peter De Wachter <pdewacht at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix portaudio for 64 bit platforms
+
+ at DPATCH@
+
+diff --git a/pa_common/pa_host.h b/pa_common/pa_host.h
+index db898fe..db12e51 100644
+--- a/pa_common/pa_host.h
++++ b/pa_common/pa_host.h
+@@ -48,17 +48,19 @@ extern "C"
+ #define SUPPORT_AUDIO_CAPTURE  (1)
+ #endif
+ 
++#include <inttypes.h>
++
+ #ifndef int32
+-    typedef long int32;
++    typedef int32_t int32;
+ #endif
+ #ifndef uint32
+-    typedef unsigned long uint32;
++    typedef uint32_t uint32;
+ #endif
+ #ifndef int16
+-    typedef short int16;
++    typedef int16_t int16;
+ #endif
+ #ifndef uint16
+-    typedef unsigned short uint16;
++    typedef uint16_t uint16;
+ #endif
+ 
+ /* Used to convert between various sample formats. */
+diff --git a/pa_common/pa_lib.c b/pa_common/pa_lib.c
+index bf97de2..b48d105 100644
+--- a/pa_common/pa_lib.c
++++ b/pa_common/pa_lib.c
+@@ -498,10 +498,10 @@ internalPortAudioStream* PaHost_GetStreamRepresentation( PortAudioStream *stream
+ #define PA_DITHER_SCALE  (1.0f / ((1<<PA_DITHER_BITS)-1))
+ long PaConvert_TriangularDither( void )
+ {
+-    static unsigned long previous = 0;
+-    static unsigned long randSeed1 = 22222;
+-    static unsigned long randSeed2 = 5555555;
+-    long current, highPass;
++    static uint32 previous = 0;
++    static uint32 randSeed1 = 22222;
++    static uint32 randSeed2 = 5555555;
++    int32 current, highPass;
+     /* Generate two random numbers. */
+     randSeed1 = (randSeed1 * 196314165) + 907633515;
+     randSeed2 = (randSeed2 * 196314165) + 907633515;
+@@ -510,7 +510,7 @@ long PaConvert_TriangularDither( void )
+      * Also shift an extra bit for the high pass filter. 
+      */
+ #define DITHER_SHIFT  ((32 - PA_DITHER_BITS) + 1)
+-    current = (((long)randSeed1)>>DITHER_SHIFT) + (((long)randSeed2)>>DITHER_SHIFT);
++    current = (((int32)randSeed1)>>DITHER_SHIFT) + (((int32)randSeed2)>>DITHER_SHIFT);
+     /* High pass filter to reduce audibility. */
+     highPass = current - previous;
+     previous = current;