From 9594fd1ac6ba38a20e0b4797aa70328872e6e47c Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Wed, 27 Nov 2019 00:31:37 -0500
Subject: [blender]: upgrade to v2.81

---
 libre/blender/PKGBUILD          | 28 ++++++++++++++--------------
 libre/blender/arm-no-sse2.patch | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 libre/blender/arm-no-sse2.patch

(limited to 'libre/blender')

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 1df586ee9..fba9d86ea 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -15,13 +15,13 @@
 # or simply roll with a new version. I usually choose the latter when the former seems
 # unreasonable.
 
-_gittag=v2.80
+_gittag=v2.81
 # _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
 
 pkgname=blender
-pkgver=2.80
+pkgver=2.81
 [[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=7
+pkgrel=2
 pkgrel+=.parabola1
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
@@ -52,25 +52,23 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '927680b39b3666f6599e4ebcb52b57476b42e9ed89b7e40060c38cd0c36130be86eabdf7c5b8be54f11f26dc222e423fa3e494ede8d6d83c38863241563f181a'
+            '13890f9cd11ca20bcb6f12206c990e25c0d08699feab0fca37607d847d2aebd2d2f423023986e120eaaeb0beca9a440a4d42007dcac2054fe6cdaf745de43402'
             'SKIP')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   git submodule init
-  git config submodule."release/scripts/addons".url ${srcdir}/blender-addons
-  git config submodule."release/scripts/addons_contrib".url ${srcdir}/blender-addons-contrib
-  git config submodule."release/datafiles/locale".url ${srcdir}/blender-translations
-  git config submodule."source/tools".url ${srcdir}/blender-dev-tools
+  git config submodule."release/scripts/addons".url "${srcdir}/blender-addons"
+  git config submodule."release/scripts/addons_contrib".url "${srcdir}/blender-addons-contrib"
+  git config submodule."release/datafiles/locale".url "${srcdir}/blender-translations"
+  git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
   git submodule update
 
   # fix OS Name (pedantic, I know)
   sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' 'source/creator/buildinfo.c'
 
-if [[ "$CARCH" == arm* ]]; then
   patch -Np1 -i "$srcdir"/arm-no-sse2.patch
-fi
 
   mkdir build
 }
@@ -78,17 +76,19 @@ fi
 build() {
   cd "$srcdir/$pkgname-$pkgver"/build
 
-  cmake -GNinja -C../build_files/cmake/config/blender_release.cmake .. \
+  cmake \
+    -GNinja \
+    -C../build_files/cmake/config/blender_release.cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_PYTHON_INSTALL=OFF \
     -DWITH_CYCLES_CUDA_BINARIES='OFF' \
     -DWITH_CYCLES_DEVICE_CUDA='OFF' \
-    -DPYTHON_VERSION=3.7 \
+    -DPYTHON_VERSION=3.8 \
     -DPYTHON_LIBPATH=/usr/lib \
-    -DPYTHON_LIBRARY=python3.7m \
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m
+    -DPYTHON_LIBRARY=python3.8 \
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.8
   ninja
 }
 
diff --git a/libre/blender/arm-no-sse2.patch b/libre/blender/arm-no-sse2.patch
new file mode 100644
index 000000000..722c70e93
--- /dev/null
+++ b/libre/blender/arm-no-sse2.patch
@@ -0,0 +1,15 @@
+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");
-- 
cgit v1.2.3