From a8b7b1b9070064bacbad950aeb7a318a34a6b1ea Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Mar 24 2014 16:09:17 +0000 Subject: Add patch to fix issue with unsupported CFLAGS on armv7hl --- diff --git a/blender-2.70-arm.patch b/blender-2.70-arm.patch new file mode 100644 index 0000000..858f211 --- /dev/null +++ b/blender-2.70-arm.patch @@ -0,0 +1,18 @@ +diff -up blender-2.70/intern/cycles/CMakeLists.txt.arm blender-2.70/intern/cycles/CMakeLists.txt +--- blender-2.70/intern/cycles/CMakeLists.txt.arm 2014-03-24 16:21:38.499355984 +0100 ++++ blender-2.70/intern/cycles/CMakeLists.txt 2014-03-24 16:47:57.066005719 +0100 +@@ -40,10 +40,10 @@ if(WIN32 AND MSVC) + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox") + set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Ox") + elseif(CMAKE_COMPILER_IS_GNUCC) +- set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2 -mfpmath=sse") +- set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse") +- set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mfpmath=sse") +- set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mfpmath=sse") ++ set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math") ++ set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math") ++ set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math") ++ set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2") diff --git a/blender.spec b/blender.spec index 1f28098..4047cc0 100644 --- a/blender.spec +++ b/blender.spec @@ -16,7 +16,7 @@ Name: blender Epoch: 1 Version: %{blender_api} -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -31,6 +31,7 @@ Source5: blender.xml Source10: macros.blender Patch2: blender-2.68a-droid.patch +Patch3: blender-2.70-arm.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -102,8 +103,6 @@ Requires: blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release} Provides: blender(ABI) = %{blender_api} -ExcludeArch: armv7hl - %description Blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback. @@ -149,6 +148,9 @@ sets. %setup -q %patch2 -p1 -b .droid +%ifarch armv7hl +%patch3 -p1 -b .arm +%endif find -name '.svn' -print | xargs rm -rf @@ -294,6 +296,9 @@ fi || : %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt %changelog +* Mon Mar 24 2014 Jochen Schmitt - 1:2.70-2 +- Add patch to fix issue with unsupported CFLAGS on armv7hl + * Thu Mar 20 2014 Jochen Schmitt - 1:2.70-1 - New upstream releasw - Exclude armv7hl