From ca8180a46219f57ff52894c4d8473f394237c6c8 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 7 Apr 2022 17:55:10 +0200
Subject: community/blender: redone SSE2 patch, vairopus fixes and rebuild

---
 community/blender/PKGBUILD      | 20 +++++++++-----------
 community/blender/no-sse2.patch | 23 +++++++++++------------
 2 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'community')

diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index dad59e6e..03a1eeb7 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -12,7 +12,7 @@ eval "$(
   '
 )"
 source_i686+=('no-sse2.patch')
-sha512sums_i686+=('c811828bf178a69315498f1f7a04da26c7be11c05b2f8b505148aac4ee2bb4f29b683144cf6b99fab140ef3bdb6687350396cdea08de7fc5e61a22222e9be6e9')
+sha512sums_i686+=('87da2bedb90af6dee559ef9d1eb83262ba75fb412aba83dcb2b88fe9c0740ff75ad336331033fec7a14ad6ecc3dd70f8f4742f147594e8dc530197dd51922c01')
 if [ "${CARCH}" = 'i686' ]; then
   eval "$(
     declare -f prepare \
@@ -44,13 +44,11 @@ depends=(
 
 # float_t is a long double on 32-bit, but it's a primitive in all cases anyway
 # (seems to be in a part of the blendkernel on i686 only..)
-source_pentium4+=('blender-idprop_create-static-assert-float.patch')
-sha512sums_pentium4+=('36b98ec7e53402909a9e531c30b444b1afc22cc597c5bb3393c73862929dcc6275b00a53de6171a81af3c8804d233359d2e797886d0b776e7a9b29b23ce24e3b')
-if [ "${CARCH}" = 'pentium4' ]; then
-  eval "$(
-    declare -f prepare \
-    | sed '
-      $ i patch -Np1 -i "$srcdir"/blender-idprop_create-static-assert-float.patch
-    '
-  )"
-fi
+source+=('blender-idprop_create-static-assert-float.patch')
+sha512sums+=('36b98ec7e53402909a9e531c30b444b1afc22cc597c5bb3393c73862929dcc6275b00a53de6171a81af3c8804d233359d2e797886d0b776e7a9b29b23ce24e3b')
+eval "$(
+  declare -f prepare \
+  | sed '
+    $ i patch -Np1 -i "$srcdir"/blender-idprop_create-static-assert-float.patch
+  '
+)"
diff --git a/community/blender/no-sse2.patch b/community/blender/no-sse2.patch
index 88620e02..a32f7c64 100644
--- a/community/blender/no-sse2.patch
+++ b/community/blender/no-sse2.patch
@@ -1,13 +1,12 @@
-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-07-05 17:31:59.689914965 +0200
-+++ blender-no-sse2-patch/intern/cycles/bvh/bvh_embree.cpp	2021-07-05 17:33:10.596795518 +0200
-@@ -304,7 +304,9 @@
-       rtc_device(NULL),
-       build_quality(RTC_BUILD_QUALITY_REFIT)
- {
-+#if defined(__x86_64__) || defined(_M_X64)
-   SIMD_SET_FLUSH_TO_ZERO;
-+#endif
- }
+diff -rauN blender-vanilla/CMakeLists.txt blender-no-sse2-patch/CMakeLists.txt
+--- blender-vanilla/CMakeLists.txt	2022-04-07 16:36:48.842414275 +0200
++++ blender-no-sse2-patch/CMakeLists.txt	2022-04-07 16:37:12.012470531 +0200
+@@ -981,7 +981,7 @@
+ # Test SIMD support, before platform includes to determine if sse2neon is needed.
+ if(WITH_CPU_SIMD)
+   set(COMPILER_SSE_FLAG)
+-  set(COMPILER_SSE2_FLAG)
++#  set(COMPILER_SSE2_FLAG)
  
- BVHEmbree::~BVHEmbree()
+   # Test Neon first since macOS Arm can compile and run x86-64 SSE binaries.
+   TEST_NEON_SUPPORT()
-- 
cgit v1.2.3-70-g09d2