[SCM] blender/master: debian/patches/: patchset re-worked against v2.68a
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Tue Jul 30 13:51:12 UTC 2013
The following commit has been merged in the master branch:
commit 23b099782f6568f80bc0f8b4bbe21d8fde51f7b8
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Mon Jul 29 15:30:44 2013 +0200
debian/patches/: patchset re-worked against v2.68a
- 0010-fix_format-security_issue.patch dropped
- 0011-fix_FTBFS_on_non-SSE_architectures.patch applied upstream
- 0012-fix_FTBFS_on_non-linux_architectures.patch renamed to #0010
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index 3d71cfd..8df1a22 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -44,7 +44,7 @@ index 8b93eeb..6c2cf23 100755
import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index d5407fe..eeb43dc 100644
+index 8ff4ec4..6645d36 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -406,7 +406,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 83b1a16..36da9f1 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 eeb43dc..2f105fb 100644
+index 6645d36..e8bf9e9 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -292,8 +292,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 754bfd4..6e82931 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 2f105fb..24c71be 100644
+index e8bf9e9..6bed8d2 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -230,8 +230,6 @@ else()
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
index b1981d2..8571430 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: Thu, 16 May 2013 10:25:35 +0200
+Date: Mon, 29 Jul 2013 15:21:34 +0200
Subject: locales_directory_install
Change where locales are installed.
@@ -16,7 +16,7 @@ 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 65abfc5..3dd9ed6 100644
+index 9649e5b..7f6e2d7 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
@@ -76,9 +76,9 @@ static void free_locales(void)
@@ -55,7 +55,7 @@ index 65abfc5..3dd9ed6 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 a36627b..30a9a6f 100644
+index e0a34e3..1823849 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -60,6 +60,7 @@ const char *BLI_get_folder_version(const int id, const int ver, const bool do_ch
@@ -67,21 +67,21 @@ index a36627b..30a9a6f 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 1f96c10..eee37dd 100644
+index 1e76a7f..3ce53cf 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -1222,6 +1222,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder)
- if (get_path_local(path, "python", subfolder, ver)) break;
+@@ -1227,6 +1227,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;
-+
+
+ case BLENDER_SYSTEM_LOCALE:
+ BLI_strncpy(path, "/usr/share/locale", FILE_MAX); break;
++
+ default:
+ BLI_assert(0);
}
-
- return path;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 24c71be..23611b4 100644
+index 6bed8d2..4a80161 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -306,9 +306,9 @@ endif()
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index 9335c3e..88eaf0f 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 23611b4..ed48de0 100644
+index 4a80161..647d0f3 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -344,6 +344,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 35f1c3d..cabe628 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 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 ed48de0..d6633c8 100644
+index 647d0f3..55e9ac5 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -245,7 +245,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 b667be9..54948cf 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 <mfv.debian at gmail.com>
7 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40bf4d8..5ecb5f4 100644
+index b1a7830..0a58232 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -638,6 +638,13 @@ if(UNIX AND NOT APPLE)
+@@ -641,6 +641,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -36,7 +36,7 @@ index 40bf4d8..5ecb5f4 100644
if(WITH_CODEC_SNDFILE)
find_package_wrapper(SndFile)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 2b5cfbc..c8d5c26 100644
+index 854609f..9324dec 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -284,6 +284,9 @@ macro(setup_liblinks
@@ -50,10 +50,10 @@ index 2b5cfbc..c8d5c26 100644
target_link_libraries(${target} ${BULLET_LIBRARIES})
endif()
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
-index 7bb80c3..6d5e22b 100644
+index 2debe51..b75cf9d 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
-@@ -59,6 +59,13 @@ if(WITH_INTERNATIONAL)
+@@ -58,6 +58,13 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
@@ -129,10 +129,10 @@ index 0a6d95d..f9a66aa 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 a8e233d..33d618c 100644
+index 26b9e08..f1198d5 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
-@@ -160,6 +160,50 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
+@@ -159,6 +159,50 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
return mem;
}
@@ -184,7 +184,7 @@ index a8e233d..33d618c 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 d6633c8..56fcdca 100644
+index 55e9ac5..9c060d3 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -307,7 +307,6 @@ if(WITH_INTERNATIONAL)
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 3cf7198..d23a276 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
@@ -14,10 +14,10 @@ Signed-off-by: Matteo F. Vescovi <mfv.debian 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 c8d5c26..4f2762b 100644
+index 9324dec..9d3414f 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -417,34 +417,39 @@ macro(TEST_SSE_SUPPORT
+@@ -423,34 +423,39 @@ macro(TEST_SSE_SUPPORT
set(CMAKE_REQUIRED_FLAGS "${${_sse_flags}} ${${_sse2_flags}}")
diff --git a/debian/patches/0012-fix_FTBFS_on_non-linux_architectures.patch b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
similarity index 88%
rename from debian/patches/0012-fix_FTBFS_on_non-linux_architectures.patch
rename to debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
index cece30f..481b772 100644
--- a/debian/patches/0012-fix_FTBFS_on_non-linux_architectures.patch
+++ b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
@@ -7,10 +7,10 @@ Subject: fix_FTBFS_on_non-linux_architectures
1 file changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ecb5f4..f03cfc6 100644
+index 0a58232..e4e6518 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -893,6 +893,9 @@ if(UNIX AND NOT APPLE)
+@@ -896,6 +896,9 @@ if(UNIX AND NOT APPLE)
endif()
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread")
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 7eb79d0..0000000
--- a/debian/patches/0010-fix_format-security_issue.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Thu, 23 May 2013 17:45:08 +0200
-Subject: fix_format-security_issue
-
----
- source/blender/editors/render/render_internal.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
-index 36a5427..d3edb88 100644
---- a/source/blender/editors/render/render_internal.c
-+++ b/source/blender/editors/render/render_internal.c
-@@ -294,9 +294,9 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
- megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
-
- if (scene->lay & 0xFF000000)
-- spos += sprintf(spos, IFACE_("Localview | "));
-+ spos += sprintf("%s", spos, IFACE_("Localview | "));
- else if (scene->r.scemode & R_SINGLE_LAYER)
-- spos += sprintf(spos, IFACE_("Single Layer | "));
-+ spos += sprintf("%s", spos, IFACE_("Single Layer | "));
-
- spos += sprintf(spos, IFACE_("Frame:%d "), (scene->r.cfra));
-
diff --git a/debian/patches/0011-fix_FTBFS_on_non-SSE_architectures.patch b/debian/patches/0011-fix_FTBFS_on_non-SSE_architectures.patch
deleted file mode 100644
index 194c373..0000000
--- a/debian/patches/0011-fix_FTBFS_on_non-SSE_architectures.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Mon, 24 Jun 2013 12:21:08 +0200
-Subject: fix_FTBFS_on_non-SSE_architectures
-
-Thanks: Sergey Sharybin (upstream developer)
----
- intern/cycles/util/util_system.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
-index 4fda090..c3ecc30 100644
---- a/intern/cycles/util/util_system.cpp
-+++ b/intern/cycles/util/util_system.cpp
-@@ -199,7 +199,12 @@ bool system_cpu_support_sse3()
-
- #else
-
--bool system_cpu_support_optimized()
-+bool system_cpu_support_sse2()
-+{
-+ return false;
-+}
-+
-+bool system_cpu_support_sse3()
- {
- return false;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 94c8a18..033c9ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,4 @@
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_non-SSE_architectures.patch
-0012-fix_FTBFS_on_non-linux_architectures.patch
+0010-fix_FTBFS_on_non-linux_architectures.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list