[SCM] blender/master: debian/patches/: patchset re-worked against v2.70a
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Mon May 19 07:47:30 UTC 2014
The following commit has been merged in the master branch:
commit b137b2b2621536b6b62dbd72e7a4ddf33194f1ff
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date: Sun May 18 17:07:16 2014 +0200
debian/patches/: patchset re-worked against v2.70a
- 0012-fix_FTBFS_due_to_SSE.patch added
- 0013-fix_FTBFS_on_kFreeBSD.patch added
Closes: #748322
Thanks: Sebastian Ramacher (sramacher) for the patch.
Closes: #748323
Thanks: Sergey Sharybin for the patch.
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index 9636d27..502acd6 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -25,7 +25,7 @@ index 0000000..05d4fae
+Exec=/usr/share/blender/scripts/blender-thumbnailer.py %i %o
+MimeType=application/x-blender;
diff --git a/release/bin/blender-thumbnailer.py b/release/bin/blender-thumbnailer.py
-index 91aeb7a..10b292f 100755
+index 779c615..dbcd865 100755
--- a/release/bin/blender-thumbnailer.py
+++ b/release/bin/blender-thumbnailer.py
@@ -1,4 +1,4 @@
@@ -35,7 +35,7 @@ index 91aeb7a..10b292f 100755
# ##### BEGIN GPL LICENSE BLOCK #####
#
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 4d12040..a99a9c6 100644
+index b8c97f8..726a254 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -453,7 +453,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0003-install_in_usr_share.patch b/debian/patches/0003-install_in_usr_share.patch
index 5693b28..a0402b0 100644
--- a/debian/patches/0003-install_in_usr_share.patch
+++ b/debian/patches/0003-install_in_usr_share.patch
@@ -9,7 +9,7 @@ Subject: install_in_usr_share
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index a99a9c6..52c4420 100644
+index 726a254..97c8d69 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -304,8 +304,8 @@ if(WITH_PYTHON)
diff --git a/debian/patches/0004-filter_docs_to_install.patch b/debian/patches/0004-filter_docs_to_install.patch
index 268e1e8..a41da0c 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0004-filter_docs_to_install.patch
@@ -8,7 +8,7 @@ Install only relevant documentation.
1 file changed, 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 52c4420..1abd078 100644
+index 97c8d69..19d408a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -234,8 +234,6 @@ else()
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
index e0d1935..44d0c25 100644
--- a/debian/patches/0005-locales_directory_install.patch
+++ b/debian/patches/0005-locales_directory_install.patch
@@ -81,7 +81,7 @@ index e56ac6f..8be23d6 100644
BLI_assert(0);
break;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 1abd078..0000316 100644
+index 19d408a..ca5b172 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -319,11 +319,11 @@ if(WITH_INTERNATIONAL)
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index 568bd68..ae06370 100644
--- a/debian/patches/0006-update_manpages.patch
+++ b/debian/patches/0006-update_manpages.patch
@@ -148,7 +148,7 @@ index 0000000..d15b0c9
+.SH AUTHORS
+This manpage was written for a Debian GNU/Linux by Kevin Roy <kiniou at gmail.com>.
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 0000316..96b3e17 100644
+index ca5b172..db3a7cd 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -392,6 +392,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0007-do_not_use_version_number_in_system_path.patch b/debian/patches/0007-do_not_use_version_number_in_system_path.patch
index 97e4759..293362a 100644
--- a/debian/patches/0007-do_not_use_version_number_in_system_path.patch
+++ b/debian/patches/0007-do_not_use_version_number_in_system_path.patch
@@ -30,7 +30,7 @@ index e2d9733..ec0e691 100644
if (static_path) {
static string system_path = string(static_path) + "/blender/" + versionstr;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 96b3e17..82a86fe 100644
+index db3a7cd..926072f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -257,7 +257,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
index c6f47c0..9d7a48d 100644
--- a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
@@ -18,10 +18,10 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
7 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3e7ac95..0f58189 100644
+index 169aeff..1feaa4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -663,6 +663,13 @@ if(UNIX AND NOT APPLE)
+@@ -667,6 +667,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -184,7 +184,7 @@ index 5572656..9c72300 100644
* Returns true if the file with the specified name can be written.
* This implementation uses access(2), which makes the check according
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 82a86fe..fbfe4be 100644
+index 926072f..b3082a5 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -316,12 +316,6 @@ endif()
diff --git a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
index 04390f7..790e1d4 100644
--- a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
+++ b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
@@ -8,10 +8,10 @@ Subject: fix_FTBFS_on_non-linux_architectures
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f58189..c0ee39f 100644
+index 1feaa4b..3db7971 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -931,6 +931,9 @@ if(UNIX AND NOT APPLE)
+@@ -935,6 +935,9 @@ if(UNIX AND NOT APPLE)
endif()
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread")
diff --git a/debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch b/debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch
index 288e085..a287381 100644
--- a/debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch
+++ b/debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch
@@ -7,7 +7,7 @@ Subject: fix_FTBFS_on_unofficial_64bit_archs
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
-index b5a73b1..9f506a6 100644
+index b5a73b1..bb55ac1 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -61,7 +61,7 @@
diff --git a/debian/patches/0012-fix_FTBFS_due_to_SSE.patch b/debian/patches/0012-fix_FTBFS_due_to_SSE.patch
new file mode 100644
index 0000000..aaaeef8
--- /dev/null
+++ b/debian/patches/0012-fix_FTBFS_due_to_SSE.patch
@@ -0,0 +1,111 @@
+From: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Fri, 16 May 2014 08:45:06 +0200
+Subject: fix_FTBFS_due_to_SSE
+
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
+---
+ intern/cycles/CMakeLists.txt | 38 ++++++++++++++++++++++++++-----------
+ intern/cycles/kernel/CMakeLists.txt | 22 +++++++++++++--------
+ 2 files changed, 41 insertions(+), 19 deletions(-)
+
+diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
+index 5c8d68b..3c9b402 100644
+--- a/intern/cycles/CMakeLists.txt
++++ b/intern/cycles/CMakeLists.txt
+@@ -13,8 +13,11 @@ include(cmake/external_libs.cmake)
+
+ # Build Flags
+ # todo: refactor this code to match scons
++# note: CXX_HAS_SSE is needed in case passing SSE flags fails altogether (gcc-arm)
+
+ if(WIN32 AND MSVC)
++ set(CXX_HAS_SSE TRUE)
++
+ # /arch:AVX for VC2012 and above
+ if(NOT MSVC_VERSION LESS 1700)
+ set(CYCLES_AVX_ARCH_FLAGS "/arch:AVX")
+@@ -40,20 +43,33 @@ 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(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
++ check_cxx_compiler_flag(-msse CXX_HAS_SSE)
++ if(CXX_HAS_SSE)
++ 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(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
++ endif()
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+- set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2")
+- set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3")
+- set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1")
+- set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
++ check_cxx_compiler_flag(-msse CXX_HAS_SSE)
++ if(CXX_HAS_SSE)
++ set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2")
++ set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3")
++ set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1")
++ set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
++ endif()
+ endif()
+
+-add_definitions(-DWITH_KERNEL_SSE2 -DWITH_KERNEL_SSE3 -DWITH_KERNEL_SSE41 -DWITH_KERNEL_AVX)
++if(CXX_HAS_SSE)
++ add_definitions(
++ -DWITH_KERNEL_SSE2
++ -DWITH_KERNEL_SSE3
++ -DWITH_KERNEL_SSE41
++ -DWITH_KERNEL_AVX
++ )
++endif()
+
+ # for OSL
+ if(WIN32 AND MSVC)
+diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
+index cbe0d4b..19aebb3 100644
+--- a/intern/cycles/kernel/CMakeLists.txt
++++ b/intern/cycles/kernel/CMakeLists.txt
+@@ -12,10 +12,6 @@ set(INC_SYS
+
+ set(SRC
+ kernel.cpp
+- kernel_sse2.cpp
+- kernel_sse3.cpp
+- kernel_sse41.cpp
+- kernel_avx.cpp
+ kernel.cl
+ kernel.cu
+ )
+@@ -195,10 +191,20 @@ endif()
+ include_directories(${INC})
+ include_directories(SYSTEM ${INC_SYS})
+
+-set_source_files_properties(kernel_sse2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE2_KERNEL_FLAGS}")
+-set_source_files_properties(kernel_sse3.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE3_KERNEL_FLAGS}")
+-set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}")
+-set_source_files_properties(kernel_avx.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
++if(CXX_HAS_SSE)
++ list(APPEND SRC
++ kernel_sse2.cpp
++ kernel_sse3.cpp
++ kernel_sse41.cpp
++ kernel_avx.cpp
++ )
++
++ set_source_files_properties(kernel_sse2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE2_KERNEL_FLAGS}")
++ set_source_files_properties(kernel_sse3.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE3_KERNEL_FLAGS}")
++ set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}")
++ set_source_files_properties(kernel_avx.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
++endif()
++
+
+ add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_SVM_HEADERS})
+
diff --git a/debian/patches/0013-fix_FTBFS_on_kFreeBSD.patch b/debian/patches/0013-fix_FTBFS_on_kFreeBSD.patch
new file mode 100644
index 0000000..ffe402a
--- /dev/null
+++ b/debian/patches/0013-fix_FTBFS_on_kFreeBSD.patch
@@ -0,0 +1,21 @@
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Sun, 18 May 2014 17:06:20 +0200
+Subject: fix_FTBFS_on_kFreeBSD
+
+---
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
+index db45b59..1290f5a 100644
+--- a/intern/guardedalloc/intern/mallocn_intern.h
++++ b/intern/guardedalloc/intern/mallocn_intern.h
+@@ -51,7 +51,7 @@
+
+ #undef HAVE_MALLOC_STATS
+
+-#if defined(__linux__)
++#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__))
+ # include <malloc.h>
+ # define HAVE_MALLOC_STATS
+ #elif defined(__FreeBSD__)
diff --git a/debian/patches/series b/debian/patches/series
index f217945..4a6baa0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@
0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
0010-fix_FTBFS_on_non-linux_architectures.patch
0011-fix_FTBFS_on_unofficial_64bit_archs.patch
+0012-fix_FTBFS_due_to_SSE.patch
+0013-fix_FTBFS_on_kFreeBSD.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list