From 15fb3494ba7bcbb52380168c4d438bc7039c0b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 13 Aug 2018 19:34:11 +0200
Subject: [PATCH] blender: fix gcc-8.2.0 build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
---
 srcpkgs/blender/patches/tree_hpp.patch  | 11 +++++++++++
 srcpkgs/blender/patches/util_sseb.patch | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/blender/patches/tree_hpp.patch
 create mode 100644 srcpkgs/blender/patches/util_sseb.patch

diff --git a/srcpkgs/blender/patches/tree_hpp.patch b/srcpkgs/blender/patches/tree_hpp.patch
new file mode 100644
index 00000000000..7c9fbca1821
--- /dev/null
+++ b/srcpkgs/blender/patches/tree_hpp.patch
@@ -0,0 +1,11 @@
+--- a/intern/itasc/kdl/tree.hpp	2018-03-23 16:22:25.000000000 +0100
++++ b/intern/itasc/kdl/tree.hpp	2018-08-13 19:31:32.101185313 +0200
+@@ -34,7 +34,7 @@
+     //Forward declaration
+     class TreeElement;
+     // Eigen allocator is needed for alignment of Eigen data types
+-    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
++    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
+ 
+     class TreeElement
+     {
diff --git a/srcpkgs/blender/patches/util_sseb.patch b/srcpkgs/blender/patches/util_sseb.patch
new file mode 100644
index 00000000000..85396282d81
--- /dev/null
+++ b/srcpkgs/blender/patches/util_sseb.patch
@@ -0,0 +1,11 @@
+--- a/intern/cycles/util/util_sseb.h
++++ b/intern/cycles/util/util_sseb.h
+@@ -116,7 +116,7 @@ __forceinline const sseb unpacklo( const sseb& a, const sseb& b ) { return _mm_u
+ __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
+ 
+ template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
+-	return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
++	return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
+ }
+ 
+ template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {