← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to debian/patches/0011-fix_FTBFS_on_armel.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0011-fix_FTBFS_on_armel.patch
 
1
From: Sergey Sharybin <sergey.vfx@gmail.com>
 
2
Date: Thu, 12 Dec 2013 14:41:06 +0100
 
3
Subject: fix_ftbfs_on_armel
 
4
 
 
5
---
 
6
 intern/atomic/atomic_ops.h | 9 +++++++++
 
7
 1 file changed, 9 insertions(+)
 
8
 
 
9
diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
 
10
index 243e194..b5a73b1 100644
 
11
--- a/intern/atomic/atomic_ops.h
 
12
+++ b/intern/atomic/atomic_ops.h
 
13
@@ -35,10 +35,19 @@
 
14
 #  include <libkern/OSAtomic.h>
 
15
 #elif defined(_MSC_VER)
 
16
 #  include <windows.h>
 
17
+#elif defined(__arm__)
 
18
+/* Attempt to fix compilation error on Debian armel kernel.
 
19
+ * arm7 architecture does have both 32 and 64bit atomics, however
 
20
+ * it's gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
 
21
+ */
 
22
+#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
 
23
+#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_4
 
24
 #endif
 
25
 
 
26
 /* needed for int types */
 
27
 #include "../../source/blender/blenlib/BLI_sys_types.h"
 
28
+#include <stdlib.h>
 
29
+#include <stddef.h>
 
30
 
 
31
 /* little macro so inline keyword works */
 
32
 #if defined(_MSC_VER)