[blender]: upgrade to v2.82.a (broken)

2 files changed, 59 insertions, 9 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index ee9a63e68..4553c93c4 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -3,10 +3,11 @@
 # Contributor (Arch): tobias <tobias@archlinux.org>
 # Contributor: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor: bill-auger <bill-auger@programmer.net>
 
 # parabola changes and rationale:
-#  - removed support for CUDA
-#  - removed support for optix
+#  - removed support for non-free CUDA
+#  - removed support for non-free optix
 
 # Sometimes blender.org takes some time to release patch releases and because Arch users
 # are impatient, we sometimes need to build from git directly.
@@ -16,14 +17,14 @@
 # or simply roll with a new version. I usually choose the latter when the former seems
 # unreasonable.
 
-_gittag=v2.81a
+_gittag=v2.82a
 # _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
 
 pkgname=blender
-pkgver=2.81.a
+pkgver=2.82.a
 [[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=5
-pkgrel+=.parabola2
+pkgrel=3
+pkgrel+=.parabola1
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 pkgdesc+=", without nonfree CUDA support"
@@ -32,11 +33,12 @@ arch+=('i686' 'armv7h')
 license=('GPL')
 url="http://www.blender.org"
 depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requests'
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg' 'python-numpy'
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg2' 'python-numpy'
          'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic'
          'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
          'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2')
-depends_x86_64=('openimagedenoise')
+depends_x86_64=('embree' 'openimagedenoise')
+depends_i686=('embree')
 makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'ninja')
 options=(!strip)
 source=("git://git.blender.org/blender-addons.git"
@@ -45,7 +47,8 @@ source=("git://git.blender.org/blender-addons.git"
         "git://git.blender.org/blender-dev-tools.git"
         arm-no-sse2.patch
         arm-align-structs.patch)
-
+source_x86_64=(embree.patch)
+source_i686=(embree.patch)
 if [[ -n $_gittag ]]; then
     source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
 elif [[ -n $_gitcommit ]]; then
@@ -58,6 +61,8 @@ sha512sums=('SKIP'
             '13890f9cd11ca20bcb6f12206c990e25c0d08699feab0fca37607d847d2aebd2d2f423023986e120eaaeb0beca9a440a4d42007dcac2054fe6cdaf745de43402'
             '9c708578f3efb9faca444ca69efad1343c09697601ded97a05b7227e55f0347efc69bafa52452e06b73480b5041fad966b6aa64cbdcd2458cf734281acf68f78'
             'SKIP')
+sha512sums_x86_64=('6de779ad8649a034ee65c45a36d7838ac0b8b32c3336b4d476186265c060f56276e3e0a2860ec4bff42bef7d5582ee82238013845f6a697672767a05a455aaca')
+sha512sums_i686=('6de779ad8649a034ee65c45a36d7838ac0b8b32c3336b4d476186265c060f56276e3e0a2860ec4bff42bef7d5582ee82238013845f6a697672767a05a455aaca')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -69,6 +74,8 @@ prepare() {
   git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
   git submodule update
 
+  patch -Np1 -i "$srcdir"/embree.patch
+
   # fix OS Name (pedantic, I know)
   sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' 'source/creator/buildinfo.c'
 
diff --git a/libre/blender/embree.patch b/libre/blender/embree.patch
new file mode 100644
index 000000000..bed0b39e7
--- /dev/null
+++ b/libre/blender/embree.patch
@@ -0,0 +1,43 @@
+diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
+index d9a2ebf8571..f3b7d156024 100644
+--- a/intern/cycles/blender/CMakeLists.txt
++++ b/intern/cycles/blender/CMakeLists.txt
+@@ -66,6 +66,12 @@ if(WITH_CYCLES_LOGGING)
+   )
+ endif()
+ 
++if(WITH_CYCLES_EMBREE)
++  list(APPEND LIB
++    ${EMBREE_LIBRARIES}
++  )
++endif()
++
+ set(ADDON_FILES
+   addon/__init__.py
+   addon/engine.py
+diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake
+index d9d525d4586..03b509a28f3 100644
+--- a/build_files/cmake/Modules/FindEmbree.cmake
++++ b/build_files/cmake/Modules/FindEmbree.cmake
+@@ -72,7 +72,7 @@ ENDFOREACH()
+ 
+ FIND_LIBRARY(EMBREE_LIBRARY
+   NAMES
+-    libembree3
++    embree3
+   HINTS
+     ${_embree_SEARCH_DIRS}
+   PATH_SUFFIXES
+@@ -83,10 +83,10 @@ FIND_LIBRARY(EMBREE_LIBRARY
+ # all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(EMBREE DEFAULT_MSG
+-    _embree_LIBRARIES EMBREE_INCLUDE_DIR)
++    EMBREE_LIBRARY EMBREE_INCLUDE_DIR)
+ 
+ IF(EMBREE_FOUND)
+-  SET(EMBREE_LIBRARIES ${_embree_LIBRARIES})
++  SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
+   SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
+ ENDIF(EMBREE_FOUND)
+