[SCM] blender/master: debian/patches/: patchset re-worked against v2.67b
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Wed Jun 5 16:14:18 UTC 2013
The following commit has been merged in the master branch:
commit dc791a761e4f8b2fd62ac94b4886c80d3b24c3a5
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Thu May 23 15:21:02 2013 +0200
debian/patches/: patchset re-worked against v2.67b
- 0010-fix_format-security_issue.patch dropped (deeply modified)
- 0011-fix_FTBFS_on_big-endian.patch dropped (applied upstream)
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index c869acd..3d71cfd 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -44,10 +44,10 @@ index 8b93eeb..6c2cf23 100755
import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index bb10bdd..8d02216 100644
+index d5407fe..eeb43dc 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -392,7 +392,7 @@ if(UNIX AND NOT APPLE)
+@@ -406,7 +406,7 @@ if(UNIX AND NOT APPLE)
)
install(
PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
diff --git a/debian/patches/0003-install_in_usr_share.patch b/debian/patches/0003-install_in_usr_share.patch
index e1def57..83b1a16 100644
--- a/debian/patches/0003-install_in_usr_share.patch
+++ b/debian/patches/0003-install_in_usr_share.patch
@@ -9,10 +9,10 @@ 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 8d02216..4e4cce2 100644
+index eeb43dc..2f105fb 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -280,8 +280,8 @@ if(WITH_PYTHON)
+@@ -292,8 +292,8 @@ if(WITH_PYTHON)
endif()
install(
diff --git a/debian/patches/0004-filter_docs_to_install.patch b/debian/patches/0004-filter_docs_to_install.patch
index 14730be..754bfd4 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0004-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 4e4cce2..dbfa71a 100644
+index 2f105fb..24c71be 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -225,8 +225,6 @@ else()
+@@ -230,8 +230,6 @@ else()
endif()
set(BLENDER_TEXT_FILES
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
index 4550604..b1981d2 100644
--- a/debian/patches/0005-locales_directory_install.patch
+++ b/debian/patches/0005-locales_directory_install.patch
@@ -1,5 +1,5 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Fri, 8 Mar 2013 10:13:24 +0100
+Date: Thu, 16 May 2013 10:25:35 +0200
Subject: locales_directory_install
Change where locales are installed.
@@ -16,35 +16,36 @@ Signed-off-by: Matteo F. Vescovi <mfv.debian 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 73294f1..64fe414 100644
+index 65abfc5..3dd9ed6 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
-@@ -76,16 +76,16 @@ static void free_locales(void)
+@@ -76,9 +76,9 @@ static void free_locales(void)
num_locales = num_locales_menu = 0;
}
-static void fill_locales(void)
+static void fill_locales(char *locale_path)
{
-- char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
-+ char *languages_path = locale_path;
+- const char * const languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
++ const char * const languages_path = locale_path;
+ char languages[FILE_MAX];
LinkNode *lines = NULL, *line;
char *str;
- int idx = 0;
+@@ -86,7 +86,7 @@ static void fill_locales(void)
free_locales();
-- BLI_join_dirfile(languages_path, FILE_MAX, languages_path, "languages");
-+ BLI_join_dirfile(languages_path, FILE_MAX, locale_path, "languages");
- line = lines = BLI_file_read_as_lines(languages_path);
+- BLI_join_dirfile(languages, FILE_MAX, languages_path, "languages");
++ BLI_join_dirfile(languages, FILE_MAX, locale_path, "languages");
+ line = lines = BLI_file_read_as_lines(languages);
/* This whole "parsing" code is a bit weak, in that it expects strictly formated input file...
-@@ -185,11 +185,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
+@@ -186,11 +186,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
void BLF_lang_init(void)
{
#ifdef WITH_INTERNATIONAL
-- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
-+ char *messagepath = BLI_get_folder(BLENDER_SYSTEM_LOCALE, NULL);
+- const char * const messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
++ const char * const messagepath = BLI_get_folder(BLENDER_SYSTEM_LOCALE, NULL);
if (messagepath) {
bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
@@ -54,10 +55,10 @@ index 73294f1..64fe414 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 8c51c92..ee70094 100644
+index a36627b..30a9a6f 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
-@@ -60,6 +60,7 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check);
+@@ -60,6 +60,7 @@ const char *BLI_get_folder_version(const int id, const int ver, const bool do_ch
#define BLENDER_SYSTEM_DATAFILES 52
#define BLENDER_SYSTEM_SCRIPTS 53
#define BLENDER_SYSTEM_PYTHON 54
@@ -66,10 +67,10 @@ index 8c51c92..ee70094 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 5265d86..6e31575 100644
+index 1f96c10..eee37dd 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -1098,6 +1098,9 @@ char *BLI_get_folder(int folder_id, const char *subfolder)
+@@ -1222,6 +1222,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder)
if (get_path_local(path, "python", subfolder, ver)) break;
if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break;
return NULL;
@@ -80,10 +81,10 @@ index 5265d86..6e31575 100644
return path;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index dbfa71a..cc9045b 100644
+index 24c71be..23611b4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -292,9 +292,9 @@ endif()
+@@ -306,9 +306,9 @@ endif()
if(WITH_INTERNATIONAL)
install(
DIRECTORY
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index db5bb84..9335c3e 100644
--- a/debian/patches/0006-update_manpages.patch
+++ b/debian/patches/0006-update_manpages.patch
@@ -148,10 +148,10 @@ 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 cc9045b..7ea1dd3 100644
+index 23611b4..ed48de0 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -330,6 +330,7 @@ if(UNIX AND NOT APPLE)
+@@ -344,6 +344,7 @@ if(UNIX AND NOT APPLE)
${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
@@ -159,7 +159,7 @@ index cc9045b..7ea1dd3 100644
DESTINATION ${TARGETDIR}
)
-@@ -393,7 +394,9 @@ if(UNIX AND NOT APPLE)
+@@ -407,7 +408,9 @@ if(UNIX AND NOT APPLE)
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts
)
install(
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 83caeef..35f1c3d 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,10 +30,10 @@ index 35bebd5..e6fd170 100644
if (static_path) {
static char system_path[PATH_MAX];
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 7ea1dd3..6553ce3 100644
+index ed48de0..d6633c8 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -240,7 +240,7 @@ if(UNIX AND NOT APPLE)
+@@ -245,7 +245,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/0008-look_for_droid_ttf_with_fontconfig.patch
index 85543a3..b667be9 100644
--- a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
@@ -1,37 +1,27 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Thu, 21 Feb 2013 16:29:22 +0100
+Date: Thu, 16 May 2013 10:42:38 +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.
+
+Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
---
- CMakeLists.txt | 10 +++++
- build_files/cmake/Modules/FindFontconfig.cmake | 49 ++++++++++++++++++++++++
+ CMakeLists.txt | 7 ++++
build_files/cmake/macros.cmake | 3 ++
source/blender/blenfont/CMakeLists.txt | 7 ++++
- source/blender/blenfont/intern/blf_translation.c | 23 +++++++++++
+ source/blender/blenfont/intern/blf_translation.c | 23 +++++++++++++
source/blender/blenlib/BLI_fileops.h | 1 +
- source/blender/blenlib/intern/fileops.c | 43 +++++++++++++++++++++
+ source/blender/blenlib/intern/fileops.c | 44 ++++++++++++++++++++++++
source/creator/CMakeLists.txt | 1 -
- 8 files changed, 136 insertions(+), 1 deletion(-)
- create mode 100644 build_files/cmake/Modules/FindFontconfig.cmake
+ 7 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d208d73..b9709f4 100644
+index 40bf4d8..5ecb5f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -116,6 +116,9 @@ option(WITH_BLENDER "Build blender (disable to build only the blender player)" O
- mark_as_advanced(WITH_BLENDER)
-
- option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
-+if(UNIX AND NOT APPLE)
-+ option(WITH_FONTCONFIG "Enable Fontconfig (discovering fonts installed on linux)" OFF)
-+endif()
-
- option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
- option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
-@@ -604,6 +607,13 @@ if(UNIX AND NOT APPLE)
+@@ -638,6 +638,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -45,66 +35,11 @@ index d208d73..b9709f4 100644
# Codecs
if(WITH_CODEC_SNDFILE)
find_package_wrapper(SndFile)
-diff --git a/build_files/cmake/Modules/FindFontconfig.cmake b/build_files/cmake/Modules/FindFontconfig.cmake
-new file mode 100644
-index 0000000..337ece9
---- /dev/null
-+++ b/build_files/cmake/Modules/FindFontconfig.cmake
-@@ -0,0 +1,49 @@
-+# - Try to find the Fontconfig
-+# Once done this will define
-+#
-+# FONTCONFIG_FOUND - system has Fontconfig
-+# FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers
-+# FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG
-+# FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG
-+
-+# Copyright (c) 2006,2007 Laurent Montel, <montel at kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+
-+if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
-+
-+ # in cache already
-+ set(FONTCONFIG_FOUND TRUE)
-+
-+else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
-+
-+ if (NOT WIN32)
-+ # use pkg-config to get the directories and then use these values
-+ # in the FIND_PATH() and FIND_LIBRARY() calls
-+ find_package(PkgConfig)
-+ pkg_check_modules(FONTCONFIG fontconfig)
-+
-+ set(FONTCONFIG_DEFINITIONS ${FONTCONFIG_CFLAGS_OTHER})
-+ endif (NOT WIN32)
-+
-+ find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
-+ PATHS
-+ ${FONTCONFIG_INCLUDEDIR}
-+ ${FONTCONFIG_INCLUDE_DIRS}
-+ /usr/X11/include
-+ )
-+
-+ find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
-+ PATHS
-+ ${FONTCONFIG_LIBDIR}
-+ ${FONTCONFIG_LIBRARY_DIRS}
-+ )
-+
-+ include(FindPackageHandleStandardArgs)
-+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR )
-+
-+ mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
-+
-+endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index bdd82a4..7fdd862 100644
+index 2b5cfbc..c8d5c26 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -282,6 +282,9 @@ macro(setup_liblinks
+@@ -284,6 +284,9 @@ macro(setup_liblinks
if(WITH_SYSTEM_GLEW)
target_link_libraries(${target} ${GLEW_LIBRARY})
endif()
@@ -133,7 +68,7 @@ index 7bb80c3..6d5e22b 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 b5b72b6..baa4efd 100644
+index 57f442f..cd21778 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@ -47,7 +47,11 @@
@@ -147,8 +82,8 @@ index b5b72b6..baa4efd 100644
+#endif
static unsigned char *unifont_ttf = NULL;
static int unifont_size = 0;
- #endif /* WITH_INTERNATIONAL */
-@@ -56,6 +60,24 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+ static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
+@@ -59,6 +63,24 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
{
#ifdef WITH_INTERNATIONAL
if (unifont_ttf == NULL) {
@@ -170,22 +105,22 @@ index b5b72b6..baa4efd 100644
+ printf("%s: 'Droid Sans Regular' font not found with fontconfig\n",__func__);
+ }
+#else
- char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
+ const char * const fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
if (fontpath) {
char unifont_path[1024];
-@@ -67,6 +89,7 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+@@ -69,6 +91,7 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+ }
else {
printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
- }
+#endif
+ }
}
- *unifont_size_r = unifont_size;
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index c278370..c9789f1 100644
+index 0a6d95d..f9a66aa 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
-@@ -80,6 +80,7 @@ int BLI_file_touch(const char *file);
+@@ -80,6 +80,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);
@@ -194,10 +129,10 @@ index c278370..c9789f1 100644
size_t BLI_file_descriptor_size(int file);
size_t BLI_file_size(const char *file);
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
-index 24b3c36..e80337e 100644
+index a8e233d..33d618c 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
-@@ -155,6 +155,49 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
+@@ -160,6 +160,50 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
return mem;
}
@@ -244,14 +179,15 @@ index 24b3c36..e80337e 100644
+ return mem;
+
+}
-
- /* return 1 when file can be written */
- int BLI_file_is_writable(const char *filename)
++
+ /**
+ * 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 6553ce3..8d859bb 100644
+index d6633c8..56fcdca 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -293,7 +293,6 @@ if(WITH_INTERNATIONAL)
+@@ -307,7 +307,6 @@ if(WITH_INTERNATIONAL)
install(
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/locale/
diff --git a/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch b/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
index bbf7892..3cf7198 100644
--- a/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
+++ b/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
@@ -7,15 +7,17 @@ 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 <mfv.debian 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 7fdd862..9dbebdd 100644
+index c8d5c26..4f2762b 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -415,34 +415,39 @@ macro(TEST_SSE_SUPPORT
+@@ -417,34 +417,39 @@ macro(TEST_SSE_SUPPORT
set(CMAKE_REQUIRED_FLAGS "${${_sse_flags}} ${${_sse2_flags}}")
diff --git a/debian/patches/0010-fix_format-security_issue.patch b/debian/patches/0010-fix_format-security_issue.patch
deleted file mode 100644
index e8618ed..0000000
--- a/debian/patches/0010-fix_format-security_issue.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Mon, 4 Mar 2013 10:27:18 +0100
-Subject: fix_format-security_issue
-
----
- source/blender/blenkernel/intern/pointcache.c | 2 +-
- source/blender/editors/transform/transform.c | 4 ++--
- source/blender/editors/transform/transform_constraints.c | 4 ++--
- source/blender/modifiers/intern/MOD_meshcache.c | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
-index 27c5e03..4ea4d03 100644
---- a/source/blender/blenkernel/intern/pointcache.c
-+++ b/source/blender/blenkernel/intern/pointcache.c
-@@ -3511,7 +3511,7 @@ void BKE_ptcache_update_info(PTCacheID *pid)
- else if (totframes && cache->totpoint)
- BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%i points found!"), cache->totpoint);
- else
-- BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("No valid data to read!"));
-+ BLI_snprintf("%s", cache->info, sizeof(cache->info), IFACE_("No valid data to read!"));
- return;
- }
-
-diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
-index c8874d1..2cde1cb 100644
---- a/source/blender/editors/transform/transform.c
-+++ b/source/blender/editors/transform/transform.c
-@@ -4094,7 +4094,7 @@ int ShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
-
- /* header print for NumInput */
- str_p = str;
-- str_p += BLI_snprintf(str_p, sizeof(str), IFACE_("Shrink/Fatten:"));
-+ str_p += BLI_snprintf("%s", str_p, sizeof(str), IFACE_("Shrink/Fatten:"));
- if (hasNumInput(&t->num)) {
- char c[NUM_STR_REP_LEN];
- outputNumInput(&(t->num), c);
-@@ -6454,7 +6454,7 @@ int VertSlide(TransInfo *t, const int UNUSED(mval[2]))
-
- /* header string */
- str_p = str;
-- str_p += BLI_snprintf(str_p, sizeof(str), IFACE_("Vert Slide: "));
-+ str_p += BLI_snprintf("%s", str_p, sizeof(str), IFACE_("Vert Slide: "));
- if (hasNumInput(&t->num)) {
- char c[NUM_STR_REP_LEN];
- applyNumInput(&t->num, &final);
-diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
-index c4d6147..27aa86d 100644
---- a/source/blender/editors/transform/transform_constraints.c
-+++ b/source/blender/editors/transform/transform_constraints.c
-@@ -867,11 +867,11 @@ static void setNearestAxis2d(TransInfo *t)
- /* no correction needed... just use whichever one is lower */
- if (abs(t->mval[0] - t->con.imval[0]) < abs(t->mval[1] - t->con.imval[1]) ) {
- t->con.mode |= CON_AXIS1;
-- BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" along Y axis"));
-+ BLI_snprintf("%s", t->con.text, sizeof(t->con.text), IFACE_(" along Y axis"));
- }
- else {
- t->con.mode |= CON_AXIS0;
-- BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" along X axis"));
-+ BLI_snprintf("%s", t->con.text, sizeof(t->con.text), IFACE_(" along X axis"));
- }
- }
-
-diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c
-index 5e702a4..e8f8305 100644
---- a/source/blender/modifiers/intern/MOD_meshcache.c
-+++ b/source/blender/modifiers/intern/MOD_meshcache.c
-@@ -251,7 +251,7 @@ static void meshcache_do(
- /* -------------------------------------------------------------------- */
- /* Apply the transformation matrix (if needed) */
- if (UNLIKELY(err_str)) {
-- modifier_setError(&mcmd->modifier, err_str);
-+ modifier_setError("%s", &mcmd->modifier, err_str);
- }
- else if (ok) {
- bool use_matrix = false;
diff --git a/debian/patches/0011-fix_FTBFS_on_big-endian.patch b/debian/patches/0011-fix_FTBFS_on_big-endian.patch
deleted file mode 100644
index 477750a..0000000
--- a/debian/patches/0011-fix_FTBFS_on_big-endian.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Mon, 11 Mar 2013 10:21:45 +0100
-Subject: fix_FTBFS_on_big-endian
-
----
- source/blender/modifiers/intern/MOD_meshcache_pc2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
-index 1ecb347..b20f62a 100644
---- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c
-+++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
-@@ -62,7 +62,7 @@ static bool meshcache_read_pc2_head(FILE *fp, const int verts_tot,
- }
-
- #ifdef __BIG_ENDIAN__
-- BLI_endian_switch_int32_array(&pc2_head->huh, (sizeof(*pc2_head) - sizeof(pc2_head->header)) / sizeof(int));
-+ BLI_endian_switch_int32_array(&pc2_head->file_version, (sizeof(*pc2_head) - sizeof(pc2_head->header)) / sizeof(int));
- #endif
-
- if (pc2_head->verts_tot != verts_tot) {
diff --git a/debian/patches/series b/debian/patches/series
index 90bfb57..19d575b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,3 @@
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_format-security_issue.patch
-0011-fix_FTBFS_on_big-endian.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list