[SCM] blender/master: debian/patches/: patchset updated

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cc7a96e257aa79e4d00ed145fc09054281198c83
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date:   Thu Dec 12 14:42:48 2013 +0100

    debian/patches/: patchset updated
    
    - 0011-fix_FTBFS_on_armel.patch added
    
    Closes: #730978
    Thanks: Sergey Sharybin (upstream devel) for the hint.

diff --git a/debian/patches/0011-fix_FTBFS_on_armel.patch b/debian/patches/0011-fix_FTBFS_on_armel.patch
new file mode 100644
index 0000000..43f2a0b
--- /dev/null
+++ b/debian/patches/0011-fix_FTBFS_on_armel.patch
@@ -0,0 +1,32 @@
+From: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Thu, 12 Dec 2013 14:41:06 +0100
+Subject: fix_ftbfs_on_armel
+
+---
+ intern/atomic/atomic_ops.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
+index 243e194..b5a73b1 100644
+--- a/intern/atomic/atomic_ops.h
++++ b/intern/atomic/atomic_ops.h
+@@ -35,10 +35,19 @@
+ #  include <libkern/OSAtomic.h>
+ #elif defined(_MSC_VER)
+ #  include <windows.h>
++#elif defined(__arm__)
++/* Attempt to fix compilation error on Debian armel kernel.
++ * arm7 architecture does have both 32 and 64bit atomics, however
++ * it's gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
++ */
++#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
++#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_4
+ #endif
+ 
+ /* needed for int types */
+ #include "../../source/blender/blenlib/BLI_sys_types.h"
++#include <stdlib.h>
++#include <stddef.h>
+ 
+ /* little macro so inline keyword works */
+ #if defined(_MSC_VER)
diff --git a/debian/patches/series b/debian/patches/series
index 033c9ab..3e0d677 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-look_for_droid_ttf_with_fontconfig.patch
 0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
 0010-fix_FTBFS_on_non-linux_architectures.patch
+0011-fix_FTBFS_on_armel.patch

-- 
blender packaging