summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2021-04-02 18:23:08 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-04-03 08:48:34 +0700
commitbf0e1e33a0954be9a2702c0cc52c87546ac97cfa (patch)
tree7119592dd0fd417116196dc787f28f5b9525abbb
parentcdba76a387eaef564ab1752c2685481644b54827 (diff)
downloadslackbuilds-bf0e1e33a0954be9a2702c0cc52c87546ac97cfa.tar.gz
graphics/Blender: Enable build with ffmpeg4
Signed-off-by: Christoph Willing <chris.willing@linux.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--graphics/Blender/Blender.SlackBuild10
-rw-r--r--graphics/Blender/README4
2 files changed, 11 insertions, 3 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 4d8d8cb152..a8c4ca8b9d 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=Blender
VERSION=${VERSION:-2.83.8}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
SRCNAM=blender
@@ -88,6 +88,11 @@ 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 \
@@ -140,8 +145,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 PYTHONPATH=/usr/share/$SRCNAM/$BASE_VERSION/python/lib$LIBDIRSUFFIX/python$PYTHON_VERSION
-export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada
+export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada:/usr/lib$LIBDIRSUFFIX/ffmpeg4
exec $bin.bin "\$@"
EOF
chmod 0755 $PKG/usr/bin/$bin
diff --git a/graphics/Blender/README b/graphics/Blender/README
index aa1613683c..e6fe94d6e9 100644
--- a/graphics/Blender/README
+++ b/graphics/Blender/README
@@ -21,6 +21,10 @@ 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.