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

mfv at users.alioth.debian.org mfv at users.alioth.debian.org
Sat Oct 17 11:38:20 UTC 2015


The following commit has been merged in the master.experimental branch:
commit ed1de3523f90efe68ae055ef4abf0f15d4ff2811
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Thu Oct 15 21:40:56 2015 +0200

    debian/patches/: patchset updated
    
    - 0008-fix_FTBFS_on_non-x86_platforms.patch added

diff --git a/debian/patches/0008-fix_FTBFS_on_non-x86_platforms.patch b/debian/patches/0008-fix_FTBFS_on_non-x86_platforms.patch
new file mode 100644
index 0000000..b3b0385
--- /dev/null
+++ b/debian/patches/0008-fix_FTBFS_on_non-x86_platforms.patch
@@ -0,0 +1,22 @@
+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 6cc6086..ea2fbab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-do_not_use_version_number_in_system_path.patch
 0006-blender_desktop.patch
 0007-look_for_droid_ttf_with_fontconfig.patch
+0008-fix_FTBFS_on_non-x86_platforms.patch

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list