community/blender: renode SSE2 patch, added to i486 blacklist

4 files changed, 18 insertions, 18 deletions

diff --git a/blacklist/i486/blender/blender b/blacklist/i486/blender/blender
new file mode 100644
index 00000000..d4e6d048
--- /dev/null
+++ b/blacklist/i486/blender/blender
@@ -0,0 +1 @@
+too many things fail to build currently
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index 3dfd39ca..61e6abfb 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -11,13 +11,13 @@ eval "$(
     /^\s*cmake / s/;$/ -DWITH_CYCLES_CUDA_BINARIES=OFF -DWITH_CYCLES_DEVICE_CUDA=OFF -DWITH_RAYOPTIMIZATION=OFF;/
   '
 )"
-source_i686+=('arm-no-sse2.patch')
-sha512sums_i686+=('13890f9cd11ca20bcb6f12206c990e25c0d08699feab0fca37607d847d2aebd2d2f423023986e120eaaeb0beca9a440a4d42007dcac2054fe6cdaf745de43402')
+source_i686+=('no-sse2.patch')
+sha512sums_i686+=('fce9d99e71900a6953287ba9e29ca56b54015e02bdd273da4fd86fd2556499c18b54cb0d835db47ee96f6fdd578a9cd6286b1b82b92c9db5582ce57c277590ab')
 if [ "${CARCH}" = 'i686' ]; then
   eval "$(
     declare -f prepare \
     | sed '
-      $ i patch -Np1 -i "$srcdir"/arm-no-sse2.patch
+      $ i patch -Np1 -i "$srcdir"/no-sse2.patch
     '
   )"
 fi
diff --git a/community/blender/arm-no-sse2.patch b/community/blender/arm-no-sse2.patch
deleted file mode 100644
index 722c70e9..00000000
--- a/community/blender/arm-no-sse2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
-index d12a0c1..1df2de3 100644
---- a/intern/cycles/bvh/bvh_embree.cpp
-+++ b/intern/cycles/bvh/bvh_embree.cpp
-@@ -299,8 +299,10 @@ BVHEmbree::BVHEmbree(const BVHParams &params_,
-       use_ribbons(params.curve_flags & CURVE_KN_RIBBONS),
-       dynamic_scene(true)
- {
-+#if defined(__x86_64__) || defined(_M_X64)
-   _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
-   _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
-+#endif
-   thread_scoped_lock lock(rtc_shared_mutex);
-   if (rtc_shared_users == 0) {
-     rtc_shared_device = rtcNewDevice("verbose=0");
diff --git a/community/blender/no-sse2.patch b/community/blender/no-sse2.patch
new file mode 100644
index 00000000..082a566c
--- /dev/null
+++ b/community/blender/no-sse2.patch
@@ -0,0 +1,14 @@
+diff -rauN blender-vanilla/intern/cycles/bvh/bvh_embree.cpp blender-no-sse2-patch/intern/cycles/bvh/bvh_embree.cpp
+--- blender-vanilla/intern/cycles/bvh/bvh_embree.cpp	2021-04-30 11:51:03.234550251 +0200
++++ blender-no-sse2-patch/intern/cycles/bvh/bvh_embree.cpp	2021-04-30 11:52:15.691582206 +0200
+@@ -306,8 +306,10 @@
+       rtc_device(NULL),
+       build_quality(RTC_BUILD_QUALITY_REFIT)
+ {
++#if defined(__x86_64__) || defined(_M_X64)
+   _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
+   _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
++#endif
+ }
+ 
+ BVHEmbree::~BVHEmbree()