[SCM] blender/master: debian/patches/: patchset re-worked against v2.71
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Sat Jul 26 08:17:31 UTC 2014
The following commit has been merged in the master branch:
commit 69c5d7baae2b8fd13706f0fcdd3e0b01d9ad327c
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date: Thu Jul 24 11:31:31 2014 +0200
debian/patches/: patchset re-worked against v2.71
- 0001-blender_thumbnailer.patch refreshed
- 0002-disable_tests.patch dropped (obsolete)
- #0003 => #0009 renumbered back by 1
- 0011-fix_FTBFS_on_unofficial_64bit_archs.patch renamed to #0009
- 0010-fix_FTBFS_on_non-linux_architectures.patch dropped (applied upstream)
- 0012-fix_FTBFS_due_to_SSE.patch dropped (applied upstream)
Closes: #752160, #752315
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index 502acd6..09323af 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -1,5 +1,5 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Mon, 24 Feb 2014 17:43:49 +0100
+Date: Wed, 23 Jul 2014 11:12:17 +0200
Subject: blender_thumbnailer
* Move thumbnailer script to an appropriate destination
@@ -35,10 +35,10 @@ index 779c615..dbcd865 100755
# ##### BEGIN GPL LICENSE BLOCK #####
#
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index b8c97f8..726a254 100644
+index f263043..9d22621 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -453,7 +453,7 @@ if(UNIX AND NOT APPLE)
+@@ -465,7 +465,7 @@ if(UNIX AND NOT APPLE)
)
install(
PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
@@ -46,4 +46,4 @@ index b8c97f8..726a254 100644
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts
)
install(
- FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
+ FILES ${TARGETDIR}/blender.1
diff --git a/debian/patches/0002-disable_tests.patch b/debian/patches/0002-disable_tests.patch
deleted file mode 100644
index f1081a0..0000000
--- a/debian/patches/0002-disable_tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Kevin Roy <kiniou at gmail.com>
-Date: Tue, 5 Nov 2013 16:56:45 +0100
-Subject: disable_tests
-
-Added WITH_TESTS condition to implicitly disable.
----
- source/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index 391fdf4..691a411 100644
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -29,4 +29,6 @@ if(WITH_GAMEENGINE)
- add_subdirectory(gameengine)
- endif()
-
--add_subdirectory(tests)
-+if(WITH_TESTS)
-+ add_subdirectory(tests)
-+endif()
diff --git a/debian/patches/0003-install_in_usr_share.patch b/debian/patches/0002-install_in_usr_share.patch
similarity index 81%
rename from debian/patches/0003-install_in_usr_share.patch
rename to debian/patches/0002-install_in_usr_share.patch
index a0402b0..efeba01 100644
--- a/debian/patches/0003-install_in_usr_share.patch
+++ b/debian/patches/0002-install_in_usr_share.patch
@@ -2,17 +2,17 @@ From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
Date: Mon, 24 Feb 2014 17:45:50 +0100
Subject: install_in_usr_share
- * Arch-specific files go to /usr/share
- * Make blender look for systemdir into /usr/share
+* Arch-specific files go to /usr/share
+* Make blender look for systemdir into /usr/share
---
source/creator/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 726a254..97c8d69 100644
+index 9d22621..dded81b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -304,8 +304,8 @@ if(WITH_PYTHON)
+@@ -307,8 +307,8 @@ if(WITH_PYTHON)
endif()
install(
diff --git a/debian/patches/0004-filter_docs_to_install.patch b/debian/patches/0003-filter_docs_to_install.patch
similarity index 92%
rename from debian/patches/0004-filter_docs_to_install.patch
rename to debian/patches/0003-filter_docs_to_install.patch
index a41da0c..85606b6 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0003-filter_docs_to_install.patch
@@ -8,10 +8,10 @@ Install only relevant documentation.
1 file changed, 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 97c8d69..19d408a 100644
+index dded81b..c2d4f82 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -234,8 +234,6 @@ else()
+@@ -237,8 +237,6 @@ else()
endif()
set(BLENDER_TEXT_FILES
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0004-locales_directory_install.patch
similarity index 89%
rename from debian/patches/0005-locales_directory_install.patch
rename to debian/patches/0004-locales_directory_install.patch
index 44d0c25..aff9377 100644
--- a/debian/patches/0005-locales_directory_install.patch
+++ b/debian/patches/0004-locales_directory_install.patch
@@ -16,10 +16,10 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
-index 623d8b7..37c9c2a 100644
+index 2852b81..61c3ef1 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
-@@ -78,9 +78,9 @@ static void free_locales(void)
+@@ -77,9 +77,9 @@ static void free_locales(void)
num_locales = num_locales_menu = 0;
}
@@ -31,7 +31,7 @@ index 623d8b7..37c9c2a 100644
char languages[FILE_MAX];
LinkNode *lines = NULL, *line;
char *str;
-@@ -88,7 +88,7 @@ static void fill_locales(void)
+@@ -87,7 +87,7 @@ static void fill_locales(void)
free_locales();
@@ -40,7 +40,7 @@ index 623d8b7..37c9c2a 100644
line = lines = BLI_file_read_as_lines(languages);
/* This whole "parsing" code is a bit weak, in that it expects strictly formated input file...
-@@ -188,11 +188,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
+@@ -187,11 +187,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
void BLF_lang_init(void)
{
#ifdef WITH_INTERNATIONAL
@@ -55,7 +55,7 @@ index 623d8b7..37c9c2a 100644
else {
printf("%s: 'locale' data path for translations not found, continuing\n", __func__);
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
-index efc5731..9774af2 100644
+index 244c308..9fe30c1 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -62,6 +62,7 @@ const char *BLI_get_folder_version(const int id, const int ver, const bool do_ch
@@ -67,10 +67,10 @@ index efc5731..9774af2 100644
/* for BLI_get_folder_version only */
#define BLENDER_RESOURCE_PATH_USER 0
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
-index e56ac6f..8be23d6 100644
+index 0b89ec1..54fd478 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -1210,6 +1210,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder)
+@@ -1367,6 +1367,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder)
if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break;
return NULL;
@@ -81,10 +81,10 @@ index e56ac6f..8be23d6 100644
BLI_assert(0);
break;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 19d408a..ca5b172 100644
+index c2d4f82..26474f6 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -319,11 +319,11 @@ if(WITH_INTERNATIONAL)
+@@ -322,11 +322,11 @@ if(WITH_INTERNATIONAL)
install(
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/fonts
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0005-update_manpages.patch
similarity index 84%
rename from debian/patches/0006-update_manpages.patch
rename to debian/patches/0005-update_manpages.patch
index ae06370..56bd12f 100644
--- a/debian/patches/0006-update_manpages.patch
+++ b/debian/patches/0005-update_manpages.patch
@@ -1,21 +1,23 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Tue, 21 Feb 2012 21:34:30 +0100
+Date: Wed, 23 Jul 2014 11:47:56 +0200
Subject: update_manpages
- * Update blender manpage with current version.
- * Add blenderplayer manpage.
+* Update blender manpage with current version.
+* Add blenderplayer manpage.
+
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
- doc/manpage/blenderplayer.1 | 131 ++++++++++++++++++++++++++++++++++++++++++
- source/creator/CMakeLists.txt | 5 +-
- 2 files changed, 135 insertions(+), 1 deletion(-)
+ doc/manpage/blenderplayer.1 | 132 ++++++++++++++++++++++++++++++++++++++++++
+ source/creator/CMakeLists.txt | 5 ++
+ 2 files changed, 137 insertions(+)
create mode 100644 doc/manpage/blenderplayer.1
diff --git a/doc/manpage/blenderplayer.1 b/doc/manpage/blenderplayer.1
new file mode 100644
-index 0000000..d15b0c9
+index 0000000..3c0bb47
--- /dev/null
+++ b/doc/manpage/blenderplayer.1
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,132 @@
+.TH "BLENDERPLAYER" "1" "October 17, 2011" "Blender 2\&.60 (sub 0)"
+.SH "NAME"
+blenderplayer \- the blender game engine runner
@@ -147,26 +149,27 @@ index 0000000..d15b0c9
+.br
+.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 ca5b172..db3a7cd 100644
+index 26474f6..757ab35 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -392,6 +392,7 @@ if(UNIX AND NOT APPLE)
+@@ -404,6 +404,7 @@ if(UNIX AND NOT APPLE)
+ FILES
${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
- ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
+ ${CMAKE_SOURCE_DIR}/doc/manpage/blenderplayer.1
DESTINATION ${TARGETDIR}
)
-@@ -454,7 +455,9 @@ if(UNIX AND NOT APPLE)
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts
- )
- install(
-- FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-+ FILES
-+ ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-+ ${CMAKE_SOURCE_DIR}/doc/manpage/blenderplayer.1
+@@ -470,6 +471,10 @@ if(UNIX AND NOT APPLE)
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
)
install(
++ FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blenderplayer.1
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
++ )
++ install(
+ FILES ${BLENDER_TEXT_FILES}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
+ )
diff --git a/debian/patches/0007-do_not_use_version_number_in_system_path.patch b/debian/patches/0006-do_not_use_version_number_in_system_path.patch
similarity index 95%
rename from debian/patches/0007-do_not_use_version_number_in_system_path.patch
rename to debian/patches/0006-do_not_use_version_number_in_system_path.patch
index 293362a..e462363 100644
--- a/debian/patches/0007-do_not_use_version_number_in_system_path.patch
+++ b/debian/patches/0006-do_not_use_version_number_in_system_path.patch
@@ -30,10 +30,10 @@ 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 db3a7cd..926072f 100644
+index 757ab35..9bc05aa 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -257,7 +257,7 @@ if(UNIX AND NOT APPLE)
+@@ -260,7 +260,7 @@ if(UNIX AND NOT APPLE)
if(WITH_PYTHON_MODULE)
set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
else()
diff --git a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
similarity index 84%
rename from debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
rename to debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
index 9d7a48d..5209eae 100644
--- a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
@@ -1,10 +1,10 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Wed, 26 Feb 2014 15:15:51 +0100
+Date: Wed, 23 Jul 2014 12:07:04 +0200
Subject: look_for_droid_ttf_with_fontconfig
- * Remove bad installation of fonts directory into locales.
- * Avoid using the droid font shipped with upstream source
- and use fontconfig to get it.
+* Remove bad installation of fonts directory into locales.
+* Avoid using the droid font shipped with upstream source
+ and use fontconfig to get it.
Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
@@ -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 169aeff..1feaa4b 100644
+index 10182f9..3933806 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -667,6 +667,13 @@ if(UNIX AND NOT APPLE)
+@@ -662,6 +662,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -36,7 +36,7 @@ index 169aeff..1feaa4b 100644
if(WITH_CODEC_SNDFILE)
find_package_wrapper(SndFile)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 28af1c1..e4ac326 100644
+index c6caef4..f19c23f 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -307,6 +307,9 @@ macro(setup_liblinks
@@ -68,7 +68,7 @@ index 2debe51..b75cf9d 100644
blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c
-index dc9baf8..8d688c5 100644
+index 150ff1b..477c735 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@ -50,7 +50,11 @@
@@ -83,7 +83,7 @@ index dc9baf8..8d688c5 100644
static unsigned char *unifont_ttf = NULL;
static int unifont_size = 0;
static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
-@@ -62,6 +66,24 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+@@ -62,6 +66,24 @@ unsigned char *BLF_get_unifont(int *r_unifont_size)
{
#ifdef WITH_INTERNATIONAL
if (unifont_ttf == NULL) {
@@ -108,7 +108,7 @@ index dc9baf8..8d688c5 100644
const char * const fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
if (fontpath) {
char unifont_path[1024];
-@@ -72,6 +94,7 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+@@ -72,6 +94,7 @@ unsigned char *BLF_get_unifont(int *r_unifont_size)
}
else {
printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
@@ -117,22 +117,22 @@ index dc9baf8..8d688c5 100644
}
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index ca82086..fdba1ea 100644
+index 2d1e1d8..860f182 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
-@@ -86,6 +86,7 @@ bool BLI_file_touch(const char *file);
-
- int BLI_file_gzip(const char *from, const char *to);
- char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r);
+@@ -87,6 +87,7 @@ bool BLI_is_file(const char *path);
+ void BLI_dir_create_recursive(const char *dir);
+ double BLI_dir_free_space(const char *dir);
+ char *BLI_current_working_dir(char *dir, const size_t maxlen);
+char *BLI_file_to_mem(const char *from_file, int *size_r);
- size_t BLI_file_descriptor_size(int file);
- size_t BLI_file_size(const char *file);
+ unsigned int BLI_dir_contents(const char *dir, struct direntry **filelist);
+ void BLI_free_filelist(struct direntry *filelist, unsigned int nrentries);
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
-index 5572656..9c72300 100644
+index 6f65847..b2693c1 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
-@@ -159,6 +159,50 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
+@@ -158,6 +158,50 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *r_size)
return mem;
}
@@ -184,10 +184,10 @@ 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 926072f..b3082a5 100644
+index 9bc05aa..a93ca38 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -316,12 +316,6 @@ endif()
+@@ -319,12 +319,6 @@ endif()
# localization
if(WITH_INTERNATIONAL)
diff --git a/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch b/debian/patches/0008-fix_illegal_hardware_instruction_due_to_SSE2.patch
similarity index 96%
rename from debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
rename to debian/patches/0008-fix_illegal_hardware_instruction_due_to_SSE2.patch
index 9cc75d0..99a87f0 100644
--- a/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
+++ b/debian/patches/0008-fix_illegal_hardware_instruction_due_to_SSE2.patch
@@ -14,10 +14,10 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
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
+index f19c23f..31e5f6d 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -446,34 +446,39 @@ macro(TEST_SSE_SUPPORT
+@@ -683,34 +683,39 @@ macro(TEST_SSE_SUPPORT
set(CMAKE_REQUIRED_FLAGS "${${_sse_flags}} ${${_sse2_flags}}")
diff --git a/debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch b/debian/patches/0009-fix_FTBFS_on_unofficial_64bit_archs.patch
similarity index 74%
rename from debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch
rename to debian/patches/0009-fix_FTBFS_on_unofficial_64bit_archs.patch
index a287381..ba136c8 100644
--- a/debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch
+++ b/debian/patches/0009-fix_FTBFS_on_unofficial_64bit_archs.patch
@@ -1,5 +1,5 @@
From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
-Date: Mon, 24 Mar 2014 08:48:07 +0100
+Date: Thu, 24 Jul 2014 11:29:04 +0200
Subject: fix_FTBFS_on_unofficial_64bit_archs
---
@@ -7,15 +7,15 @@ 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..bb55ac1 100644
+index bb55ac1..ad01de5 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -61,7 +61,7 @@
# endif
#endif
--#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
-+#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__))
+-#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__))
++#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__alpha__) || defined(__mips64)
# define LG_SIZEOF_PTR 3
# define LG_SIZEOF_INT 2
#else
diff --git a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
deleted file mode 100644
index f251168..0000000
--- a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
-Date: Mon, 26 May 2014 09:37:54 +0200
-Subject: fix_FTBFS_on_non-linux_architectures
-
----
- CMakeLists.txt | 3 +++
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- source/blender/blenlib/BLI_sys_types.h | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1feaa4b..3db7971 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -935,6 +935,9 @@ if(UNIX AND NOT APPLE)
- endif()
-
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread")
-+ if(CMAKE_DL_LIBS)
-+ list(APPEND PLATFORM_LINKLIBS ${CMAKE_DL_LIBS})
-+ endif()
-
- # lfs on glibc, all compilers should use
- add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
-diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index db45b59..828e70e 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(__GLIBC__)
- # include <malloc.h>
- # define HAVE_MALLOC_STATS
- #elif defined(__FreeBSD__)
-diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
-index b7a70a8..e35086d 100644
---- a/source/blender/blenlib/BLI_sys_types.h
-+++ b/source/blender/blenlib/BLI_sys_types.h
-@@ -167,7 +167,7 @@ typedef unsigned long uintptr_t;
- #define _UINTPTR_T_DEFINED
- #endif
-
--#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-
- /* Linux-i386, Linux-Alpha, Linux-ppc */
- #include <stdint.h>
diff --git a/debian/patches/0012-fix_FTBFS_due_to_SSE.patch b/debian/patches/0012-fix_FTBFS_due_to_SSE.patch
deleted file mode 100644
index aaaeef8..0000000
--- a/debian/patches/0012-fix_FTBFS_due_to_SSE.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-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/series b/debian/patches/series
index a6caf84..15696e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,9 @@
0001-blender_thumbnailer.patch
-0002-disable_tests.patch
-0003-install_in_usr_share.patch
-0004-filter_docs_to_install.patch
-0005-locales_directory_install.patch
-0006-update_manpages.patch
-0007-do_not_use_version_number_in_system_path.patch
-0008-look_for_droid_ttf_with_fontconfig.patch
-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
+0002-install_in_usr_share.patch
+0003-filter_docs_to_install.patch
+0004-locales_directory_install.patch
+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
--
blender packaging
More information about the pkg-multimedia-commits
mailing list