[SCM] blender/master: debian/patches/: patchset refreshed
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Wed Nov 6 09:53:27 UTC 2013
The following commit has been merged in the master branch:
commit 128a97910dd430c730f17cb92fb99d66893106a6
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Tue Nov 5 17:47:02 2013 +0100
debian/patches/: patchset refreshed
- 0011-fix_PATH_MAX_issue.patch dropped (applied upstream)
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index d81ff50..302a928 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -44,10 +44,10 @@ index 8b93eeb..ca4a38c 100755
import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 8ff4ec4..6645d36 100644
+index b24339c..af4799f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -406,7 +406,7 @@ if(UNIX AND NOT APPLE)
+@@ -414,7 +414,7 @@ if(UNIX AND NOT APPLE)
)
install(
PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
diff --git a/debian/patches/0002-disable_tests.patch b/debian/patches/0002-disable_tests.patch
index 4240b1a..f1081a0 100644
--- a/debian/patches/0002-disable_tests.patch
+++ b/debian/patches/0002-disable_tests.patch
@@ -1,5 +1,5 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Fri, 15 Apr 2011 19:44:00 +0200
+Date: Tue, 5 Nov 2013 16:56:45 +0100
Subject: disable_tests
Added WITH_TESTS condition to implicitly disable.
@@ -8,11 +8,11 @@ Added WITH_TESTS condition to implicitly disable.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index 529aaac..eb1f32a 100644
+index 391fdf4..691a411 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
-@@ -33,4 +33,6 @@ if(WINDOWS)
- add_subdirectory(icons)
+@@ -29,4 +29,6 @@ if(WITH_GAMEENGINE)
+ add_subdirectory(gameengine)
endif()
-add_subdirectory(tests)
diff --git a/debian/patches/0003-install_in_usr_share.patch b/debian/patches/0003-install_in_usr_share.patch
index 36da9f1..7b27c99 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 6645d36..e8bf9e9 100644
+index af4799f..a0661bf 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -292,8 +292,8 @@ if(WITH_PYTHON)
+@@ -300,8 +300,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 6e82931..bcc79db 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0004-filter_docs_to_install.patch
@@ -1,5 +1,5 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Thu, 22 Dec 2011 18:13:03 +0100
+Date: Tue, 5 Nov 2013 17:14:41 +0100
Subject: filter_docs_to_install
Install only relevant documentation.
@@ -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 e8bf9e9..6bed8d2 100644
+index a0661bf..3abbcc7 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -230,8 +230,6 @@ else()
@@ -19,4 +19,4 @@ index e8bf9e9..6bed8d2 100644
- ${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
${CMAKE_SOURCE_DIR}/release/text/copyright.txt
${CMAKE_SOURCE_DIR}/release/text/readme.html
- )
+ ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
index 8571430..c585991 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: Mon, 29 Jul 2013 15:21:34 +0200
+Date: Tue, 5 Nov 2013 17:31:34 +0100
Subject: locales_directory_install
Change where locales are installed.
@@ -55,10 +55,10 @@ 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 e0a34e3..1823849 100644
+index d4c5d5f..fdebfe1 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
+@@ -62,6 +62,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
@@ -67,10 +67,10 @@ index e0a34e3..1823849 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 1e76a7f..3ce53cf 100644
+index d323098..8e6c999 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -1227,6 +1227,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder)
+@@ -1220,6 +1220,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;
@@ -79,12 +79,12 @@ index 1e76a7f..3ce53cf 100644
+
default:
BLI_assert(0);
- }
+ break;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 6bed8d2..4a80161 100644
+index 3abbcc7..5e1d95e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -306,9 +306,9 @@ endif()
+@@ -314,9 +314,9 @@ endif()
if(WITH_INTERNATIONAL)
install(
DIRECTORY
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index 88eaf0f..51a2277 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 4a80161..647d0f3 100644
+index 5e1d95e..aa717ed 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -344,6 +344,7 @@ if(UNIX AND NOT APPLE)
+@@ -352,6 +352,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 4a80161..647d0f3 100644
DESTINATION ${TARGETDIR}
)
-@@ -407,7 +408,9 @@ if(UNIX AND NOT APPLE)
+@@ -415,7 +416,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 cabe628..bc64a86 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
@@ -1,5 +1,5 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Fri, 8 Mar 2013 10:21:26 +0100
+Date: Tue, 5 Nov 2013 17:42:18 +0100
Subject: do_not_use_version_number_in_system_path
Global installation expects system path to be
@@ -16,10 +16,10 @@ Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-index 35bebd5..e6fd170 100644
+index e2d9733..ec0e691 100644
--- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-@@ -60,6 +60,9 @@ GHOST_SystemPathsX11::~GHOST_SystemPathsX11()
+@@ -62,6 +62,9 @@ GHOST_SystemPathsX11::~GHOST_SystemPathsX11()
const GHOST_TUns8 *GHOST_SystemPathsX11::getSystemDir(int, const char *versionstr) const
{
@@ -28,12 +28,12 @@ index 35bebd5..e6fd170 100644
+
/* no prefix assumes a portable build which only uses bundled scripts */
if (static_path) {
- static char system_path[PATH_MAX];
+ static string system_path = string(static_path) + "/blender/" + versionstr;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 647d0f3..55e9ac5 100644
+index aa717ed..b234113 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -245,7 +245,7 @@ if(UNIX AND NOT APPLE)
+@@ -253,7 +253,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 54948cf..7b06a45 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 b1a7830..0a58232 100644
+index 8863c03..6e1f284 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -641,6 +641,13 @@ if(UNIX AND NOT APPLE)
+@@ -663,6 +663,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -36,7 +36,7 @@ index b1a7830..0a58232 100644
if(WITH_CODEC_SNDFILE)
find_package_wrapper(SndFile)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 854609f..9324dec 100644
+index 7dac80a..5a2b5bb 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -284,6 +284,9 @@ macro(setup_liblinks
@@ -117,10 +117,10 @@ index 57f442f..cd21778 100644
}
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index 0a6d95d..f9a66aa 100644
+index ca82086..fdba1ea 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
-@@ -80,6 +80,7 @@ bool BLI_file_touch(const char *file);
+@@ -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);
@@ -129,7 +129,7 @@ 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 26b9e08..f1198d5 100644
+index 5572656..9c72300 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)
@@ -184,10 +184,10 @@ index 26b9e08..f1198d5 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 55e9ac5..9c060d3 100644
+index b234113..2659c7f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -307,7 +307,6 @@ if(WITH_INTERNATIONAL)
+@@ -315,7 +315,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 d23a276..ae12902 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,7 +14,7 @@ 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 9324dec..9d3414f 100644
+index 5a2b5bb..af19e39 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -423,34 +423,39 @@ macro(TEST_SSE_SUPPORT
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 e37957a..d669f27 100644
--- a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
+++ b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
@@ -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 0a58232..e4e6518 100644
+index 6e1f284..d7ef86e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -896,6 +896,9 @@ if(UNIX AND NOT APPLE)
+@@ -921,6 +921,9 @@ if(UNIX AND NOT APPLE)
endif()
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread")
diff --git a/debian/patches/0011-fix_PATH_MAX_issue.patch b/debian/patches/0011-fix_PATH_MAX_issue.patch
deleted file mode 100644
index fb88213..0000000
--- a/debian/patches/0011-fix_PATH_MAX_issue.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Tue, 20 Aug 2013 12:21:08 +0200
-Subject: fix_PATH_MAX_issue
-
----
- intern/ghost/intern/GHOST_SystemPathsX11.cpp | 50 ++++++++++++++++------------
- source/blender/blenlib/BLI_fileops.h | 6 ++++
- source/blender/blenlib/BLI_winstuff.h | 1 -
- source/blender/blenlib/intern/storage.c | 1 -
- 4 files changed, 34 insertions(+), 24 deletions(-)
-
-diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-index e6fd170..e98c0c8 100644
---- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-+++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-@@ -42,7 +42,9 @@
- #include <cstdlib> /* for exit */
-
- #include <pwd.h> /* for get home without use getenv() */
--#include <limits.h> /* for PATH_MAX */
-+#include <string>
-+
-+using std::string;
-
- #ifdef PREFIX
- static const char *static_path = PREFIX "/share";
-@@ -65,9 +67,8 @@ const GHOST_TUns8 *GHOST_SystemPathsX11::getSystemDir(int, const char *versionst
-
- /* no prefix assumes a portable build which only uses bundled scripts */
- if (static_path) {
-- static char system_path[PATH_MAX];
-- snprintf(system_path, sizeof(system_path), "%s/blender/%s", static_path, versionstr);
-- return (GHOST_TUns8 *)system_path;
-+ static string system_path = string(static_path) + "/blender/" + versionstr;
-+ return (GHOST_TUns8 *)system_path.c_str();
- }
-
- return NULL;
-@@ -75,36 +76,41 @@ const GHOST_TUns8 *GHOST_SystemPathsX11::getSystemDir(int, const char *versionst
-
- const GHOST_TUns8 *GHOST_SystemPathsX11::getUserDir(int version, const char *versionstr) const
- {
-- static char user_path[PATH_MAX];
-+ static string user_path = "";
-
- /* in blender 2.64, we migrate to XDG. to ensure the copy previous settings
- * operator works we give a different path depending on the requested version */
- if (version < 264) {
-- const char *home = getenv("HOME");
--
-- if (home) {
-- snprintf(user_path, sizeof(user_path), "%s/.blender/%s", home, versionstr);
-- return (GHOST_TUns8 *)user_path;
-+ if (user_path.empty()) {
-+ const char *home = getenv("HOME");
-+
-+ if (home) {
-+ user_path = string(home) + "/.blender/" + versionstr;
-+ }
-+ else {
-+ return NULL;
-+ }
- }
--
-- return NULL;
-+ return (GHOST_TUns8 *)user_path.c_str();
- }
- else {
-- const char *home = getenv("XDG_CONFIG_HOME");
-+ if (user_path.empty()) {
-+ const char *home = getenv("XDG_CONFIG_HOME");
-
-- if (home) {
-- snprintf(user_path, sizeof(user_path), "%s/blender/%s", home, versionstr);
-- }
-- else {
-- home = getenv("HOME");
-+ if (home) {
-+ user_path = string(home) + "/blender/" + versionstr;
-+ }
-+ else {
-+ home = getenv("HOME");
-
-- if (home == NULL)
-- home = getpwuid(getuid())->pw_dir;
-+ if (home == NULL)
-+ home = getpwuid(getuid())->pw_dir;
-
-- snprintf(user_path, sizeof(user_path), "%s/.config/blender/%s", home, versionstr);
-+ user_path = string(home) + "/.config/blender/" + versionstr;
-+ }
- }
-
-- return (const GHOST_TUns8 *)user_path;
-+ return (const GHOST_TUns8 *)user_path.c_str();
- }
- }
-
-diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index f9a66aa..fdba1ea 100644
---- a/source/blender/blenlib/BLI_fileops.h
-+++ b/source/blender/blenlib/BLI_fileops.h
-@@ -43,6 +43,12 @@ extern "C" {
- /* for size_t (needed on windows) */
- #include <stddef.h>
-
-+#include <limits.h> /* for PATH_MAX */
-+
-+#ifndef PATH_MAX
-+# define PATH_MAX 4096
-+#endif
-+
- struct gzFile;
-
- /* Common */
-diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
-index 20a4c3c..e75ec7e 100644
---- a/source/blender/blenlib/BLI_winstuff.h
-+++ b/source/blender/blenlib/BLI_winstuff.h
-@@ -100,7 +100,6 @@ extern "C" {
- // not accepted by access() on windows
- //# define X_OK 1
- # define F_OK 0
--# define PATH_MAX 4096
- #endif
-
- #ifndef FREE_WINDOWS
-diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
-index 6b45c6f..74bd683 100644
---- a/source/blender/blenlib/intern/storage.c
-+++ b/source/blender/blenlib/intern/storage.c
-@@ -70,7 +70,6 @@
- #ifdef WIN32
- # include <io.h>
- # include <direct.h>
--# include <limits.h> /* PATH_MAX */
- # include "BLI_winstuff.h"
- # include "utfconv.h"
- #else
diff --git a/debian/patches/series b/debian/patches/series
index 0d73beb..033c9ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
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_PATH_MAX_issue.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list