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

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 07e3704ad32d3da7fa7838363faf0a2a26865001
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Mon Nov 21 21:37:06 2016 +0100

    debian/patches/: patchset updated
    
    - 0008-fix_ppc64el_FTBFS.patch added
    
    Thanks: Sergey Sharybin for the patch.

diff --git a/debian/patches/0008-fix_ppc64el_FTBFS.patch b/debian/patches/0008-fix_ppc64el_FTBFS.patch
new file mode 100644
index 0000000..fb15d52
--- /dev/null
+++ b/debian/patches/0008-fix_ppc64el_FTBFS.patch
@@ -0,0 +1,58 @@
+From: Sergey Sharybin <sergey at blender.org>
+Date: Mon, 21 Nov 2016 21:34:50 +0100
+Subject: fix_ppc64el_FTBFS
+
+---
+ extern/clew/include/clew.h               | 2 +-
+ extern/glog/src/stacktrace_powerpc-inl.h | 2 +-
+ intern/cycles/device/device_opencl.cpp   | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
+index 1f79c12..08040af 100644
+--- a/extern/clew/include/clew.h
++++ b/extern/clew/include/clew.h
+@@ -369,7 +369,7 @@ typedef unsigned int cl_GLenum;
+ #endif
+ 
+ /* Define basic vector types */
+-#if defined( __VEC__ )
++#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+    typedef vector unsigned char     __cl_uchar16;
+    typedef vector signed char       __cl_char16;
+diff --git a/extern/glog/src/stacktrace_powerpc-inl.h b/extern/glog/src/stacktrace_powerpc-inl.h
+index 1090dde..03b9108 100644
+--- a/extern/glog/src/stacktrace_powerpc-inl.h
++++ b/extern/glog/src/stacktrace_powerpc-inl.h
+@@ -111,7 +111,7 @@ int GetStackTrace(void** result, int max_depth, int skip_count) {
+       result[n++] = *(sp+2);
+ #elif defined(_CALL_SYSV)
+       result[n++] = *(sp+1);
+-#elif defined(__APPLE__) || (defined(__linux) && defined(__PPC64__))
++#elif defined(__APPLE__) || ((defined(__linux) || defined(__linux__)) && defined(__PPC64__))
+       // This check is in case the compiler doesn't define _CALL_AIX/etc.
+       result[n++] = *(sp+2);
+ #elif defined(__linux)
+diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
+index dce1d37..42eabaf 100644
+--- a/intern/cycles/device/device_opencl.cpp
++++ b/intern/cycles/device/device_opencl.cpp
+@@ -20,8 +20,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "clew.h"
+-
+ #include "device.h"
+ #include "device_intern.h"
+ 
+@@ -37,6 +35,8 @@
+ #include "util_path.h"
+ #include "util_time.h"
+ 
++#include "clew.h"
++
+ CCL_NAMESPACE_BEGIN
+ 
+ #define CL_MEM_PTR(p) ((cl_mem)(uintptr_t)(p))
diff --git a/debian/patches/series b/debian/patches/series
index 0c67f45..1ee56cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-do_not_use_version_number_in_system_path.patch
 0006-look_for_dejavu_ttf_with_fontconfig.patch
 0007-fix_OpenJPEG2_build.patch
+0008-fix_ppc64el_FTBFS.patch

-- 
blender packaging