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

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 91920055d4774a86bf048ba03de3556b4d826f38
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Wed Nov 23 14:53:33 2016 +0100

    debian/patches/: patchset updated
    
    - 0009-fix_Hurd_FTBFS.patch added
    - 0010-fix_x32_FTBFS.patch added
    
    Thanks: Sergey Sharybin for both patches.

diff --git a/debian/patches/0009-fix_Hurd_FTBFS.patch b/debian/patches/0009-fix_Hurd_FTBFS.patch
new file mode 100644
index 0000000..43b204c
--- /dev/null
+++ b/debian/patches/0009-fix_Hurd_FTBFS.patch
@@ -0,0 +1,22 @@
+From: Sergey Sharybin <sergey at blender.org>
+Date: Wed, 23 Nov 2016 14:44:29 +0100
+Subject: fix_Hurd_FTBFS
+
+---
+ extern/glog/src/raw_logging.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/extern/glog/src/raw_logging.cc b/extern/glog/src/raw_logging.cc
+index 7a7409b..8517129 100644
+--- a/extern/glog/src/raw_logging.cc
++++ b/extern/glog/src/raw_logging.cc
+@@ -59,7 +59,8 @@
+ # include <unistd.h>
+ #endif
+ 
+-#if defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)
++// Hurd does not have SYS_write.
++#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && !defined(__GNU__)
+ # define safe_write(fd, s, len)  syscall(SYS_write, fd, s, len)
+ #else
+   // Not so safe, but what can you do?
diff --git a/debian/patches/0010-fix_x32_FTBFS.patch b/debian/patches/0010-fix_x32_FTBFS.patch
new file mode 100644
index 0000000..a4a476f
--- /dev/null
+++ b/debian/patches/0010-fix_x32_FTBFS.patch
@@ -0,0 +1,39 @@
+From: Sergey Sharybin <sergey at blender.org>
+Date: Wed, 23 Nov 2016 14:52:35 +0100
+Subject: fix_x32_FTBFS
+
+---
+ intern/cycles/util/util_simd.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
+index 36da155..e6caa91 100644
+--- a/intern/cycles/util/util_simd.h
++++ b/intern/cycles/util/util_simd.h
+@@ -229,7 +229,7 @@ __forceinline int __btr(int v, int i) {
+   int r = 0; asm ("btr %1,%0" : "=r"(r) : "r"(i), "0"(v) : "flags"); return r;
+ }
+ 
+-#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
++#if (defined(__KERNEL_64_BIT__) || defined(__APPLE__)) && !(defined(__ILP32__) && defined(__x86_64__))
+ __forceinline size_t __bsf(size_t v) {
+   size_t r = 0; asm ("bsf %1,%0" : "=r"(r) : "r"(v)); return r;
+ }
+@@ -271,7 +271,7 @@ __forceinline unsigned int bitscan(unsigned int v) {
+ #endif
+ }
+ 
+-#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
++#if (defined(__KERNEL_64_BIT__) || defined(__APPLE__)) && !(defined(__ILP32__) && defined(__x86_64__))
+ __forceinline size_t bitscan(size_t v) {
+ #if defined(__KERNEL_AVX2__)
+ #if defined(__KERNEL_64_BIT__)
+@@ -313,7 +313,7 @@ __forceinline unsigned int __bscf(unsigned int& v)
+   return i;
+ }
+ 
+-#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
++#if (defined(__KERNEL_64_BIT__) || defined(__APPLE__)) && !(defined(__ILP32__) && defined(__x86_64__))
+ __forceinline size_t __bscf(size_t& v) 
+ {
+   size_t i = bitscan(v);
diff --git a/debian/patches/series b/debian/patches/series
index 1ee56cc..c92231d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@
 0006-look_for_dejavu_ttf_with_fontconfig.patch
 0007-fix_OpenJPEG2_build.patch
 0008-fix_ppc64el_FTBFS.patch
+0009-fix_Hurd_FTBFS.patch
+0010-fix_x32_FTBFS.patch

-- 
blender packaging