[SCM] bristol packaging branch, master, updated. debian/0.60.0-2-1-g7c976c4

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7c976c450e8d6d06f35ebccd5eb7eafa8d7dfca5
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu Apr 22 17:11:25 2010 +0200

    Attempt to fix FTBFS on hppa, sparc and s390 architectures.

diff --git a/debian/patches/04-fix_alsa_presence_check.patch b/debian/patches/04-fix_alsa_presence_check.patch
new file mode 100644
index 0000000..7fb3c06
--- /dev/null
+++ b/debian/patches/04-fix_alsa_presence_check.patch
@@ -0,0 +1,56 @@
+Description: Use IATOMIC_DEFINED to check whether ALSA support is available.
+Origin: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2989865&group_id=157415
+---
+ libbristolaudio/audioEngineJack.c |   21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+--- bristol.orig/libbristolaudio/audioEngineJack.c
++++ bristol/libbristolaudio/audioEngineJack.c
+@@ -36,9 +36,18 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <alsa/iatomic.h>
+ 
+ #ifdef _BRISTOL_JACK
++#if (BRISTOL_HAS_ALSA == 1)
++#include <alsa/iatomic.h>
++#endif
++
++#ifdef IATOMIC_DEFINED
++atomic_t closedown = ATOMIC_INIT(1);
++#else
++int closedown = 1;
++#endif
++
+ #include "bristol.h"
+ #include "bristoljack.h"
+ 
+@@ -302,12 +311,6 @@ audioShim(jack_nframes_t nframes, void *
+ 	return(0);
+ }
+ 
+-#ifdef __ALSA_IATOMIC_H
+-atomic_t closedown = ATOMIC_INIT(1);
+-#else
+-int closedown = 1;
+-#endif
+-
+ static void
+ bristolIntJackClose()
+ {
+@@ -346,7 +349,7 @@ bristolJackClose(jackDev *jackdev)
+ 	 * this bit of code is far from critical but collisions cause some gory
+ 	 * shutdown sequences.
+ 	 */
+-#ifdef __ALSA_IATOMIC_H
++#ifdef IATOMIC_DEFINED
+ 	if (atomic_dec_and_test(&closedown))
+ #else
+ 	if (--closedown == 0)
+@@ -866,3 +869,5 @@ bristolJackInterface(audioMain *audiomai
+ }
+ #endif /* _BRISTOL_JACK */
+ 
++
++
diff --git a/debian/patches/series b/debian/patches/series
index 66c01e7..8387f19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-spelling_errors.patch
 02-implicit_pointer_conversion.patch
 03-kfreebsd_ftbfs.patch
+04-fix_alsa_presence_check.patch

-- 
bristol packaging