diff options
| author | Leo Famulari <[email protected]> | 2022-01-09 16:34:12 -0500 |
|---|---|---|
| committer | Leo Famulari <[email protected]> | 2022-01-09 16:35:20 -0500 |
| commit | 1684ed6537fbd91ae5c14fb0314564e71799d390 (patch) | |
| tree | 083fc4af3ff417b1a00222ee0b5156a66d3f8152 /gnu/packages/patches/blender-2.79-gcc8.patch | |
| parent | 23da063ea3bb6a579f0fb87d2e5e00fed9962775 (diff) | |
gnu: Remove leftover patches for Blender 2.79.
This is a followup to commit 23da063ea3bb6a579f0fb87d2e5e00fed9962775.
* gnu/packages/patches/blender-2.79-gcc8.patch,
gnu/packages/patches/blender-2.79-gcc9.patch,
gnu/packages/patches/blender-2.79-newer-ffmpeg.patch,
gnu/packages/patches/blender-2.79-oiio2.patch,
gnu/packages/patches/blender-2.79-python-3.7-fix.patch,
gnu/packages/patches/blender-2.79-python-3.8-fix.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/blender-2.79-gcc8.patch')
| -rw-r--r-- | gnu/packages/patches/blender-2.79-gcc8.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/blender-2.79-gcc8.patch b/gnu/packages/patches/blender-2.79-gcc8.patch deleted file mode 100644 index 6a9186323b..0000000000 --- a/gnu/packages/patches/blender-2.79-gcc8.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - { -diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h -index 6e669701f3b..977976c3fc0 100644 ---- a/intern/cycles/util/util_sseb.h -+++ b/intern/cycles/util/util_sseb.h -@@ -22,6 +22,9 @@ CCL_NAMESPACE_BEGIN - - #ifdef __KERNEL_SSE2__ - -+struct ssei; -+struct ssef; -+ - /*! 4-wide SSE bool type. */ - struct sseb - { -@@ -116,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 ) { |