From f49fd99f3a75c54221792404d73bd640d2b37a9a Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Sun, 13 Nov 2016 17:59:56 +1000 Subject: graphics/Blender: Updated for version 2.78a Signed-off-by: Christoph Willing --- graphics/Blender/Blender.SlackBuild | 5 ++--- graphics/Blender/Blender.info | 6 +++--- graphics/Blender/buildinfo-2.78.diff | 16 ---------------- graphics/Blender/buildinfo-2.78a.diff | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 graphics/Blender/buildinfo-2.78.diff create mode 100644 graphics/Blender/buildinfo-2.78a.diff (limited to 'graphics') diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index 451ba833f4..793b8c01b7 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -24,8 +24,8 @@ SRCNAM=blender PKGNAM=Blender -VERSION=${VERSION:-2.78} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.78a} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])") @@ -96,7 +96,6 @@ cd build -DWITH_FFTW3:BOOL=ON \ -DWITH_GAMEENGINE:BOOL=ON \ -DWITH_PLAYER:BOOL=ON \ - -DWITH_IMAGE_REDCODE:BOOL=ON \ -DWITH_IMAGE_OPENJPEG:BOOL=ON \ -DWITH_SYSTEM_OPENJPEG:BOOL=ON \ -DWITH_MEM_JEMALLOC:BOOL=ON \ diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info index 779fff09e3..12659da44f 100644 --- a/graphics/Blender/Blender.info +++ b/graphics/Blender/Blender.info @@ -1,8 +1,8 @@ PRGNAM="Blender" -VERSION="2.78" +VERSION="2.78a" HOMEPAGE="http://blender.org" -DOWNLOAD="http://download.blender.org/source/blender-2.78.tar.gz" -MD5SUM="715513768a384d8a440cf4fef203dbda" +DOWNLOAD="http://download.blender.org/source/blender-2.78a.tar.gz" +MD5SUM="8f75b9d7c8507c563bda882c4f73c2d2" 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.78.diff b/graphics/Blender/buildinfo-2.78.diff deleted file mode 100644 index 0053b36c21..0000000000 --- a/graphics/Blender/buildinfo-2.78.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- 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) diff --git a/graphics/Blender/buildinfo-2.78a.diff b/graphics/Blender/buildinfo-2.78a.diff new file mode 100644 index 0000000000..c41e97144b --- /dev/null +++ b/graphics/Blender/buildinfo-2.78a.diff @@ -0,0 +1,16 @@ +--- build_files/cmake/buildinfo.cmake.orig 2016-10-25 19:59:23.000000000 +1000 ++++ build_files/cmake/buildinfo.cmake 2016-11-13 17:31:44.921023097 +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" 14:22 24-Oct-16' +%s) - time & date of commit ++set(MY_WC_HASH "e8299c81006a") ++set(MY_WC_BRANCH "master") ++set(MY_WC_COMMIT_TIMESTAMP 1477318920) + + # Guess if this is a git working copy and then look up the revision + if(EXISTS ${SOURCE_DIR}/.git) -- cgit v1.2.3