blender-git: Update to git SHA [c32ded3]

mingw-w64-blender-git/PKGBUILD

@@ -5,35 +5,37 @@ _realname=blender
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-blender_version=2.71
-pkgver=r56781.47ebf96
+blender_version=2.74
+pkgver=r58316.c32ded3
 _pyver=3.4
 pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)"
 arch=('any')
 license=('GPL')
 url="http://www.blender.org"
 depends=("${MINGW_PACKAGE_PREFIX}-boost"
-        "${MINGW_PACKAGE_PREFIX}-glew"
-        "${MINGW_PACKAGE_PREFIX}-ffmpeg"
-        "${MINGW_PACKAGE_PREFIX}-fftw"
-        "${MINGW_PACKAGE_PREFIX}-freetype"
-        "${MINGW_PACKAGE_PREFIX}-libpng"
-        "${MINGW_PACKAGE_PREFIX}-libsndfile"
-        "${MINGW_PACKAGE_PREFIX}-libtiff"
-        "${MINGW_PACKAGE_PREFIX}-openexr"
-        "${MINGW_PACKAGE_PREFIX}-openal"
-        "${MINGW_PACKAGE_PREFIX}-opencollada"
-        "${MINGW_PACKAGE_PREFIX}-opencolorio"
-        "${MINGW_PACKAGE_PREFIX}-openimageio"
-        "${MINGW_PACKAGE_PREFIX}-openshadinglanguage"
-        "${MINGW_PACKAGE_PREFIX}-python3"
-        "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-        "${MINGW_PACKAGE_PREFIX}-wintab-sdk")
-makedepends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-cmake"
+         "${MINGW_PACKAGE_PREFIX}-glew"
+         "${MINGW_PACKAGE_PREFIX}-ffmpeg"
+         "${MINGW_PACKAGE_PREFIX}-fftw"
+         "${MINGW_PACKAGE_PREFIX}-freetype"
+         "${MINGW_PACKAGE_PREFIX}-libpng"
+         "${MINGW_PACKAGE_PREFIX}-libsndfile"
+         "${MINGW_PACKAGE_PREFIX}-libtiff"
+         "${MINGW_PACKAGE_PREFIX}-openexr"
+         "${MINGW_PACKAGE_PREFIX}-openal"
+         "${MINGW_PACKAGE_PREFIX}-opencollada"
+         "${MINGW_PACKAGE_PREFIX}-opencolorio"
+         "${MINGW_PACKAGE_PREFIX}-openimageio"
+         "${MINGW_PACKAGE_PREFIX}-openshadinglanguage-git"
+         "${MINGW_PACKAGE_PREFIX}-python3"
+         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
+         "${MINGW_PACKAGE_PREFIX}-wintab-sdk")
+makedepends=("${MINGW_PACKAGE_PREFIX}-clang"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-gcc"
              "git")
 #[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
-optdepends=('cuda: cycles renderer cuda support')
+#optdepends=('cuda: cycles renderer cuda support')
 options=(!strip staticlibs !buildflags)
 #install=blender.install
 source=("${_realname}"::"git://git.blender.org/blender.git"
@@ -44,18 +46,24 @@ source=("${_realname}"::"git://git.blender.org/blender.git"
         "fix-mingw-w64-definitions.patch"
         "mingw-dont-install-3rdparty.patch"
         "fix-finding-glew.patch"
+        "fix-define-syntax.patch"
+        "mingw-DEBUG-libmv-avoid-too-many-sections.patch"
+        "mingw-DEBUG-dont-suffix-libs-with-_d.patch"
         "mingw-use-X11-like-path-layout.patch"
-        "fix-define-syntax.patch")
+        "osl-deprecate-api.patch")
 md5sums=('SKIP'
          'SKIP'
          'SKIP'
          'SKIP'
-         '803bad7d8a6bd148f88a1b66d36be31f'
-         '39e931d7652c9c95982330d95bfdd2e3'
+         'c3426eb608350bdedb89c531b72cff36'
+         '545eaf9f3268b96d1cb2764c51ec063d'
          '1969914e11d0a4f74dbfeddad742c9da'
          'b11e3fe76c4433abb53c12e723dfbe4f'
+         '9c5a4e230d1c9081096d53d206cc03b4'
+         'e8dbeac11a43dc307fe826cd41100b8e'
+         '4d104bac37e549eb32cffd473550412e'
          'bdac7b47c5886bbcede99516a67de0c2'
-         '9c5a4e230d1c9081096d53d206cc03b4')
+         '407dd78ee33dd9ab1212ba93af396d6c')
 
 pkgver() {
   cd "$srcdir/$_realname"
@@ -64,12 +72,15 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$_realname"
-  patch -p1 -i ${srcdir}/mingw-w64-cmake.patch
-  patch -p1 -i ${srcdir}/fix-mingw-w64-definitions.patch
-  patch -p1 -i ${srcdir}/mingw-dont-install-3rdparty.patch
-  patch -p1 -i ${srcdir}/fix-finding-glew.patch
-  patch -p1 -i ${srcdir}/fix-define-syntax.patch
-  patch -p1 -i ${srcdir}/mingw-use-X11-like-path-layout.patch
+  patch -p1 -i "${srcdir}"/mingw-w64-cmake.patch
+  patch -p1 -i "${srcdir}"/fix-mingw-w64-definitions.patch
+  patch -p1 -i "${srcdir}"/mingw-dont-install-3rdparty.patch
+  patch -p1 -i "${srcdir}"/fix-finding-glew.patch
+  patch -p1 -i "${srcdir}"/fix-define-syntax.patch
+  patch -p1 -i "${srcdir}"/mingw-DEBUG-libmv-avoid-too-many-sections.patch
+  patch -p1 -i "${srcdir}"/mingw-DEBUG-dont-suffix-libs-with-_d.patch
+  patch -p1 -i "${srcdir}"/mingw-use-X11-like-path-layout.patch
+  patch -p1 -i "${srcdir}"/osl-deprecate-api.patch
 
   cp -rf $srcdir/translations/* $srcdir/$_realname/release/datafiles/locale/
   cp -rf $srcdir/addons/* $srcdir/$_realname/release/scripts/addons/
@@ -132,9 +143,14 @@ package() {
   cd "$srcdir/build-${MINGW_CHOST}"
   make install
 
-  ${MINGW_PREFIX}/bin/python3 -m compileall "${pkgdir}${MINGW_PREFIX}/bin/$blender_version"
+  mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
+  cp -r bin ${pkgdir}${MINGW_PREFIX}/
+  rm ${pkgdir}${MINGW_PREFIX}/bin/msgfmt.exe
+  mv ${pkgdir}${MINGW_PREFIX}/bin/*.a ${pkgdir}${MINGW_PREFIX}/lib/
+
+  ${MINGW_PREFIX}/bin/python3 -m compileall "${pkgdir}${MINGW_PREFIX}/share/blender/$blender_version"
   ${MINGW_PREFIX}/bin/python3 -m compileall \
-  ${pkgdir}${MINGW_PREFIX}/bin/$blender_version/scripts/startup \
-  ${pkgdir}${MINGW_PREFIX}/bin/$blender_version/scripts/modules \
-  ${pkgdir}${MINGW_PREFIX}/bin/$blender_version/scripts/addons
+  ${pkgdir}${MINGW_PREFIX}/share/blender/$blender_version/scripts/startup \
+  ${pkgdir}${MINGW_PREFIX}/share/blender/$blender_version/scripts/modules \
+  ${pkgdir}${MINGW_PREFIX}/share/blender/$blender_version/scripts/addons
 }

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

@@ -90,23 +90,26 @@ diff -Naur blender/extern/libmv/third_party/glog/src/windows/port.h blender-pp/e
  /* SSE intrinsics headers */
 -#ifndef FREE_WINDOWS64
 
- #ifdef __KERNEL_SSE2__
- #include <xmmintrin.h> /* SSE 1 */
-@@ -95,14 +94,6 @@
- #include <smmintrin.h> /* SSE 4.1 */
+ #ifdef _MSC_VER
+ #include <intrin.h>
+@@ -95,17 +94,6 @@
+
  #endif
 
 -#else
 -
 -/* MinGW64 has conflicting declarations for these SSE headers in <windows.h>.
 - * Since we can't avoid including <windows.h>, better only include that */
+-#define NOGDI
+-#define NOMINMAX
+-#define WIN32_LEAN_AND_MEAN
 -#include <windows.h>
 -
 -#endif
 -
  #endif
 
- #endif /* __UTIL_OPTIMIZATION_H__ */
+ #endif
 diff -Naur blender/intern/cycles/util/util_types.h blender-pp/intern/cycles/util/util_types.h
 --- blender/intern/cycles/util/util_types.h	2014-01-14 08:17:57.658600000 +0400
 +++ blender-pp/intern/cycles/util/util_types.h	2014-01-14 08:47:39.800000000 +0400
@@ -210,14 +213,3 @@ diff -Naur blender/source/blender/blenlib/BLI_winstuff.h blender-pp/source/blend
  /* python uses HAVE_SSIZE_T */
  #  ifndef HAVE_SSIZE_T
  #    define HAVE_SSIZE_T 1
-diff -Naur blender/source/blender/blenlib/intern/rand.c blender-pp/source/blender/blenlib/intern/rand.c
---- blender/source/blender/blenlib/intern/rand.c	2014-01-14 08:18:15.661000000 +0400
-+++ blender-pp/source/blender/blenlib/intern/rand.c	2014-01-14 07:08:38.456800000 +0400
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-+#include <time.h>
-
- #include "MEM_guardedalloc.h"
-

mingw-w64-blender-git/mingw-DEBUG-dont-suffix-libs-with-_d.patch

@@ -0,0 +1,20 @@
+--- blender-2.72/build_files/cmake/macros.cmake.orig	2014-10-07 11:53:48.545534700 +0100
++++ blender-2.72/build_files/cmake/macros.cmake	2014-10-07 11:55:10.141534700 +0100
+@@ -294,7 +294,7 @@
+ 	if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
+ 		target_link_libraries(${target} ${PYTHON_LINKFLAGS})
+
+-		if(WIN32 AND NOT UNIX)
++		if(WIN32 AND NOT UNIX AND NOT MINGW)
+ 			file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
+ 			target_link_libraries_debug(${target} "${PYTHON_LIBRARIES_DEBUG}")
+ 			target_link_libraries_optimized(${target} "${PYTHON_LIBRARIES}")
+@@ -366,7 +366,7 @@
+ 		target_link_libraries(${target} ${FFMPEG_LIBRARIES})
+ 	endif()
+ 	if(WITH_OPENCOLLADA)
+-		if(WIN32 AND NOT UNIX)
++		if(WIN32 AND NOT UNIX AND NOT MINGW)
+ 			file_list_suffix(OPENCOLLADA_LIBRARIES_DEBUG "${OPENCOLLADA_LIBRARIES}" "_d")
+ 			target_link_libraries_debug(${target} "${OPENCOLLADA_LIBRARIES_DEBUG}")
+ 			target_link_libraries_optimized(${target} "${OPENCOLLADA_LIBRARIES}")

mingw-w64-blender-git/mingw-DEBUG-libmv-avoid-too-many-sections.patch

@@ -0,0 +1,12 @@
+--- blender-2.72/extern/libmv/CMakeLists.txt.orig	2014-10-07 11:57:07.942534700 +0100
++++ blender-2.72/extern/libmv/CMakeLists.txt	2014-10-07 11:36:50.624534700 +0100
+@@ -170,6 +170,9 @@
+ 	)
+
+ 	if(WIN32)
++		# To avoid ..\fundamental.cc.obj: too many sections (35985)
++		set_source_files_properties(libmv/multiview/fundamental.cc PROPERTIES COMPILE_FLAGS "-g0")
++		set_source_files_properties(libmv/simple_pipeline/resect.cc PROPERTIES COMPILE_FLAGS "-g0")
+ 		list(APPEND INC
+ 			third_party/glog/src/windows
+ 		)