[SCM] qtractor/master: Another attempt to fix FTBFS.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Wed Oct 9 15:31:07 UTC 2013
The following commit has been merged in the master branch:
commit 21ec2ca013bd08b8c6330ed4f97cb935f326101a
Author: Alessio Treglia <alessio at debian.org>
Date: Wed Oct 9 16:30:54 2013 +0100
Another attempt to fix FTBFS.
diff --git a/debian/patches/04-q_atomic_ftbfs.patch b/debian/patches/04-q_atomic_ftbfs.patch
index c85bb2a..0044bd3 100644
--- a/debian/patches/04-q_atomic_ftbfs.patch
+++ b/debian/patches/04-q_atomic_ftbfs.patch
@@ -3,23 +3,27 @@ Description: Definte generic atomic function to prevent FTBFS on most
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725611
Author: Alessio Treglia <alessio at debian.org>
---
- src/qtractorAtomic.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ src/qtractorAtomic.h | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
--- qtractor.orig/src/qtractorAtomic.h
+++ qtractor/src/qtractorAtomic.h
-@@ -79,7 +79,13 @@ static inline int ATOMIC_CAS1 (
+@@ -79,7 +79,17 @@ static inline int ATOMIC_CAS1 (
}
#else
-# error "qtractorAtomic.h: unsupported target compiler processor (GNUC)."
+
++#if QT_VERSION < 0x040400
++
+static inline int ATOMIC_CAS1 (
+ volatile int *pAddr, int iOldValue, int iNewValue )
+{
+ return q_atomic_test_and_set_int(pAddr, iOldValue, iNewValue);
+}
+
++#endif
++
#endif
#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32)
--
qtractor packaging
More information about the pkg-multimedia-commits
mailing list