[SCM] blender/master: debian/patches/: patchset updated against v2.78c

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f58d25c2dc7c90a96ef9df18711ab00a0f65e6eb
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Tue Jun 6 18:25:23 2017 +0200

    debian/patches/: patchset updated against v2.78c
    
    - 0008-fix_ppc64el_FTBFS.patch updated
    - 0010-fix_x32_FTBFS.patch dropped (applied upstream)
    - 0011-fix_AMD_UI_glitches.patch renamed to #0010
    
    Thanks: Sergey Sharybin (sergey) for #0008 refresh

diff --git a/debian/patches/0008-fix_ppc64el_FTBFS.patch b/debian/patches/0008-fix_ppc64el_FTBFS.patch
index f2aaa2a..e810e5c 100644
--- a/debian/patches/0008-fix_ppc64el_FTBFS.patch
+++ b/debian/patches/0008-fix_ppc64el_FTBFS.patch
@@ -1,15 +1,15 @@
+From f7a8afa878d163ae669b5dfc923e2c4d2993a49a Mon Sep 17 00:00:00 2001
 From: Sergey Sharybin <sergey at blender.org>
-Date: Mon, 21 Nov 2016 21:34:50 +0100
+Date: Tue, 06 Jun 2017 11:31:13 +0200
 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(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
-index 1f79c1248..08040af4b 100644
+index 1f79c12481b..08040af4bc1 100644
 --- a/extern/clew/include/clew.h
 +++ b/extern/clew/include/clew.h
 @@ -369,7 +369,7 @@ typedef unsigned int cl_GLenum;
@@ -22,7 +22,7 @@ index 1f79c1248..08040af4b 100644
     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 1090ddedb..03b91089a 100644
+index 1090ddedbc7..03b91089aad 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) {
@@ -34,25 +34,6 @@ index 1090ddedb..03b91089a 100644
        // 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 dce1d3753..42eabaf54 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))
+-- 
+2.11.0
+
diff --git a/debian/patches/0011-fix_AMD_UI_glitches.patch b/debian/patches/0010-fix_AMD_UI_glitches.patch
similarity index 100%
rename from debian/patches/0011-fix_AMD_UI_glitches.patch
rename to debian/patches/0010-fix_AMD_UI_glitches.patch
diff --git a/debian/patches/0010-fix_x32_FTBFS.patch b/debian/patches/0010-fix_x32_FTBFS.patch
deleted file mode 100644
index 490d03f..0000000
--- a/debian/patches/0010-fix_x32_FTBFS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 36da1550a..e6caa9154 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 936bfc6..a72261e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,4 @@
 0007-fix_OpenJPEG2_build.patch
 0008-fix_ppc64el_FTBFS.patch
 0009-fix_Hurd_FTBFS.patch
-0010-fix_x32_FTBFS.patch
-0011-fix_AMD_UI_glitches.patch
+0010-fix_AMD_UI_glitches.patch

-- 
blender packaging