- up to 2.81a

diff --git a/blender.spec b/blender.spec
index 33ee41488ffb7e92b35bdd022e10040d9ed4694a..a68b388c71bf0a31267a4f13456eb78cd8fe3192 100644 (file)
--- a/blender.spec
+++ b/blender.spec
@@ -4,15 +4,16 @@
 Summary:       3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):     Pakiet do tworzenia animacji 3D oraz gier
 Name:          blender
 Summary:       3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):     Pakiet do tworzenia animacji 3D oraz gier
 Name:          blender

-Version:       2.80
-Release:       3
+Version:       2.81a
+Release:       1

 License:       GPL
 Group:         X11/Applications/Graphics
 License:       GPL
 Group:         X11/Applications/Graphics

-Source0:       http://download.blender.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 30dedaf688741d0d5d6fa1e3c331610c
+Source0:       http://download.blender.org/source/%{name}-%{version}.tar.xz
+# Source0-md5: fd106a2c3debfd215617d31197883173

 Patch0:                %{name}-2.76-droid.patch
 Patch1:                format-security.patch
 Patch2:                python-3.8.patch
 Patch0:                %{name}-2.76-droid.patch
 Patch1:                format-security.patch
 Patch2:                python-3.8.patch

+Patch3:                struct-alignment.patch

 URL:           http://www.blender.org/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenColorIO-devel
 URL:           http://www.blender.org/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenColorIO-devel


@@ -74,6 +75,9 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

+%ifarch x32
+%patch3 -p1
+%endif

 
 %build
 install -d build
 
 %build
 install -d build

diff --git a/struct-alignment.patch b/struct-alignment.patch
new file mode 100644 (file)
index 0000000..64c460e
--- /dev/null
+++ b/struct-alignment.patch
@@ -0,0 +1,20 @@
+--- blender-2.81a/source/blender/makesdna/DNA_gpencil_types.h~ 2019-12-14 15:25:53.000000000 +0100
++++ blender-2.81a/source/blender/makesdna/DNA_gpencil_types.h  2019-12-14 15:25:55.905953908 +0100
+@@ -223,7 +223,6 @@
+ 
+   /** Vertex weight data. */
+   struct MDeformVert *dvert;
+-  void *_pad3;
+ 
+   bGPDstroke_Runtime runtime;
+ } bGPDstroke;
+--- blender-2.81a/source/blender/makesdna/DNA_view3d_types.h~  2019-12-14 15:41:30.000000000 +0100
++++ blender-2.81a/source/blender/makesdna/DNA_view3d_types.h   2019-12-14 15:42:53.605920053 +0100
+@@ -180,6 +180,7 @@
+   float curvature_valley_factor;
+ 
+   struct IDProperty *prop;
++  void *_pad2;
+ } View3DShading;
+ 
+ /** 3D Viewport Overlay settings. */