[SCM] xbmc-pvr-addons/master: Fix build on MIPS by using generic atomics
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Sun Feb 22 19:41:51 UTC 2015
The following commit has been merged in the master branch:
commit 9816e97e6caac9cc3d8b39863605eed353757244
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Sun Feb 22 19:26:42 2015 +0100
Fix build on MIPS by using generic atomics
Closes: #778830
diff --git a/debian/patches/04_mips-atomic.patch b/debian/patches/04_mips-atomic.patch
new file mode 100644
index 0000000..c1f4fb5
--- /dev/null
+++ b/debian/patches/04_mips-atomic.patch
@@ -0,0 +1,33 @@
+Index: xbmc-pvr-addons-13.0+git20140512+g91cc731+dfsg1/lib/cmyth/include/refmem/atomic.h
+===================================================================
+--- xbmc-pvr-addons-13.0+git20140512+g91cc731+dfsg1.orig/lib/cmyth/include/refmem/atomic.h
++++ xbmc-pvr-addons-13.0+git20140512+g91cc731+dfsg1/lib/cmyth/include/refmem/atomic.h
+@@ -29,10 +29,6 @@
+ #define inline __inline
+ #endif
+
+-#if defined __mips__
+-#include <atomic.h>
+-#endif
+-
+ #if defined(__APPLE__)
+ #include <libkern/OSAtomic.h>
+
+@@ -96,8 +92,6 @@ __mvp_atomic_increment(mvp_atomic_t *val
+ : "=&r"(tmp1), "=&r"(__val), "=&r"(tmp2)
+ : "r" (valp), "r"(inc)
+ : "cc", "memory");
+-#elif defined __mips__
+- __val = atomic_increment_val(valp);
+ #elif defined __GNUC__
+ /*
+ * Don't know how to atomic increment for a generic architecture
+@@ -162,8 +156,6 @@ __mvp_atomic_decrement(mvp_atomic_t *val
+ : "=&r"(tmp1), "=&r"(__val), "=&r"(tmp2)
+ : "r" (valp), "r"(inc)
+ : "cc", "memory");
+-#elif defined __mips__
+- __val = atomic_decrement_val(valp);
+ #elif defined __sparcv9__
+ mvp_atomic_t __newval, __oldval = (*valp);
+ do
diff --git a/debian/patches/series b/debian/patches/series
index c208947..acc04d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Fix-unsafe-usage-of-snprintf.patch
01_use-system-libs.patch
+04_mips-atomic.patch
--
xbmc-pvr-addons packaging
More information about the pkg-multimedia-commits
mailing list