blender: Fix debug build.

This commit is contained in:
Alexey Pavlov
2018-05-11 14:03:10 +03:00
parent 8f5a8144a7
commit af1573dafb
2 changed files with 15 additions and 1 deletions

View File

@@ -0,0 +1,11 @@
--- blender-2.79b/source/blender/imbuf/intern/openexr/openexr_api.cpp.orig 2018-05-11 10:10:42.876493200 +0300
+++ blender-2.79b/source/blender/imbuf/intern/openexr/openexr_api.cpp 2018-05-11 10:10:49.927705600 +0300
@@ -77,7 +77,7 @@
{
// The following prevents a linking error in debug mode for MSVC using the libs in CVS
-#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && _MSC_VER < 1900
+#if defined(WITH_OPENEXR) && defined(_MSC_VER) && defined(DEBUG) && _MSC_VER < 1900
_CRTIMP void __cdecl _invalid_parameter_noinfo(void)
{
}

View File

@@ -18,7 +18,7 @@ _minorchar=b
} || {
pkgver=${_basever}.${_minorchar}
}
pkgrel=1
pkgrel=2
pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)"
arch=('any')
license=('GPL')
@@ -69,6 +69,7 @@ source=(https://download.blender.org/source/${_realname}-${_basever}${_minorchar
0015-mingw-python-like-msvc.patch
0016-mingw-windres.patch
0017-find-pugixml.patch
0018-msvc-stuff.patch
0100-ffmpeg-4-compatibility.patch)
sha256sums=('4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc'
'5f654367edbdadeae5cb54acd27b5d62788ce4463f6aca8ed973b7c7b43a6069'
@@ -87,6 +88,7 @@ sha256sums=('4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc'
'0e5536cc4e9c571846cce47b6ee5c57807d8c17b20c4b0565c2efb6fab9b8c76'
'375535461c8dacd215ca79f7a350f6d4ca8ef48fa97c517363ec3fae640c0472'
'5ce05eed73408045c78cd1be262393b2c6815b77dd2979964a8090e00a3ce5ac'
'aae1bafccfd9492197139f2c26dfb4e61fa665acb1bdd569d06ce043b5e9810b'
'52c9c20fef6e4570d36c266737412121dd7d52d2f5032635d524e042aa2a943f')
prepare() {
@@ -108,6 +110,7 @@ prepare() {
patch -p1 -i "${srcdir}"/0015-mingw-python-like-msvc.patch
patch -p1 -i "${srcdir}"/0016-mingw-windres.patch
patch -p1 -i "${srcdir}"/0017-find-pugixml.patch
patch -p1 -i "${srcdir}"/0018-msvc-stuff.patch
patch -p0 -i "${srcdir}"/0100-ffmpeg-4-compatibility.patch
}