summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/Blender/Blender.SlackBuild7
-rw-r--r--graphics/Blender/Blender.info6
-rw-r--r--graphics/Blender/README5
-rw-r--r--graphics/Blender/buildinfo-2.80.diff16
4 files changed, 11 insertions, 23 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index bd1c2ef487..2d1df98b82 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -24,7 +24,7 @@
SRCNAM=blender
PKGNAM=Blender
-VERSION=${VERSION:-2.80}
+VERSION=${VERSION:-2.81}
BASE_VERSION=${BASE_VERSION:-$( echo $VERSION | sed -e 's/[^0-9.]*//g')}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,7 +73,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
@@ -82,8 +82,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch -p0 < $CWD/buildinfo-$VERSION.diff
-
mkdir -p build
cd build
cmake ../ \
@@ -111,6 +109,7 @@ cd build
-DWITH_MOD_OCEANSIM:BOOL=ON \
-DWITH_SDL:BOOL=ON \
-DWITH_SDL_DYNLOAD:BOOL=ON \
+ -DWITH_TBB:BOOL=OFF \
-DCMAKE_BUILD_TYPE=Release \
$cuda \
diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info
index 123f67804c..3cf4ff3590 100644
--- a/graphics/Blender/Blender.info
+++ b/graphics/Blender/Blender.info
@@ -1,8 +1,8 @@
PRGNAM="Blender"
-VERSION="2.80"
+VERSION="2.81"
HOMEPAGE="https://blender.org"
-DOWNLOAD="https://download.blender.org/source/blender-2.80.tar.gz"
-MD5SUM="30dedaf688741d0d5d6fa1e3c331610c"
+DOWNLOAD="https://download.blender.org/source/blender-2.81.tar.xz"
+MD5SUM="bbb3c2ad7253ef3c6a6047b2f64074f3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ffmpeg jack-audio-connection-kit opencollada python-requests valgrind numpy3 SDL2 openimageio freealut"
diff --git a/graphics/Blender/README b/graphics/Blender/README
index d415695a6c..0cc2e3dec5 100644
--- a/graphics/Blender/README
+++ b/graphics/Blender/README
@@ -7,3 +7,8 @@ a broad range of essential tools for the creation of 3D content,
including modeling, uv-mapping, texturing, particle and other
simulation, scripting, rendering, compositing,post-production, and
game creation.
+
+CUDA support is included if a CUDA installation is detected at build time.
+It may be disable by passing CUDA=no when building e.g.
+ CUDA=no sh ./Blender.SlackBuild
+
diff --git a/graphics/Blender/buildinfo-2.80.diff b/graphics/Blender/buildinfo-2.80.diff
deleted file mode 100644
index 2db5014a51..0000000000
--- a/graphics/Blender/buildinfo-2.80.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- build_files/cmake/buildinfo.cmake.orig 2019-07-24 17:41:38.000000000 +1000
-+++ build_files/cmake/buildinfo.cmake 2019-07-31 17:36:21.614279355 +1000
-@@ -8,9 +8,10 @@
-
- # Extract working copy information for SOURCE_DIR into MY_XXX variables
- # with a default in case anything fails, for example when using git-svn
--set(MY_WC_HASH "unknown")
--set(MY_WC_BRANCH "unknown")
--set(MY_WC_COMMIT_TIMESTAMP 0)
-+# Timestamp from $(date --date='TZ="UTC" 16:47 29-Jul-19' +%s) - time & date of commit
-+set(MY_WC_HASH "f6cb5f54494e")
-+set(MY_WC_BRANCH "blender-v2.80-release")
-+set(MY_WC_COMMIT_TIMESTAMP 1564418820)
-
- # Guess if this is a git working copy and then look up the revision
- if(EXISTS ${SOURCE_DIR}/.git)