diff options
Diffstat (limited to 'graphics/Blender')
3 files changed, 54 insertions, 0 deletions
diff --git a/graphics/Blender/0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch b/graphics/Blender/0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch new file mode 100644 index 0000000000..b0e6f765d2 --- /dev/null +++ b/graphics/Blender/0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch @@ -0,0 +1,25 @@ +From ee30a4381f8989ed9f39b4baae9f74e45c9dcdc9 Mon Sep 17 00:00:00 2001 +From: Stefan Werner <stewreo@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 diff --git a/graphics/Blender/0001-Cycles-Fix-bad-register-cast-in-sseb.patch b/graphics/Blender/0001-Cycles-Fix-bad-register-cast-in-sseb.patch new file mode 100644 index 0000000000..a4abe36c49 --- /dev/null +++ b/graphics/Blender/0001-Cycles-Fix-bad-register-cast-in-sseb.patch @@ -0,0 +1,25 @@ +From be587d76efff6610f3b6d65cf42f1ee31ec3bdee Mon Sep 17 00:00:00 2001 +From: Sergey Sharybin <sergey.vfx@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 diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index 9e545177ad..d067b1a81a 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -75,6 +75,10 @@ find -L . \ patch -p0 < $CWD/buildinfo-$VERSION.diff patch -p1 < $CWD/use-libopenmj2-for-openjpeg.diff +# A couple of patches for the new compiler - thanks opensuse fellas! +patch -p1 < $CWD/0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch +patch -p1 < $CWD/0001-Cycles-Fix-bad-register-cast-in-sseb.patch + mkdir -p build cd build cmake ../ \ |