From 97bc93664ff59b8724b31946eefc178de9dd5841 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Tue, 17 Dec 2019 23:32:11 -0500
Subject: [blender]: add arm struct alignment patch

---
 libre/blender/PKGBUILD                | 11 +++++++++--
 libre/blender/arm-align-structs.patch | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 libre/blender/arm-align-structs.patch

(limited to 'libre/blender')

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index e9cb5c1c2..95a956b97 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -33,15 +33,17 @@ url="http://www.blender.org"
 depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requests'
          'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg' 'python-numpy'
          'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic'
-         'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage' 'openimagedenoise'
+         'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
          'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2')
+depends_x86_64=('openimagedenoise')
 makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'ninja')
 options=(!strip)
 source=("git://git.blender.org/blender-addons.git"
         "git://git.blender.org/blender-addons-contrib.git"
         "git://git.blender.org/blender-translations.git"
         "git://git.blender.org/blender-dev-tools.git"
-        arm-no-sse2.patch)
+        arm-no-sse2.patch
+        arm-align-structs.patch)
 
 if [[ -n $_gittag ]]; then
     source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
@@ -53,6 +55,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             '13890f9cd11ca20bcb6f12206c990e25c0d08699feab0fca37607d847d2aebd2d2f423023986e120eaaeb0beca9a440a4d42007dcac2054fe6cdaf745de43402'
+            '9c708578f3efb9faca444ca69efad1343c09697601ded97a05b7227e55f0347efc69bafa52452e06b73480b5041fad966b6aa64cbdcd2458cf734281acf68f78'
             'SKIP')
 
 prepare() {
@@ -70,6 +73,10 @@ prepare() {
 
   patch -Np1 -i "$srcdir"/arm-no-sse2.patch
 
+  # error: static assertion failed: "DNA struct size verify"
+  # https://devtalk.blender.org/t/raspbian-blender-as-a-python-module-build-errors/10473/8
+  patch -Np1 -i "$srcdir"/arm-align-structs.patch
+
   mkdir build
 }
 
diff --git a/libre/blender/arm-align-structs.patch b/libre/blender/arm-align-structs.patch
new file mode 100644
index 000000000..c7b030ecc
--- /dev/null
+++ b/libre/blender/arm-align-structs.patch
@@ -0,0 +1,22 @@
+diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
+index 33dfe66a151..5cf86164920 100644
+--- a/source/blender/makesdna/DNA_gpencil_types.h
++++ b/source/blender/makesdna/DNA_gpencil_types.h
+@@ -226,6 +226,7 @@ typedef struct bGPDstroke {
+   void *_pad3;
+
+   bGPDstroke_Runtime runtime;
++  void *_pad4;
+ } bGPDstroke;
+
+ /* bGPDstroke->flag */
+diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
+index 7cfd19b4bd9..4b989e52f81 100644
+--- a/source/blender/makesdna/DNA_scene_types.h
++++ b/source/blender/makesdna/DNA_scene_types.h
+@@ -1796,6 +1796,7 @@ typedef struct Scene {
+
+   struct SceneDisplay display;
+   struct SceneEEVEE eevee;
++  void *_pad9;
+ } Scene;
-- 
cgit v1.2.3