[SCM] blender/master: debian/patches/: patchset updated

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fce9104b648ad2d81fc82362eb9f377c6eb5641d
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date:   Mon Aug 4 14:47:02 2014 +0200

    debian/patches/: patchset updated
    
    - 0008-fix_illegal_hardware_instruction_due_to_SSE2.patch dropped
      (a better solution was found upstream, so this patch has become
       obsolete in this new release)
    - 0009-fix_FTBFS_on_unofficial_64bit_archs.patch => #0008

diff --git a/debian/patches/0009-fix_FTBFS_on_unofficial_64bit_archs.patch b/debian/patches/0008-fix_FTBFS_on_unofficial_64bit_archs.patch
similarity index 100%
rename from debian/patches/0009-fix_FTBFS_on_unofficial_64bit_archs.patch
rename to debian/patches/0008-fix_FTBFS_on_unofficial_64bit_archs.patch
diff --git a/debian/patches/0008-fix_illegal_hardware_instruction_due_to_SSE2.patch b/debian/patches/0008-fix_illegal_hardware_instruction_due_to_SSE2.patch
deleted file mode 100644
index 99a87f0..0000000
--- a/debian/patches/0008-fix_illegal_hardware_instruction_due_to_SSE2.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Johann Klammer <klammerj at 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 at 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 f19c23f..31e5f6d 100644
---- a/build_files/cmake/macros.cmake
-+++ b/build_files/cmake/macros.cmake
-@@ -683,34 +683,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 --git a/debian/patches/series b/debian/patches/series
index 15696e9..d19ccb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,4 @@
 0005-update_manpages.patch
 0006-do_not_use_version_number_in_system_path.patch
 0007-look_for_droid_ttf_with_fontconfig.patch
-0008-fix_illegal_hardware_instruction_due_to_SSE2.patch
-0009-fix_FTBFS_on_unofficial_64bit_archs.patch
+0008-fix_FTBFS_on_unofficial_64bit_archs.patch

-- 
blender packaging