[SCM] bristol packaging branch, master, updated. debian/0.60.0-3-4-g1a262c9
quadrispro-guest at users.alioth.debian.org
quadrispro-guest at users.alioth.debian.org
Fri Apr 23 07:50:00 UTC 2010
The following commit has been merged in the master branch:
commit b2a1343ab4b5ecfdb6d34fbb7c2795a31841d4bb
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date: Fri Apr 23 09:48:53 2010 +0200
Refresh and improvements, another attempt to fix FTBFS on hppa,sparc,s390.
diff --git a/debian/patches/04-fix_alsa_presence_check.patch b/debian/patches/04-fix_alsa_presence_check.patch
index 7fb3c06..b185a07 100644
--- a/debian/patches/04-fix_alsa_presence_check.patch
+++ b/debian/patches/04-fix_alsa_presence_check.patch
@@ -1,12 +1,13 @@
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
+Last-Update: 2010-04-23
---
- libbristolaudio/audioEngineJack.c | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
+ libbristolaudio/audioEngineJack.c | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
--- bristol.orig/libbristolaudio/audioEngineJack.c
+++ bristol/libbristolaudio/audioEngineJack.c
-@@ -36,9 +36,18 @@
+@@ -36,9 +36,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -17,38 +18,34 @@ Origin: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2989865&gro
+#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 *
+@@ -302,11 +305,7 @@ audioShim(jack_nframes_t nframes, void *
return(0);
}
-#ifdef __ALSA_IATOMIC_H
-atomic_t closedown = ATOMIC_INIT(1);
-#else
--int closedown = 1;
+ int closedown = 1;
-#endif
--
+
static void
bristolIntJackClose()
- {
-@@ -346,7 +349,7 @@ bristolJackClose(jackDev *jackdev)
+@@ -346,11 +345,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 (atomic_dec_and_test(&closedown))
+-#else
if (--closedown == 0)
-@@ -866,3 +869,5 @@ bristolJackInterface(audioMain *audiomai
+-#endif
+ printf("unregistering jack interface: %x->%x\n",
+ (size_t) jackdev, (size_t) jackdev->handle);
+ else {
+@@ -866,3 +861,5 @@ bristolJackInterface(audioMain *audiomai
}
#endif /* _BRISTOL_JACK */
--
bristol packaging
More information about the pkg-multimedia-commits
mailing list