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

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Tue Aug 5 08:57:02 UTC 2014


The following commit has been merged in the master branch:
commit 1db5844e17128c01d80faeff6aec854517a7dfd8
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date:   Tue Aug 5 08:31:16 2014 +0200

    debian/patches/: patchset updated
    
    - 0009-fix_includes_on_different_endian_systems.patch added
    
    Thanks: Campbell Burton (upstream devel) for the patch.

diff --git a/debian/patches/0009-fix_includes_on_different_endian_systems.patch b/debian/patches/0009-fix_includes_on_different_endian_systems.patch
new file mode 100644
index 0000000..acade47
--- /dev/null
+++ b/debian/patches/0009-fix_includes_on_different_endian_systems.patch
@@ -0,0 +1,40 @@
+From: Campbell Barton <ideasman42 at gmail.com>
+Date: Sat, 26 Jul 2014 18:39:27 +1000
+Subject: fix_includes_on_different_endian_systems
+
+---
+ source/blender/modifiers/intern/MOD_meshcache_mdd.c | 4 +++-
+ source/blender/modifiers/intern/MOD_meshcache_pc2.c | 3 +++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c
+index 0cbf07c..90fc750 100644
+--- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c
++++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c
+@@ -30,9 +30,11 @@
+ 
+ #include "BLI_sys_types.h"
+ #include "BLI_utildefines.h"
+-#include "BLI_endian_switch.h"
+ #include "BLI_fileops.h"
+ #include "BLI_math.h"
++#ifdef __LITTLE_ENDIAN__
++#  include "BLI_endian_switch.h"
++#endif
+ 
+ #include "MOD_meshcache_util.h"  /* own include */
+ 
+diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
+index ac0363f..3ef0ee5 100644
+--- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c
++++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
+@@ -32,6 +32,9 @@
+ #include "BLI_utildefines.h"
+ #include "BLI_fileops.h"
+ #include "BLI_math.h"
++#ifdef __BIG_ENDIAN__
++#  include "BLI_endian_switch.h"
++#endif
+ 
+ #include "MOD_meshcache_util.h"  /* own include */
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d19ccb6..cc46502 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-do_not_use_version_number_in_system_path.patch
 0007-look_for_droid_ttf_with_fontconfig.patch
 0008-fix_FTBFS_on_unofficial_64bit_archs.patch
+0009-fix_includes_on_different_endian_systems.patch

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list