[SCM] bristol/master: Patch to fix alsa/iatomic.h

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b7dc05ca6a04f29113e30e203db8eb99e91d444e
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Sep 9 22:05:19 2016 +0200

    Patch to fix alsa/iatomic.h
    
    Gbp-Dch: ignore

diff --git a/debian/patches/03-rm_alsa-iatomic.h.patch b/debian/patches/03-rm_alsa-iatomic.h.patch
new file mode 100644
index 0000000..a735764
--- /dev/null
+++ b/debian/patches/03-rm_alsa-iatomic.h.patch
@@ -0,0 +1,26 @@
+Description: Stop using alsa/iatomic.h
+             Technically this is an API breakage in libasound 1.1.2,
+             but it makes sense to me that this header was removed
+             by ALSA upstream.
+             .
+             bristol was the only user in Debian, and even here the
+             code that once used it was already commented out.
+Author: Adrian Bunk <bunk at stusta.de>
+Reviewed-by: James Cowgill <jcowgill at debian.org>
+	     Herbert Parentes Fortes Neto <hpfn at debian.org>
+Bug-Debian: https://bugs.debian.org/834180
+Forwarded: no
+Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c
+===================================================================
+--- bristol-0.60.11.orig/libbristolaudio/audioEngineJack.c
++++ bristol-0.60.11/libbristolaudio/audioEngineJack.c
+@@ -38,9 +38,6 @@
+ #include <string.h>
+ 
+ #ifdef _BRISTOL_JACK
+-#if (BRISTOL_HAS_ALSA == 1)
+-#include <alsa/iatomic.h>
+-#endif
+ 
+ /*
+  * Drop this atomic stuff, it comes from the ALSA library and it not present on
diff --git a/debian/patches/series b/debian/patches/series
index 984256e..701a3f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+03-rm_alsa-iatomic.h.patch
 01-export_statements.patch
 02-disable_sse.patch

-- 
bristol packaging