Blender: bump version, now with 100% more icon (#1458)

media-gfx/blender/patches/blender-2.78c.patchset

@@ -1,41 +1,11 @@
-From ef7aeda91a0f2f5916e04cab369a744014e9d799 Mon Sep 17 00:00:00 2001
+From 2e4892faf4e721f3ad8ef2486037bdc8df03dd3a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 1 Feb 2017 21:55:43 +0100
-Subject: [PATCH] Haiku supporting patch
+Subject: Haiku supporting patch
 
----
- CMakeLists.txt                                     |   4 +-
- build_files/cmake/Modules/FindFftw3.cmake          |   2 +
- build_files/cmake/Modules/FindGLEW.cmake           |   2 +
- build_files/cmake/Modules/FindIcuLinux.cmake       |   2 +
- build_files/cmake/Modules/FindLZO.cmake            |   2 +
- build_files/cmake/Modules/FindOpenColorIO.cmake    |   2 +
- build_files/cmake/Modules/FindOpenEXR.cmake        |   2 +
- build_files/cmake/Modules/FindOpenImageIO.cmake    |   2 +
- build_files/cmake/Modules/FindOpenJPEG.cmake       |   2 +
- build_files/cmake/Modules/FindPCRE.cmake           |   2 +
- build_files/cmake/Modules/FindSDL2.cmake           |   5 +-
- build_files/cmake/Modules/FindSndFile.cmake        |   2 +
- build_files/cmake/Modules/FindXML2.cmake           |   2 +
- build_files/cmake/macros.cmake                     |   3 +
- build_files/cmake/platform/platform_unix.cmake     |   6 +-
- extern/glog/src/config.h                           |   2 +
- extern/glog/src/config_haiku.h                     | 172 +++++++++++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h        |   3 +
- intern/libmv/libmv/numeric/numeric.h               |   2 +-
- source/blender/blenkernel/intern/bvhutils.c        |  13 ++
- source/blender/blenkernel/intern/font.c            |  14 ++
- source/blender/blenkernel/intern/particle_system.c |  14 ++
- source/blender/blenkernel/intern/subsurf_ccg.c     |  15 ++
- source/blender/blenlib/BLI_sys_types.h             |   2 +-
- source/blender/blenlib/BLI_threads.h               |   4 +
- source/blender/blenlib/intern/fileops.c            |  12 ++
- source/blender/blenlib/intern/storage.c            |   2 +-
- 27 files changed, 288 insertions(+), 7 deletions(-)
- create mode 100644 extern/glog/src/config_haiku.h
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 578f913..73a17e6 100644
+index 8a48e6e..a993922 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -193,7 +193,7 @@ endif()
@@ -47,7 +17,7 @@ index 578f913..73a17e6 100644
  	set(WITH_X11 ON)
  endif()
  
-@@ -858,7 +858,7 @@ set(CC_REMOVE_STRICT_FLAGS)
+@@ -859,7 +859,7 @@ set(CC_REMOVE_STRICT_FLAGS)
  
  # libraries to link the binary with passed to target_link_libraries()
  # known as LLIBS to scons
@@ -223,10 +193,10 @@ index 40cc332..09237ee 100644
  
  FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h
 diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 5a67ac9..b518956 100644
+index ead4fd4..61971b4 100644
 --- a/build_files/cmake/macros.cmake
 +++ b/build_files/cmake/macros.cmake
-@@ -1532,6 +1532,7 @@ function(find_python_package
+@@ -1525,6 +1525,7 @@ function(find_python_package
  		  PATH_SUFFIXES
  		    site-packages
  		    dist-packages
@@ -234,7 +204,7 @@ index 5a67ac9..b518956 100644
  		   NO_DEFAULT_PATH
  		)
  
-@@ -1542,6 +1543,8 @@ function(find_python_package
+@@ -1535,6 +1536,8 @@ function(find_python_package
  				"'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', "
  				"'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', "
  				"'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', "
@@ -678,5 +648,73 @@ index 3edc00a..30e9ab1 100644
  #  include <sys/statvfs.h>
  #  define USE_STATFS_STATVFS
 -- 
-2.11.0
+2.12.2
+
+
+From 6b0e182a54b090b5c4cf0b80724c5bbec1069560 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 21 Jun 2017 15:56:25 +0200
+Subject: Build fix
+
+
+diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
+index e97a250..bc45b8a 100644
+--- a/source/blender/blenlib/BLI_math_base.h
++++ b/source/blender/blenlib/BLI_math_base.h
+@@ -86,7 +86,7 @@ static const int NAN_INT = 0x7FC00000;
+ #endif
+ 
+ /* do not redefine functions from C99, POSIX.1-2001 or MSVC12 (partial C99) */
+-#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || defined(_MSC_VER))
++#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || defined(_MSC_VER) || defined(__HAIKU__))
+ 
+ #ifndef sqrtf
+ #define sqrtf(a) ((float)sqrt(a))
+-- 
+2.12.2
+
+
+From c26b8564a028372d74eadd44be5c82be1bdf6811 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 21 Jun 2017 17:26:46 +0200
+Subject: Searchpaths for cmake
+
+
+diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake
+index 400e8eb..fdd7936 100644
+--- a/build_files/cmake/Modules/FindEigen3.cmake
++++ b/build_files/cmake/Modules/FindEigen3.cmake
+@@ -29,6 +29,8 @@ SET(_eigen3_SEARCH_DIRS
+   /sw # Fink
+   /opt/local # DarwinPorts
+   /opt/csw # Blastwave
++  /system/lib # Haiku
++  /system/develop/headers # Haiku
+ )
+ 
+ FIND_PATH(EIGEN3_INCLUDE_DIR
+@@ -38,7 +40,7 @@ FIND_PATH(EIGEN3_INCLUDE_DIR
+   HINTS
+     ${_eigen3_SEARCH_DIRS}
+   PATH_SUFFIXES
+-    include/eigen3
++    include/eigen3 Eigen
+ )
+ 
+ # handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if 
+diff --git a/build_files/cmake/Modules/FindHDF5.cmake b/build_files/cmake/Modules/FindHDF5.cmake
+index 56ceda8..990a594 100644
+--- a/build_files/cmake/Modules/FindHDF5.cmake
++++ b/build_files/cmake/Modules/FindHDF5.cmake
+@@ -31,6 +31,8 @@ SET(_hdf5_SEARCH_DIRS
+   /opt/local # DarwinPorts
+   /opt/csw # Blastwave
+   /opt/lib/hdf5
++  /system/lib # Haiku
++  /system/develop/headers # Haiku
+ )
+ 
+ FIND_LIBRARY(HDF5_LIBRARY
+-- 
+2.12.2