openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package blender (Revision 639cb19869a1ba7179bd36b534d92689)

Currently displaying revision 639cb19869a1ba7179bd36b534d92689 , Show latest

--- blender.changes.orig
+++ blender.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Jun 17 06:18:04 UTC 2016 - adrian@suse.de
+
+- use sse compiler options only on supported architectures
+- fix build on ppc by skipping colormanagement
+- drop SUPPORT_SSE2_BUILD since it is not used by cmake anymore
+
+-------------------------------------------------------------------
 Mon Jun  6 14:19:07 UTC 2016 - davejplater@gmail.com
 
 - Moved %{_datadir}/%{name}/%{_version}/datafiles/ back to main
--- blender.spec.orig
+++ blender.spec
@@ -121,11 +121,8 @@ BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(libxml-2.0)
 # See bnc#713346
 Requires:       python3-numpy
-Requires:       python3-xml
-%if 0%{?suse_version} > 1320
 Requires:       python3-requests
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       python3-xml
 %if 0%{?suse_version} > 1210
 BuildRequires:  libGLw-devel
 BuildRequires:  libGLw1
@@ -153,6 +150,7 @@ BuildRequires:  pkgconfig(audaspace)
 BuildRequires:  OpenColorIO-devel
 BuildRequires:  OpenImageIO-devel
 %endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Blender is a 3D modelling and rendering package. It is the in-house
@@ -216,8 +214,8 @@ rm -rf extern/verse
 echo %{_version}
 
 %build
-# sse options not supported by PowerPC
-%ifnarch ppc ppc64 ppc64le
+# sse options only on supported archs
+%ifarch %{ix86} x86_64
 sseflags='-msse -msse2'
 %endif
 # Find python3 version and abiflags
@@ -279,7 +277,6 @@ cmake ../ -DBUILD_SHARED_LIBS:BOOL=off \
       -DWITH_SDL:BOOL=ON \
       -DWITH_SDL_DYNLOAD:BOOL=on \
 %ifnarch x86_64
-      -DSUPPORT_SSE2_BUILD=false \
       -DWITH_RAYOPTIMIZATION:BOOL=OFF \
       -DWITH_MOD_OCEANSIM:BOOL=OFF \
 %else
@@ -414,7 +411,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/%{_version}
 %dir %{_datadir}/%{name}/%{_version}/datafiles
+%ifnarch ppc %power64
 %{_datadir}/%{name}/%{_version}/datafiles/colormanagement/
+%endif
 %{_datadir}/%{name}/%{_version}/scripts/
 %{_datadir}/applications/blender.desktop
 %{_datadir}/applications/x-blend.desktop

Places

File project.diff of Package blender (Revision 639cb19869a1ba7179bd36b534d92689)

Places