Bug#763755: blender: SIGILL on startup

[Johann Klammer]

On 10/10/2014 09:47 AM, Matteo F. Vescovi wrote:
> 
> Then, feel free to provide an updated patch. I'll give it a try.
Here. but it's against the .71, and looks pretty much the same as the
earlier one. I don't have enough free space to dare the pbuilder thing.
I also added that architecture.mk mentioned earlier.

-------------- next part --------------
Description: as usual
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 blender (2.71+dfsg1-2) UNRELEASED; urgency=medium
 .
   * change rules file to set architecture flags
Author: Johann Klammer <klammerj at a1.net>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- blender-2.71+dfsg1.orig/build_files/cmake/macros.cmake
+++ blender-2.71+dfsg1/build_files/cmake/macros.cmake
@@ -446,34 +446,42 @@ 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("
-			#include <emmintrin.h>
-			int main(void) { __m128d v = _mm_setzero_pd(); return 0; }"
-		SUPPORT_SSE2_BUILD)
+		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)
 
-		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()
 
-------------- next part --------------
#!/usr/bin/make -f

#they say I should not rely on DEB_HOST_ARCH being correctly set automagically, and do this to be sure...
include /usr/share/dpkg/architecture.mk

export REPACK_SH=$(CURDIR)/debian/repack.sh

INSTDIR = debian/tmp
PY3VERS = $(shell py3versions -dv)
SRC_VER = $(shell uscan --report | grep blender-.* | sed 's/^.*-//' | sed 's/\.tar.*$$//')

get-orig-source:
	uscan --force-download --repack --compression xz
	$(REPACK_SH) --upstream-version $(SRC_VER) ../blender_$(SRC_VER).orig.tar.xz

override_dh_auto_configure:
	dh_auto_configure -- \
		-DCMAKE_INSTALL_PREFIX=/usr \
		-DCMAKE_SKIP_RPATH=ON \
		-DCMAKE_VERBOSE_MAKEFILE=ON \
		-DFREETYPE_INCLUDE_DIRS="/usr/include/freetype2" \
		-DPYTHON_VERSION=$(PY3VERS) \
		-DWITH_IMAGE_OPENJPEG=ON \
		-DWITH_FFTW3=ON \
		-DWITH_JACK=ON \
		-DWITH_PLAYER=ON \
		-DWITH_INSTALL_PORTABLE=OFF \
		-DWITH_PYTHON_INSTALL=OFF \
		-DWITH_CODEC_FFMPEG=ON \
		-DWITH_CODEC_SNDFILE=ON \
		-DWITH_FONTCONFIG=ON \
		-DWITH_MOD_OCEANSIM=ON \
		-DWITH_CYCLES=ON

override_dh_auto_install:
	dh_auto_install --buildsystem=cmake
	find $(INSTDIR)/usr/share/blender/ -type d -empty -delete
	rm $(INSTDIR)/usr/share/doc/blender/LICENSE-droidsans.ttf.txt
	rm $(INSTDIR)/usr/share/doc/blender/LICENSE-bmonofont-i18n.ttf.txt
	rm $(INSTDIR)/usr/share/doc/blender/readme.html

override_dh_install:
	dh_install --fail-missing --list-missing

override_dh_strip:
	dh_strip --dbg-package=blender-dbg

override_dh_auto_test:

%:
	dh $@ --buildsystem=cmake --parallel --with python3