From afc9e42772de8a69a6c2a028e98dc5ca8d96df52 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Thu, 8 Apr 2021 19:35:50 +0200
Subject: 20210408.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 graphics/Blender/Blender.SlackBuild | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'graphics/Blender/Blender.SlackBuild')

diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index a8c4ca8b9d..c6499142fc 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Blender
-VERSION=${VERSION:-2.83.8}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.92.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=blender
@@ -87,12 +87,6 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
 cd $SRCNAM-$VERSION
-patch -p0 < $CWD/01_FindEmbree_so.diff
-if [ ${FORCE_FFMPEG4:-no} = "yes" ]; then
-  echo "Force use of ffmpeg4"
-  SLKCFLAGS="$SLKCFLAGS -I/usr/include/ffmpeg4 -L/usr/lib${LIBDIRSUFFIX}/ffmpeg4"
-  sed -i -e "s|\"exitcode=0\"|&,\"LD_LIBRARY_PATH\":\"/usr/lib$LIBDIRSUFFIX/ffmpeg4\"|g" doc/manpage/blender.1.py
-fi
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -132,6 +126,7 @@ cd build
     -DCMAKE_BUILD_TYPE=Release \
     $cuda \
     $embree \
+    -DCMAKE_EXE_LINKER_FLAGS:STRING="-lboost_locale"
 
   make
   make install DESTDIR=$PKG
@@ -145,7 +140,7 @@ for bin in $BLENDERBINS ; do
   mv $PKG/usr/bin/$bin $PKG/usr/bin/$bin.bin
   cat <<EOF >$PKG/usr/bin/$bin
 #!/bin/sh
-export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada:/usr/lib$LIBDIRSUFFIX/ffmpeg4
+export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada
 exec $bin.bin "\$@"
 EOF
   chmod 0755 $PKG/usr/bin/$bin
-- 
cgit v1.2.3