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

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 821776220ce2050c78eea96ae12a1de25f417aaa
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Fri Apr 29 21:27:07 2016 +0200

    debian/patches/: patchset updated
    
    - 0007-fix_FTBFS_on_armel.patch added
    
    Thanks: Sergey Sharybin for the patch.

diff --git a/debian/patches/0007-fix_FTBFS_on_armel.patch b/debian/patches/0007-fix_FTBFS_on_armel.patch
new file mode 100644
index 0000000..f87b2f6
--- /dev/null
+++ b/debian/patches/0007-fix_FTBFS_on_armel.patch
@@ -0,0 +1,33 @@
+From: Sergey Sharybin <sergey at blender.org>
+Date: Fri, 29 Apr 2016 09:43:58 +0200
+Subject: fix_FTBFS_on_armel
+
+---
+ intern/atomic/atomic_ops.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
+index dc06a51..06eb8f2 100644
+--- a/intern/atomic/atomic_ops.h
++++ b/intern/atomic/atomic_ops.h
+@@ -45,6 +45,7 @@
+  * 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_1
+ #  define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
+ #  define JE_FORCE_SYNC_COMPARE_AND_SWAP_4
+ #endif
+@@ -399,6 +400,12 @@ atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
+ 	return _InterlockedAnd8((char *)p, (char)b);
+ #endif
+ }
++#elif defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_1)
++ATOMIC_INLINE uint8_t
++atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
++{
++	return __sync_fetch_and_and(p, b);
++}
+ #else
+ #  error "Missing implementation for 8-bit atomic operations"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 8d30bbd..5da87c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-update_manpages.patch
 0005-do_not_use_version_number_in_system_path.patch
 0006-look_for_dejavu_ttf_with_fontconfig.patch
+0007-fix_FTBFS_on_armel.patch

-- 
blender packaging