[SCM] blender/master: debian/patches/: patchset re-worked

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b2d3b726712fc0cef4a3cbac9e4e01168ec0d8e2
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date:   Mon Feb 17 12:25:33 2014 +0100

    debian/patches/: patchset re-worked
    
    - 0011-fix_FTBFS_on_armel.patch refreshed
    - 0012-fix_FTBFS_on_unofficial_64bit_archs.patch added
    
    Closes: #739118
    Thanks: Aurelien Jarno (aurel32) for the hint.

diff --git a/debian/patches/0011-fix_FTBFS_on_armel.patch b/debian/patches/0011-fix_FTBFS_on_armel.patch
index 43f2a0b..5be19c2 100644
--- a/debian/patches/0011-fix_FTBFS_on_armel.patch
+++ b/debian/patches/0011-fix_FTBFS_on_armel.patch
@@ -1,6 +1,6 @@
 From: Sergey Sharybin <sergey.vfx at gmail.com>
 Date: Thu, 12 Dec 2013 14:41:06 +0100
-Subject: fix_ftbfs_on_armel
+Subject: fix_FTBFS_on_armel
 
 ---
  intern/atomic/atomic_ops.h | 9 +++++++++
diff --git a/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch b/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch
new file mode 100644
index 0000000..2e69b34
--- /dev/null
+++ b/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch
@@ -0,0 +1,21 @@
+From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
+Date: Mon, 17 Feb 2014 12:20:54 +0100
+Subject: fix_FTBFS_on_unofficial_64bit_archs
+
+---
+ intern/atomic/atomic_ops.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
+index b5a73b1..9f506a6 100644
+--- a/intern/atomic/atomic_ops.h
++++ b/intern/atomic/atomic_ops.h
+@@ -61,7 +61,7 @@
+ #  endif
+ #endif
+ 
+-#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
++#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__))
+ #  define LG_SIZEOF_PTR 3
+ #  define LG_SIZEOF_INT 2
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index 3e0d677..b65a3bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
 0010-fix_FTBFS_on_non-linux_architectures.patch
 0011-fix_FTBFS_on_armel.patch
+0012-fix_FTBFS_on_unofficial_64bit_archs.patch

-- 
blender packaging