[SCM] blender/master: debian/patches: cleanup gbp-pq mess
kiniou-guest at users.alioth.debian.org
kiniou-guest at users.alioth.debian.org
Thu Jan 26 18:48:30 UTC 2012
The following commit has been merged in the master branch:
commit 918af8c9c8e378b0f484c5ab2a3adec8be4c6552
Author: Kevin Roy <kiniou at gmail.com>
Date: Thu Jan 26 19:36:28 2012 +0100
debian/patches: cleanup gbp-pq mess
My bad ...
Git-Dch: Ignore
diff --git a/debian/patches/0007-locales_directory_install.patch b/debian/patches/0007-locales_directory_install.patch
index 83ba141..935e803 100644
--- a/debian/patches/0007-locales_directory_install.patch
+++ b/debian/patches/0007-locales_directory_install.patch
@@ -6,9 +6,9 @@ Change where locales are installed
---
source/blender/blenfont/intern/blf_lang.c | 2 +-
source/blender/blenlib/BLI_path_util.h | 1 +
- source/blender/blenlib/intern/path_util.c | 29 ++++++++++++++++-------------
+ source/blender/blenlib/intern/path_util.c | 3 +++
source/creator/CMakeLists.txt | 4 ++--
- 4 files changed, 20 insertions(+), 16 deletions(-)
+ 4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
index 2ba23e5..ec585af 100644
@@ -36,78 +36,9 @@ index 68bb1a7..ba1852e 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 e79d850..980e26b 100644
+index e79d850..383e0e8 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -28,7 +28,7 @@
- */
-
- /** \file blender/blenlib/intern/path_util.c
-- * \ingroup bli
-+ * \ingroup bli
- */
-
-
-@@ -56,7 +56,7 @@
- # include "BLI_fnmatch.h" /* use fnmatch included in blenlib */
- #else
- # ifndef _GNU_SOURCE
--# define _GNU_SOURCE
-+# define _GNU_SOURCE
- # endif
- # include <fnmatch.h>
- #endif
-@@ -64,7 +64,7 @@
- #ifdef WIN32
- # include <io.h>
- # ifdef _WIN32_IE
--# undef _WIN32_IE
-+# undef _WIN32_IE
- # endif
- # define _WIN32_IE 0x0501
- # include <windows.h>
-@@ -72,7 +72,7 @@
- # include "BLI_winstuff.h"
- #else /* non windows */
- # ifdef WITH_BINRELOC
--# include "binreloc.h"
-+# include "binreloc.h"
- # endif
- #endif /* WIN32 */
-
-@@ -85,9 +85,9 @@
- # define BLENDER_SYSTEM_FORMAT "%s/Blender/%s"
- #else /* UNIX */
- # ifndef WITH_XDG_USER_DIRS /* oldschool unix ~/.blender/ */
--# define BLENDER_USER_FORMAT "%s/.blender/%s"
-+# define BLENDER_USER_FORMAT "%s/.blender/%s"
- # else /* new XDG ~/blender/.config/ */
--# define BLENDER_USER_FORMAT "%s/blender/%s"
-+# define BLENDER_USER_FORMAT "%s/blender/%s"
- # endif // WITH_XDG_USER_DIRS
- # define BLENDER_SYSTEM_FORMAT "%s/blender/%s"
- #endif
-@@ -261,7 +261,7 @@ int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, cons
- *
- * For places where this is used, see constraint.c for example...
- *
-- * name_offs: should be calculated using offsetof(structname, membername) macro from stddef.h
-+ * name_offs: should be calculated using offsetof(structname, membername) macro from stddef.h
- * len: maximum length of string (to prevent overflows, etc.)
- * defname: the name that should be used by default if none is specified already
- * delim: the character which acts as a delimeter between parts of the name
-@@ -331,9 +331,9 @@ void BLI_cleanup_path(const char *relabase, char *dir)
- }
-
- /* Note
-- * memmove( start, eind, strlen(eind)+1 );
-+ * memmove( start, eind, strlen(eind)+1 );
- * is the same as
-- * strcpy( start, eind );
-+ * strcpy( start, eind );
- * except strcpy should not be used because there is overlap,
- * so use memmove's slightly more obscure syntax - Campbell
- */
@@ -1088,6 +1088,9 @@ 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;
@@ -118,35 +49,6 @@ index e79d850..980e26b 100644
}
return path;
-@@ -1383,7 +1386,7 @@ int BLI_testextensie_array(const char *str, const char **ext_array)
- }
-
- /* semicolon separated wildcards, eg:
-- * '*.zip;*.py;*.exe' */
-+ * '*.zip;*.py;*.exe' */
- int BLI_testextensie_glob(const char *str, const char *ext_fnmatch)
- {
- const char *ext_step= ext_fnmatch;
-@@ -1443,8 +1446,8 @@ int BLI_ensure_extension(char *path, size_t maxlen, const char *ext)
- size_t a;
-
- /* first check the extension is alread there */
-- if ( (ext_len <= path_len) &&
-- (strcmp(path + (path_len - ext_len), ext) == 0))
-+ if ( (ext_len <= path_len) &&
-+ (strcmp(path + (path_len - ext_len), ext) == 0))
- {
- return 1;
- }
-@@ -1524,7 +1527,7 @@ void BLI_join_dirfile(char *dst, const size_t maxlen, const char *dir, const cha
- /* inline BLI_add_slash */
- if (dst[dirlen - 1] != SEP) {
- dst[dirlen++]= SEP;
-- dst[dirlen ]= '\0';
-+ dst[dirlen ]= '\0';
- }
-
- if (dirlen >= maxlen) {
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 033cbf0..4f84792 100644
--- a/source/creator/CMakeLists.txt
diff --git a/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch b/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
index 69de990..ef5ddee 100644
--- a/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
+++ b/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
@@ -9,12 +9,12 @@ Global installation expects system patch to be something like
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
-index 980e26b..bc42cec 100644
+index 383e0e8..ebe4e2a 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -89,7 +89,7 @@
# else /* new XDG ~/blender/.config/ */
- # define BLENDER_USER_FORMAT "%s/blender/%s"
+ # define BLENDER_USER_FORMAT "%s/blender/%s"
# endif // WITH_XDG_USER_DIRS
-# define BLENDER_SYSTEM_FORMAT "%s/blender/%s"
+# define BLENDER_SYSTEM_FORMAT "%s/blender"
diff --git a/debian/patches/0012-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0012-look_for_droid_ttf_with_fontconfig.patch
index 7520f52..26acd85 100644
--- a/debian/patches/0012-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0012-look_for_droid_ttf_with_fontconfig.patch
@@ -47,7 +47,7 @@ index 4874085..925f283 100644
if(NOT FFTW3_FOUND)
diff --git a/build_files/cmake/Modules/FindFontconfig.cmake b/build_files/cmake/Modules/FindFontconfig.cmake
new file mode 100644
-index 0000000..308c482
+index 0000000..337ece9
--- /dev/null
+++ b/build_files/cmake/Modules/FindFontconfig.cmake
@@ -0,0 +1,49 @@
@@ -96,12 +96,12 @@ index 0000000..308c482
+
+ 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 c6a8340..581351f 100644
+index c6a8340..6a06c58 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -244,6 +244,11 @@ macro(setup_liblinks
@@ -111,7 +111,7 @@ index c6a8340..581351f 100644
+ if(WITH_FONTCONFIG)
+ target_link_libraries(${target} ${FONTCONFIG_LIBRARIES})
+ endif()
-+
++
+
if(WITH_OPENAL)
target_link_libraries(${target} ${OPENAL_LIBRARY})
@@ -134,7 +134,7 @@ index d928297..1fce891 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 fe14f5d..eeca08a 100644
+index fe14f5d..8f89c8b 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@ -47,13 +47,35 @@
@@ -162,7 +162,7 @@ index fe14f5d..eeca08a 100644
+ FcPatternGet(fontset->fonts[0], FC_FILE, 0, &v);
+ //load the file stored in the union of FcValue into memory
+ unifont_ttf = (unsigned char*)BLI_file_to_mem(
-+ (const char *)v.u.s,
++ (const char *)v.u.s,
+ &unifont_size
+ );
+ }
@@ -194,7 +194,7 @@ index 2e8f1a5..0e66218 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 95b6a97..54743fd 100644
+index 95b6a97..57f45dd 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -148,6 +148,50 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
@@ -222,19 +222,19 @@ index 95b6a97..54743fd 100644
+ } else {
+ mem= MEM_reallocN(mem, size+chunk_size);
+ alloc_size+= chunk_size;
-+ }
++ }
+
+ readsize= fread(mem+size, chunk_size,1,file);
+ if(readsize>0) {
+ size+= readsize;
-+ }
++ }
+ else break;
-+ }
++ }
+
+ if(size==0) {
+ MEM_freeN(mem);
+ mem= NULL;
-+ }
++ }
+ else if(alloc_size!=size)
+ mem= MEM_reallocN(mem, size);
+
--
blender packaging
More information about the pkg-multimedia-commits
mailing list