graphics/Blender: Updated for version 2.80

Signed-off-by: Christoph Willing <chris.willing@linux.com>

5 files changed, 14 insertions, 72 deletions

diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 972e3faaf2fe..bd1c2ef487e4 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Blender
 
-# Copyright 2015-2018 Christoph Willing Brisbane, Australia
+# Copyright 2015-2019 Christoph Willing, Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,9 @@
 
 SRCNAM=blender
 PKGNAM=Blender
-VERSION=${VERSION:-2.79b}
+VERSION=${VERSION:-2.80}
 BASE_VERSION=${BASE_VERSION:-$( echo $VERSION | sed -e 's/[^0-9.]*//g')}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])")
 
@@ -83,8 +83,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p0 < $CWD/buildinfo-$VERSION.diff
-patch -p1 < $CWD/use-libopenmj2-for-openjpeg.diff
-patch -p1 < $CWD/PyRNA-python3.7.diff
 
 mkdir -p build
 cd build
@@ -92,7 +90,6 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_CXX11=ON \
     -DWITH_INSTALL_PORTABLE:BOOL=OFF \
     -DWITH_BUILDINFO:BOOL=ON \
     -DWITH_OPENCOLLADA:BOOL=ON \
@@ -107,10 +104,7 @@ cd build
     -DPYTHON_LIBPATH:PATH=/usr/lib${LIBDIRSUFFIX} \
     -DWITH_CODEC_SNDFILE:BOOL=ON \
     -DWITH_FFTW3:BOOL=ON \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
     -DWITH_IMAGE_OPENJPEG:BOOL=ON \
-    -DWITH_SYSTEM_OPENJPEG:BOOL=ON \
     -DWITH_SYSTEM_LZO:BOOL=ON \
     -DWITH_MEM_JEMALLOC:BOOL=ON \
     -DWITH_MEM_VALGRIND:BOOL=ON \
@@ -127,7 +121,7 @@ cd ..
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-BLENDERBINS="blender blenderplayer"
+BLENDERBINS="blender"
 for bin in $BLENDERBINS ; do
   mv $PKG/usr/bin/$bin $PKG/usr/bin/$bin.bin
   cat <<EOF >$PKG/usr/bin/$bin
diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info
index 7a101a5f478a..123f67804ca5 100644
--- a/graphics/Blender/Blender.info
+++ b/graphics/Blender/Blender.info
@@ -1,8 +1,8 @@
 PRGNAM="Blender"
-VERSION="2.79b"
-HOMEPAGE="http://blender.org"
-DOWNLOAD="http://download.blender.org/source/blender-2.79b.tar.gz"
-MD5SUM="cef9a203857dc65076e05c41fc7a7d03"
+VERSION="2.80"
+HOMEPAGE="https://blender.org"
+DOWNLOAD="https://download.blender.org/source/blender-2.80.tar.gz"
+MD5SUM="30dedaf688741d0d5d6fa1e3c331610c"
 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/PyRNA-python3.7.diff b/graphics/Blender/PyRNA-python3.7.diff
deleted file mode 100644
index ac5f72e47479..000000000000
--- a/graphics/Blender/PyRNA-python3.7.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f
-Author: Campbell Barton <ideasman42@gmail.com>
-Date:   Thu Jul 12 08:28:06 2018 +0200
-
-    Fix PyRNA class registration w/ Python 3.7
-    
-    In Python3.7 this now raises an error.
-
-diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
-index 9052b6f580a..80b0aa7a51b 100644
---- a/source/blender/python/intern/bpy_rna.c
-+++ b/source/blender/python/intern/bpy_rna.c
-@@ -7577,10 +7577,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
- 		if (!(flag & PROP_REGISTER))
- 			continue;
- 
-+		/* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */
- 		identifier = RNA_property_identifier(prop);
- 		item = PyObject_GetAttrString(py_class, identifier);
- 
- 		if (item == NULL) {
-+			PyErr_Clear();
- 			/* Sneaky workaround to use the class name as the bl_idname */
- 
- #define     BPY_REPLACEMENT_STRING(rna_attr, py_attr)                         \
-@@ -7596,6 +7598,9 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
- 					}                                                         \
- 					Py_DECREF(item);                                          \
- 				}                                                             \
-+				else {                                                        \
-+					PyErr_Clear();                                            \
-+				}                                                             \
- 			}  /* intentionally allow else here */
- 
- 			if (false) {}  /* needed for macro */
diff --git a/graphics/Blender/buildinfo-2.79b.diff b/graphics/Blender/buildinfo-2.80.diff
index ea048f8f0a3f..2db5014a51a5 100644
--- a/graphics/Blender/buildinfo-2.79b.diff
+++ b/graphics/Blender/buildinfo-2.80.diff
@@ -1,5 +1,5 @@
---- build_files/cmake/buildinfo.cmake.orig	2017-09-11 14:34:59.000000000 +1000
-+++ build_files/cmake/buildinfo.cmake	2017-09-14 11:10:52.213995610 +1000
+--- 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
@@ -7,10 +7,10 @@
 -set(MY_WC_HASH "unknown")
 -set(MY_WC_BRANCH "unknown")
 -set(MY_WC_COMMIT_TIMESTAMP 0)
-+# Timestamp from $(date --date='TZ="UTC" 01:24 24-Mar-18' +%s) - time & date of commit
-+set(MY_WC_HASH "f4dc9f9d68bd")
-+set(MY_WC_BRANCH "master")
-+set(MY_WC_COMMIT_TIMESTAMP 1521854640)
++# 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)
diff --git a/graphics/Blender/use-libopenmj2-for-openjpeg.diff b/graphics/Blender/use-libopenmj2-for-openjpeg.diff
deleted file mode 100644
index 712337382e74..000000000000
--- a/graphics/Blender/use-libopenmj2-for-openjpeg.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru blender-2.74.orig/build_files/cmake/Modules/FindOpenJPEG.cmake blender-2.74/build_files/cmake/Modules/FindOpenJPEG.cmake
---- blender-2.74.orig/build_files/cmake/Modules/FindOpenJPEG.cmake	2015-03-25 05:56:13.000000000 -0500
-+++ blender-2.74/build_files/cmake/Modules/FindOpenJPEG.cmake	2016-01-09 20:17:20.521735656 -0600
-@@ -43,11 +43,12 @@
-   PATH_SUFFIXES
-     include
-     include/openjpeg-1.5
-+    include/openmj2-2.1
- )
- 
- FIND_LIBRARY(OPENJPEG_LIBRARY
-   NAMES
--    openjpeg
-+    openmj2
-   HINTS
-     ${_openjpeg_SEARCH_DIRS}
-   PATH_SUFFIXES