- x32 builds with default setting again

- rel 2

diff --git a/blender.spec b/blender.spec
index c6a872b7fce2a56599230bbc36a62faea04fc87e..bc7ddeae30152ff1be72b02bdd9ecd1eb3498242 100644 (file)
--- a/blender.spec
+++ b/blender.spec
@@ -5,14 +5,13 @@ Summary:      3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):     Pakiet do tworzenia animacji 3D oraz gier
 Name:          blender
 Version:       2.82a
 Summary(pl.UTF-8):     Pakiet do tworzenia animacji 3D oraz gier
 Name:          blender
 Version:       2.82a

-Release:       1
+Release:       2

 License:       GPL
 Group:         X11/Applications/Graphics
 Source0:       http://download.blender.org/source/%{name}-%{version}.tar.xz
 # Source0-md5: 3e9d669185b83d5d2cb1b38dcf64d5ec
 Patch0:                %{name}-2.76-droid.patch
 Patch1:                format-security.patch
 License:       GPL
 Group:         X11/Applications/Graphics
 Source0:       http://download.blender.org/source/%{name}-%{version}.tar.xz
 # Source0-md5: 3e9d669185b83d5d2cb1b38dcf64d5ec
 Patch0:                %{name}-2.76-droid.patch
 Patch1:                format-security.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


@@ -73,9 +72,6 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

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

 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
       release/bin/blender-thumbnailer.py \
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
       release/bin/blender-thumbnailer.py \

diff --git a/struct-alignment.patch b/struct-alignment.patch
deleted file mode 100644 (file)
index c3c533a..0000000
--- a/struct-alignment.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 *_pad99;
- } View3DShading;
- 
- /** 3D Viewport Overlay settings. */