summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/Blender/Blender.SlackBuild2
-rw-r--r--graphics/Blender/Blender.info6
-rw-r--r--graphics/Blender/buildinfo-2.77a.diff18
-rw-r--r--graphics/Blender/buildinfo-2.78.diff16
4 files changed, 20 insertions, 22 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 3b640490f6..5965b36fe0 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -24,7 +24,7 @@
SRCNAM=blender
PKGNAM=Blender
-VERSION=${VERSION:-2.77a}
+VERSION=${VERSION:-2.78}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])")
diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info
index c476b53ace..779fff09e3 100644
--- a/graphics/Blender/Blender.info
+++ b/graphics/Blender/Blender.info
@@ -1,8 +1,8 @@
PRGNAM="Blender"
-VERSION="2.77a"
+VERSION="2.78"
HOMEPAGE="http://blender.org"
-DOWNLOAD="http://mirror.cs.umn.edu/blender.org/source/blender-2.77a.tar.gz"
-MD5SUM="bb192274fe5957ce62bce9f0557ea4b4"
+DOWNLOAD="http://download.blender.org/source/blender-2.78.tar.gz"
+MD5SUM="715513768a384d8a440cf4fef203dbda"
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/buildinfo-2.77a.diff b/graphics/Blender/buildinfo-2.77a.diff
deleted file mode 100644
index f82cc16ae4..0000000000
--- a/graphics/Blender/buildinfo-2.77a.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- build_files/cmake/buildinfo.cmake.orig 2015-07-28 11:59:14.020100604 +0000
-+++ build_files/cmake/buildinfo.cmake 2015-07-28 12:18:20.021045004 +0000
-@@ -138,11 +138,12 @@
- execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
-
-+# Timestamp from $(date --date='TZ="UTC" 15:42 07-Apr-16' +%s) - time & date of commit
- # Write a file with the BUILD_HASH define
- file(WRITE buildinfo.h.txt
-- "#define BUILD_HASH \"${MY_WC_HASH}\"\n"
-- "#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
-- "#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
-+ "#define BUILD_HASH \"rBabf6f081c4cd\"\n"
-+ "#define BUILD_COMMIT_TIMESTAMP 1460043720\n"
-+ "#define BUILD_BRANCH \"master\"\n"
- "#define BUILD_DATE \"${BUILD_DATE}\"\n"
- "#define BUILD_TIME \"${BUILD_TIME}\"\n"
- )
diff --git a/graphics/Blender/buildinfo-2.78.diff b/graphics/Blender/buildinfo-2.78.diff
new file mode 100644
index 0000000000..0053b36c21
--- /dev/null
+++ b/graphics/Blender/buildinfo-2.78.diff
@@ -0,0 +1,16 @@
+--- build_files/cmake/buildinfo.cmake.orig 2016-10-05 07:43:00.458723328 +1000
++++ build_files/cmake/buildinfo.cmake 2016-10-05 09:59:34.066717033 +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" 10:41 28-Sep-16' +%s) - time & date of commit
++set(MY_WC_HASH "rB0b13b7adef0b")
++set(MY_WC_BRANCH "master")
++set(MY_WC_COMMIT_TIMESTAMP 1475059260)
+
+ # Guess if this is a git working copy and then look up the revision
+ if(EXISTS ${SOURCE_DIR}/.git)