[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#757344: wheezy-pu: package blender/2.63a-1



On 2014-08-07 at 10:29 (CEST), Matteo F. Vescovi wrote:
> Attached, you'll find this famous patch that should fix the issue.
  
Probably, a debdiff would be much more appreciated ;-)

So, attached.

Cheers.

-- 
Matteo F. Vescovi | Debian Maintainer
GnuPG KeyID: 4096R/0x8062398983B2CF7A
diff -Nru blender-2.63a/debian/changelog blender-2.63a/debian/changelog
--- blender-2.63a/debian/changelog	2012-05-12 20:02:24.000000000 +0200
+++ blender-2.63a/debian/changelog	2014-08-07 14:47:56.000000000 +0200
@@ -1,3 +1,11 @@
+blender (2.63a-1+deb7u1) stable; urgency=low
+
+  * debian/patches/: patchset updated
+    - 0010-fix_illegal_hardware_instruction_due_to_SSE2.patch added
+      to fix the "illegal hardware instruction" failure due to SSE2
+
+ -- Matteo F. Vescovi <mfv.debian@gmail.com>  Thu, 07 Aug 2014 14:19:06 +0200
+
 blender (2.63a-1) unstable; urgency=low
 
   * New upstream bugfix release
diff -Nru blender-2.63a/debian/patches/0010-fix_illegal_hardware_instruction_due_to_SSE2.patch blender-2.63a/debian/patches/0010-fix_illegal_hardware_instruction_due_to_SSE2.patch
--- blender-2.63a/debian/patches/0010-fix_illegal_hardware_instruction_due_to_SSE2.patch	1970-01-01 01:00:00.000000000 +0100
+++ blender-2.63a/debian/patches/0010-fix_illegal_hardware_instruction_due_to_SSE2.patch	2014-08-06 16:18:29.000000000 +0200
@@ -0,0 +1,81 @@
+From: Johann Klammer <klammerj@a1.net>
+Date: Wed, 13 Feb 2013 09:04:08 +0100
+Subject: fix_illegal_hardware_instruction_due_to_SSE2
+
+This makes sure it builds compatible binaries also on
+machines which have sse/sse2. Fixes the SIGILL bug.
+Checks for DEB_HOST_ARCH_CPU!=i386 before tests are attempted.
+Will try to use SSE/SSE2 on all other architectures.
+Generated Code will still need MMX support to run.
+
+Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com>
+---
+ build_files/cmake/macros.cmake | 49 +++++++++++++++++++++++-------------------
+ 1 file changed, 27 insertions(+), 22 deletions(-)
+
+diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
+index e4ac326..b172c81 100644
+--- a/build_files/cmake/macros.cmake
++++ b/build_files/cmake/macros.cmake
+@@ -446,34 +446,39 @@ macro(TEST_SSE_SUPPORT
+ 
+ 	set(CMAKE_REQUIRED_FLAGS "${${_sse_flags}} ${${_sse2_flags}}")
+ 
+-	if(NOT DEFINED SUPPORT_SSE_BUILD)
+-		# result cached
+-		check_c_source_runs("
+-			#include <xmmintrin.h>
+-			int main(void) { __m128 v = _mm_setzero_ps(); return 0; }"
+-		SUPPORT_SSE_BUILD)
+-
+-		if(SUPPORT_SSE_BUILD)
+-			message(STATUS "SSE Support: detected.")
+-		else()
+-			message(STATUS "SSE Support: missing.")
++	if(NOT ( $ENV{DEB_HOST_ARCH_CPU} STREQUAL "i386" ) )
++
++		if(NOT DEFINED SUPPORT_SSE_BUILD)
++			# result cached
++			check_c_source_runs("
++				#include <xmmintrin.h>
++				int main(void) { __m128 v = _mm_setzero_ps(); return 0; }"
++			SUPPORT_SSE_BUILD)
++
++			if(SUPPORT_SSE_BUILD)
++				message(STATUS "SSE Support: detected.")
++			else()
++				message(STATUS "SSE Support: missing.")
++			endif()
+ 		endif()
+-	endif()
+ 
+-	if(NOT DEFINED SUPPORT_SSE2_BUILD)
+-		# result cached
+-		check_c_source_runs("
++		if(NOT DEFINED SUPPORT_SSE2_BUILD)
++			# result cached
++			check_c_source_runs("
+ 			#include <emmintrin.h>
+-			int main(void) { __m128d v = _mm_setzero_pd(); return 0; }"
+-		SUPPORT_SSE2_BUILD)
++				int main(void) { __m128d v = _mm_setzero_pd(); return 0; }"
++			SUPPORT_SSE2_BUILD)
+ 
+-		if(SUPPORT_SSE2_BUILD)
+-			message(STATUS "SSE2 Support: detected.")
+-		else()
+-			message(STATUS "SSE2 Support: missing.")
++			if(SUPPORT_SSE2_BUILD)
++				message(STATUS "SSE2 Support: detected.")
++			else()
++				message(STATUS "SSE2 Support: missing.")
++			endif()
+ 		endif()
++	else()
++		message(STATUS "SSE Support: missing.")
++		message(STATUS "SSE2 Support: missing.")
+ 	endif()
+-
+ 	unset(CMAKE_REQUIRED_FLAGS)
+ endmacro()
+ 
diff -Nru blender-2.63a/debian/patches/series blender-2.63a/debian/patches/series
--- blender-2.63a/debian/patches/series	2012-05-12 20:00:33.000000000 +0200
+++ blender-2.63a/debian/patches/series	2014-08-06 16:20:40.000000000 +0200
@@ -7,3 +7,4 @@
 0007-fix_FTBFS_with_ffmpeg_from_debian.patch
 0008-do_not_use_version_number_in_the_system_path.patch
 0009-look_for_droid_ttf_with_fontconfig.patch
+0010-fix_illegal_hardware_instruction_due_to_SSE2.patch

Attachment: signature.asc
Description: Digital signature


Reply to: