Hello community,
here is the log from the commit of package blender for openSUSE:Factory checked
in at 2018-06-25 11:40:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blender (Old)
and /work/SRC/openSUSE:Factory/.blender.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender"
Mon Jun 25 11:40:32 2018 rev:106 rq:618510 version:2.79b
Changes:
--------
--- /work/SRC/openSUSE:Factory/blender/blender.changes 2018-06-05
12:53:35.668137272 +0200
+++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2018-06-25
11:40:50.808922232 +0200
@@ -1,0 +2,7 @@
+Fri Jun 22 08:14:13 UTC 2018 - wba...@tmo.at
+
+- Add upstream patches to fix build with gcc8:
+ * 0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch
+ * 0001-Cycles-Fix-bad-register-cast-in-sseb.patch
+
+-------------------------------------------------------------------
New:
----
0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch
0001-Cycles-Fix-bad-register-cast-in-sseb.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.eOBcng/_old 2018-06-25 11:40:53.160835415 +0200
+++ /var/tmp/diff_new_pack.eOBcng/_new 2018-06-25 11:40:53.164835268 +0200
@@ -46,6 +46,10 @@
Source6: blender.xpm
Source7: x-blend.desktop
Source8: blender.appdata.xml
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Cycles-Fix-bad-register-cast-in-sseb.patch
# The openvdb package is WIP
#Patch2 blender-2.78c-openvdb3-abi.patch
Patch3: blender-2.78-C++11-build-fix.patch
@@ -186,6 +190,8 @@
popd
%endif
%setup -q
+%patch0 -p1
+%patch1 -p1
#%%patch2 -p1
%patch3
++++++ 0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch ++++++
>From ee30a4381f8989ed9f39b4baae9f74e45c9dcdc9 Mon Sep 17 00:00:00 2001
From: Stefan Werner <stew...@gmail.com>
Date: Wed, 20 Sep 2017 21:47:37 +0200
Subject: [PATCH] Added extra "const" to satisfy the strict clang version in
Xcode 9
---
intern/itasc/kdl/tree.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/intern/itasc/kdl/tree.hpp b/intern/itasc/kdl/tree.hpp
index c8a253fc901..bd35f82d185 100644
--- a/intern/itasc/kdl/tree.hpp
+++ b/intern/itasc/kdl/tree.hpp
@@ -34,7 +34,7 @@ namespace KDL
//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
{
--
2.13.7
++++++ 0001-Cycles-Fix-bad-register-cast-in-sseb.patch ++++++
>From be587d76efff6610f3b6d65cf42f1ee31ec3bdee Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey....@gmail.com>
Date: Wed, 28 Mar 2018 10:34:31 +0200
Subject: [PATCH] Cycles: Fix bad register cast in sseb
This is currently unused code, but causes gcc-8 to fail.
---
intern/cycles/util/util_sseb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h
index 93c22aafdcd..977976c3fc0 100644
--- a/intern/cycles/util/util_sseb.h
+++ b/intern/cycles/util/util_sseb.h
@@ -119,7 +119,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 ) {
--
2.13.7
