blender-git: Fix dependencies. Update patches.

mingw-w64-blender-git/PKGBUILD

@@ -5,15 +5,14 @@ _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}-git"
 provides=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff}-${_realname}")
-blender_version=2.69
-pkgver=r53025.cc2cdfb
+blender_version=2.70
+pkgver=r53403.4614c63
 pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)"
 arch=('any')
 license=('GPL')
 url="http://www.blender.org"
-depends=(
-		"${_mingw_suff}-boost"
+depends=("${_mingw_suff}-boost"
 		"${_mingw_suff}-glew"
 		"${_mingw_suff}-ffmpeg"
 		"${_mingw_suff}-fftw"
@@ -21,7 +20,6 @@ depends=(
 		"${_mingw_suff}-libpng"
 		"${_mingw_suff}-libsndfile"
 		"${_mingw_suff}-libtiff"
-		"${_mingw_suff}-python3-numpy"
 		"${_mingw_suff}-openexr"
 		"${_mingw_suff}-openal"
 		"${_mingw_suff}-opencollada"
@@ -29,8 +27,9 @@ depends=(
 		"${_mingw_suff}-openimageio"
 		"${_mingw_suff}-openshadinglanguage"
 		"${_mingw_suff}-python3"
+		"${_mingw_suff}-python3-numpy"
 		"${_mingw_suff}-wintab-sdk")
-makedepends=("${_mingw_suff}-cmake" "${_mingw_suff}-boost")
+makedepends=("${_mingw_suff}-boost" "${_mingw_suff}-clang" "${_mingw_suff}-cmake")
 #[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
 optdepends=('cuda: cycles renderer cuda support')
 options=(!strip staticlibs !buildflags)
@@ -46,8 +45,8 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP'
          'SKIP'
-         '0c0c9e0ffe1efe2176f5267e6ef019c3'
-         '57bce4d96f2724d44d5bbeedaa36d392'
+         'ab83bd4cf48d08cff63f795b268be350'
+         '4ae668ebdaa1408485937e767881c80b'
          '1969914e11d0a4f74dbfeddad742c9da')
 
 pkgver() {
@@ -112,8 +111,8 @@ build() {
 		-DPYTHON_NUMPY_PATH=${PREFIX_DEPS}/lib/python3.4/site-packages \
 		-DCYCLES_OSL=${PREFIX_DEPS} \
 		-DWITH_IMAGE_REDCODE=ON \
-		-DWITH_OPENMP=OFF \
-		../$_realname
+		-DWITH_OPENMP=ON \
+		../${_realname}
 
 	# Remove the openjpeg line once blender accepts my patch
 	make # -j1 VERBOSE=1

mingw-w64-blender-git/fix-mingw-w64-definitions.patch

@@ -23,9 +23,9 @@ diff -Naur blender/extern/libmv/third_party/glog/src/windows/port.cc blender-pp/
 --- blender/extern/libmv/third_party/glog/src/windows/port.cc	2014-01-14 08:17:57.112600000 +0400
 +++ blender-pp/extern/libmv/third_party/glog/src/windows/port.cc	2014-01-14 07:08:38.441200000 +0400
 @@ -56,7 +56,7 @@
+   return _vsnprintf(str, size-1, format, ap);
  }
  
- // MinGW64 defines
 -#ifndef __MINGW64__
 +#ifndef __MINGW64_VERSION_MAJOR
  int snprintf(char *str, size_t size, const char *format, ...) {
@@ -56,17 +56,16 @@ diff -Naur blender/extern/libmv/third_party/glog/src/windows/port.h blender-pp/e
  #define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
  #ifndef __MINGW32__
  enum { STDIN_FILENO = 0, STDOUT_FILENO = 1, STDERR_FILENO = 2 };
-@@ -123,9 +125,8 @@
+@@ -123,7 +125,9 @@
  #define DEFAULT_TEMPLATE_ROOTDIR  ".."
  
  // ----------------------------------- SYSTEM/PROCESS
--#ifndef __MINGW64__
 +#ifndef __MINGW64_VERSION_MAJOR
  typedef int pid_t;
--#endif
++#endif
  #define getpid  _getpid
  
- // ----------------------------------- THREADS
+ #include <BaseTsd.h>
 @@ -152,6 +153,7 @@
    return result;
  #endif