[SCM] blender/master: debian/patches/: patchset updated against v2.76b

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit acf4c69fafe694d0ddc190a8d256a88241f24d4c
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Fri Nov 13 21:24:59 2015 +0100

    debian/patches/: patchset updated against v2.76b
    
    - 0007-fix_FTBFS_on_non-x86_platforms.patch dropped
      (applied upstream)

diff --git a/debian/patches/0007-fix_FTBFS_on_non-x86_platforms.patch b/debian/patches/0007-fix_FTBFS_on_non-x86_platforms.patch
deleted file mode 100644
index b3b0385..0000000
--- a/debian/patches/0007-fix_FTBFS_on_non-x86_platforms.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: "Matteo F. Vescovi" <mfv at debian.org>
-Date: Thu, 15 Oct 2015 21:38:18 +0200
-Subject: fix_FTBFS_on_non-x86_platforms
-
-Cherry-pick upstream git commit rBea7ce fixing T46447.
----
- intern/cycles/util/util_optimization.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h
-index c951c35..42d3ca6 100644
---- a/intern/cycles/util/util_optimization.h
-+++ b/intern/cycles/util/util_optimization.h
-@@ -101,7 +101,7 @@
- 
- #ifdef _MSC_VER
- #include <intrin.h>
--#else
-+#elif (defined(__x86_64__) || defined(__i386__))
- #include <x86intrin.h>
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index 0ecce03..dc6bfbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 0004-update_manpages.patch
 0005-do_not_use_version_number_in_system_path.patch
 0006-look_for_droid_ttf_with_fontconfig.patch
-0007-fix_FTBFS_on_non-x86_platforms.patch

-- 
blender packaging