[SCM] blender/master: debian/patches/: patchset re-worked against snapshot
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Thu Feb 27 09:54:57 UTC 2014
The following commit has been merged in the master branch:
commit 3db2e0d5a0ea66ca9f2db97450d5a6829cb55c54
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date: Wed Feb 26 15:17:19 2014 +0100
debian/patches/: patchset re-worked against snapshot
- 0011-fix_FTBFS_on_armel.patch dropped (applied upstream)
- 0012-fix_FTBFS_on_unofficial_64bit_archs.patch => #0011
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index 302a928..9636d27 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -1,17 +1,17 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Mon, 30 Jul 2012 10:53:09 +0200
+Date: Mon, 24 Feb 2014 17:43:49 +0100
Subject: blender_thumbnailer
* Move thumbnailer script to an appropriate destination
* Add blender.thumbnailer file
* Change to python 3.3 since lintian is messing around with that
-Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
blender.thumbnailer | 4 ++++
- release/bin/blender-thumbnailer.py | 4 ++--
+ release/bin/blender-thumbnailer.py | 2 +-
source/creator/CMakeLists.txt | 2 +-
- 3 files changed, 7 insertions(+), 3 deletions(-)
+ 3 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 blender.thumbnailer
diff --git a/blender.thumbnailer b/blender.thumbnailer
@@ -25,29 +25,20 @@ 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 8b93eeb..ca4a38c 100755
+index 91aeb7a..10b292f 100755
--- a/release/bin/blender-thumbnailer.py
+++ b/release/bin/blender-thumbnailer.py
@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
+-#!/usr/bin/env python
++#!/usr/bin/env python3
# ##### BEGIN GPL LICENSE BLOCK #####
#
-@@ -24,7 +24,7 @@
- Thumbnailer runs with python 2.6 and 3.x.
- To run automatically with nautilus:
- gconftool --type boolean --set /desktop/gnome/thumbnailers/application at x-blender/enable true
-- gconftool --type string --set /desktop/gnome/thumbnailers/application at x-blender/command "blender-thumbnailer.py %u %o"
-+ gconftool --type string --set /desktop/gnome/thumbnailers/application at x-blender/command "/usr/share/blender/scripts/blender-thumbnailer.py %i %o"
- """
-
- import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index b24339c..af4799f 100644
+index 4d12040..a99a9c6 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -414,7 +414,7 @@ if(UNIX AND NOT APPLE)
+@@ -453,7 +453,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 7b27c99..5693b28 100644
--- a/debian/patches/0003-install_in_usr_share.patch
+++ b/debian/patches/0003-install_in_usr_share.patch
@@ -1,5 +1,5 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Sat, 28 Apr 2012 10:50:34 +0200
+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
@@ -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 af4799f..a0661bf 100644
+index a99a9c6..52c4420 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -300,8 +300,8 @@ if(WITH_PYTHON)
+@@ -304,8 +304,8 @@ if(WITH_PYTHON)
endif()
install(
@@ -20,6 +20,6 @@ index af4799f..a0661bf 100644
- DESTINATION ${TARGETDIR_VER}
+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts/
- PATTERN ".svn" EXCLUDE
+ PATTERN ".git" EXCLUDE
PATTERN "__pycache__" EXCLUDE
PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
diff --git a/debian/patches/0004-filter_docs_to_install.patch b/debian/patches/0004-filter_docs_to_install.patch
index bcc79db..268e1e8 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 a0661bf..3abbcc7 100644
+index 52c4420..1abd078 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -230,8 +230,6 @@ else()
+@@ -234,8 +234,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 c585991..e0d1935 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: Tue, 5 Nov 2013 17:31:34 +0100
+Date: Wed, 26 Feb 2014 14:46:09 +0100
Subject: locales_directory_install
Change where locales are installed.
@@ -7,7 +7,7 @@ Change where locales are installed.
Contributions by:
Antonio Ospite <ospite at studenti.unina.it>
-Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
source/blender/blenfont/intern/blf_lang.c | 10 +++++-----
source/blender/blenlib/BLI_path_util.h | 1 +
@@ -16,10 +16,10 @@ 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 9649e5b..7f6e2d7 100644
+index 623d8b7..37c9c2a 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)
+@@ -78,9 +78,9 @@ static void free_locales(void)
num_locales = num_locales_menu = 0;
}
@@ -31,7 +31,7 @@ index 9649e5b..7f6e2d7 100644
char languages[FILE_MAX];
LinkNode *lines = NULL, *line;
char *str;
-@@ -86,7 +86,7 @@ static void fill_locales(void)
+@@ -88,7 +88,7 @@ static void fill_locales(void)
free_locales();
@@ -40,7 +40,7 @@ index 9649e5b..7f6e2d7 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...
-@@ -186,11 +186,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
+@@ -188,11 +188,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
void BLF_lang_init(void)
{
#ifdef WITH_INTERNATIONAL
@@ -55,7 +55,7 @@ index 9649e5b..7f6e2d7 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 d4c5d5f..fdebfe1 100644
+index efc5731..9774af2 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 d4c5d5f..fdebfe1 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 d323098..8e6c999 100644
+index e56ac6f..8be23d6 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -1220,6 +1220,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder)
+@@ -1210,6 +1210,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,18 +81,20 @@ index d323098..8e6c999 100644
BLI_assert(0);
break;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 3abbcc7..5e1d95e 100644
+index 1abd078..0000316 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -314,9 +314,9 @@ endif()
- if(WITH_INTERNATIONAL)
+@@ -319,11 +319,11 @@ if(WITH_INTERNATIONAL)
install(
DIRECTORY
-- ${CMAKE_SOURCE_DIR}/release/datafiles/locale
-+ ${CMAKE_SOURCE_DIR}/release/datafiles/locale/
${CMAKE_SOURCE_DIR}/release/datafiles/fonts
- DESTINATION ${TARGETDIR_VER}/datafiles
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/locale
- PATTERN ".svn" EXCLUDE
)
- endif()
+
+ set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
+- set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale)
++ set(_locale_target_dir ${CMAKE_INSTALL_PREFIX}/share/locale)
+
+ file(GLOB _po_files "${_locale_dir}/po/*.po")
+ foreach(_po_file ${_po_files})
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index 51a2277..568bd68 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 5e1d95e..aa717ed 100644
+index 0000316..96b3e17 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -352,6 +352,7 @@ if(UNIX AND NOT APPLE)
+@@ -392,6 +392,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 5e1d95e..aa717ed 100644
DESTINATION ${TARGETDIR}
)
-@@ -415,7 +416,9 @@ if(UNIX AND NOT APPLE)
+@@ -454,7 +455,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 bc64a86..97e4759 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
@@ -9,7 +9,7 @@ without version numbers.
Contributions by:
Antonio Ospite <ospite at studenti.unina.it>
-Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
intern/ghost/intern/GHOST_SystemPathsX11.cpp | 3 +++
source/creator/CMakeLists.txt | 2 +-
@@ -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 aa717ed..b234113 100644
+index 96b3e17..82a86fe 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -253,7 +253,7 @@ if(UNIX AND NOT APPLE)
+@@ -257,7 +257,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 7b06a45..c6f47c0 100644
--- a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
@@ -1,12 +1,12 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Thu, 16 May 2013 10:42:38 +0200
+Date: Wed, 26 Feb 2014 15:15:51 +0100
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>
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
CMakeLists.txt | 7 ++++
build_files/cmake/macros.cmake | 3 ++
@@ -14,11 +14,11 @@ Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
source/blender/blenfont/intern/blf_translation.c | 23 +++++++++++++
source/blender/blenlib/BLI_fileops.h | 1 +
source/blender/blenlib/intern/fileops.c | 44 ++++++++++++++++++++++++
- source/creator/CMakeLists.txt | 1 -
- 7 files changed, 85 insertions(+), 1 deletion(-)
+ source/creator/CMakeLists.txt | 6 ----
+ 7 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8863c03..6e1f284 100644
+index 3e7ac95..0f58189 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -663,6 +663,13 @@ if(UNIX AND NOT APPLE)
@@ -36,10 +36,10 @@ index 8863c03..6e1f284 100644
if(WITH_CODEC_SNDFILE)
find_package_wrapper(SndFile)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 7dac80a..5a2b5bb 100644
+index 28af1c1..e4ac326 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -284,6 +284,9 @@ macro(setup_liblinks
+@@ -307,6 +307,9 @@ macro(setup_liblinks
if(WITH_SYSTEM_GLEW)
target_link_libraries(${target} ${GLEW_LIBRARY})
endif()
@@ -68,10 +68,10 @@ 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 57f442f..cd21778 100644
+index dc9baf8..8d688c5 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
-@@ -47,7 +47,11 @@
+@@ -50,7 +50,11 @@
#include "boost_locale_wrapper.h"
@@ -83,7 +83,7 @@ index 57f442f..cd21778 100644
static unsigned char *unifont_ttf = NULL;
static int unifont_size = 0;
static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
-@@ -59,6 +63,24 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+@@ -62,6 +66,24 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
{
#ifdef WITH_INTERNATIONAL
if (unifont_ttf == NULL) {
@@ -108,7 +108,7 @@ index 57f442f..cd21778 100644
const char * const fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
if (fontpath) {
char unifont_path[1024];
-@@ -69,6 +91,7 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+@@ -72,6 +94,7 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
}
else {
printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
@@ -184,14 +184,19 @@ 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 b234113..2659c7f 100644
+index 82a86fe..fbfe4be 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -315,7 +315,6 @@ if(WITH_INTERNATIONAL)
- install(
- DIRECTORY
- ${CMAKE_SOURCE_DIR}/release/datafiles/locale/
+@@ -316,12 +316,6 @@ endif()
+
+ # localization
+ if(WITH_INTERNATIONAL)
+- install(
+- DIRECTORY
- ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/locale
- PATTERN ".svn" EXCLUDE
- )
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/locale
+- )
+-
+ set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
+ set(_locale_target_dir ${CMAKE_INSTALL_PREFIX}/share/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 ae12902..9cc75d0 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
@@ -8,16 +8,16 @@ 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>
+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 5a2b5bb..af19e39 100644
+index e4ac326..b172c81 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -423,34 +423,39 @@ macro(TEST_SSE_SUPPORT
+@@ -446,34 +446,39 @@ macro(TEST_SSE_SUPPORT
set(CMAKE_REQUIRED_FLAGS "${${_sse_flags}} ${${_sse2_flags}}")
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 d669f27..04390f7 100644
--- a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
+++ b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
@@ -1,4 +1,4 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
Date: Tue, 20 Aug 2013 12:14:30 +0200
Subject: fix_FTBFS_on_non-linux_architectures
@@ -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 6e1f284..d7ef86e 100644
+index 0f58189..c0ee39f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -921,6 +921,9 @@ if(UNIX AND NOT APPLE)
+@@ -931,6 +931,9 @@ if(UNIX AND NOT APPLE)
endif()
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread")
@@ -22,10 +22,10 @@ index 6e1f284..d7ef86e 100644
# lfs on glibc, all compilers should use
add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
-index e544006..4de1ddc 100644
+index b7a70a8..e35086d 100644
--- a/source/blender/blenlib/BLI_sys_types.h
+++ b/source/blender/blenlib/BLI_sys_types.h
-@@ -82,7 +82,7 @@ typedef unsigned long uintptr_t;
+@@ -167,7 +167,7 @@ typedef unsigned long uintptr_t;
#define _UINTPTR_T_DEFINED
#endif
diff --git a/debian/patches/0011-fix_FTBFS_on_armel.patch b/debian/patches/0011-fix_FTBFS_on_armel.patch
deleted file mode 100644
index 5be19c2..0000000
--- a/debian/patches/0011-fix_FTBFS_on_armel.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Thu, 12 Dec 2013 14:41:06 +0100
-Subject: fix_FTBFS_on_armel
-
----
- intern/atomic/atomic_ops.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
-index 243e194..b5a73b1 100644
---- a/intern/atomic/atomic_ops.h
-+++ b/intern/atomic/atomic_ops.h
-@@ -35,10 +35,19 @@
- # include <libkern/OSAtomic.h>
- #elif defined(_MSC_VER)
- # include <windows.h>
-+#elif defined(__arm__)
-+/* Attempt to fix compilation error on Debian armel kernel.
-+ * arm7 architecture does have both 32 and 64bit atomics, however
-+ * it's gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
-+ */
-+# define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
-+# define JE_FORCE_SYNC_COMPARE_AND_SWAP_4
- #endif
-
- /* needed for int types */
- #include "../../source/blender/blenlib/BLI_sys_types.h"
-+#include <stdlib.h>
-+#include <stddef.h>
-
- /* little macro so inline keyword works */
- #if defined(_MSC_VER)
diff --git a/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch b/debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch
similarity index 100%
rename from debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch
rename to debian/patches/0011-fix_FTBFS_on_unofficial_64bit_archs.patch
diff --git a/debian/patches/series b/debian/patches/series
index b65a3bf..f217945 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,4 @@
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_armel.patch
-0012-fix_FTBFS_on_unofficial_64bit_archs.patch
+0011-fix_FTBFS_on_unofficial_64bit_archs.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list