aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2021-04-06 21:01:48 +0200
committerRobby Workman <rworkman@slackbuilds.org>2021-04-17 22:50:28 -0500
commit0bf8b6707e2ee907d95522e459ef37a0f8a1c73c (patch)
tree41479787759389b2518bf04668fa62306387a976
parent2203212897a8cbdc4da858ff1f1febb1a1b0473e (diff)
graphics/Blender: Updated for version 2.92.0.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--graphics/Blender/Blender.SlackBuild13
-rw-r--r--graphics/Blender/Blender.info8
-rw-r--r--graphics/Blender/README4
3 files changed, 8 insertions, 17 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index a8c4ca8b9d875..c6499142fc565 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
diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info
index 26038a5885d6e..58cabcb046001 100644
--- a/graphics/Blender/Blender.info
+++ b/graphics/Blender/Blender.info
@@ -1,10 +1,10 @@
PRGNAM="Blender"
-VERSION="2.83.8"
+VERSION="2.92.0"
HOMEPAGE="https://blender.org"
-DOWNLOAD="https://download.blender.org/source/blender-2.83.8.tar.xz"
-MD5SUM="1a920506a3a695d629d5f312b9b45c01"
+DOWNLOAD="https://download.blender.org/source/blender-2.92.0.tar.xz"
+MD5SUM="edcbd38e7cdbeeba301de1d57a7ff33c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="ffmpeg jack opencollada opus python-requests valgrind numpy3 SDL2 openimageio freealut tbb embree"
+REQUIRES="potrace OpenSubdiv pugixml jack opencollada valgrind numpy3 openimageio freealut embree"
MAINTAINER="Christoph Willing"
EMAIL="chris.willing@linux.com"
diff --git a/graphics/Blender/README b/graphics/Blender/README
index e6fe94d6e99b4..aa1613683cbec 100644
--- a/graphics/Blender/README
+++ b/graphics/Blender/README
@@ -21,10 +21,6 @@ successful build. The CUDA handling above remains for cases which may:
Support for embree may be disabled by passing EMBREE=no when building e.g.
EMBREE=no sh ./Blender.SlackBuild
-Support in 14.2 for using SBo's ffmpeg4 SlackBuild may be enabled by
-passing FORCE_FFMPEG4=yes when building e.g.
- FORCE_FFMPEG4=yes sh ./Blender.SlackBuild
-
Version 2.83.8 is the last SBo supported version of Blender for building
from source code in Slackware64-14.2. A more recent compiler (gcc-9.3.1)
is required for 2.90.x and later blender versions.