[SCM] blender/master: debian/patches/: #0010 and #0011 dropped (applied upstream)
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Sat Apr 28 12:06:31 UTC 2012
The following commit has been merged in the master branch:
commit a02b4ee8dce885477610b34936a7781f19f43d93
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Sat Apr 28 12:07:58 2012 +0200
debian/patches/: #0010 and #0011 dropped (applied upstream)
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index fc4ad3a..c97b900 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -29,10 +29,10 @@ index 8b93eeb..a056852 100755
import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 1b4d88a..8bd89d6 100644
+index 0168c06..caf990f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -376,7 +376,7 @@ if(UNIX AND NOT APPLE)
+@@ -384,7 +384,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_lib.patch b/debian/patches/0003-install_in_usr_lib.patch
index e312328..fd4ea4d 100644
--- a/debian/patches/0003-install_in_usr_lib.patch
+++ b/debian/patches/0003-install_in_usr_lib.patch
@@ -1,5 +1,5 @@
From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Thu, 5 Jan 2012 09:50:48 +0100
+Date: Sat, 28 Apr 2012 10:50:34 +0200
Subject: install_in_usr_lib
* Arch-specific files go to /usr/lib rather than /usr/share
@@ -10,23 +10,23 @@ Subject: install_in_usr_lib
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-index 7261491..30ff1da 100644
+index 6dad366..f91b645 100644
--- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
@@ -47,7 +47,7 @@
#endif
#ifdef PREFIX
--static const char *static_path= PREFIX "/share" ;
-+static const char *static_path= PREFIX "/lib" ;
+-static const char *static_path= PREFIX "/share";
++static const char *static_path= PREFIX "/lib";
#else
static const char *static_path= NULL;
#endif
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 8bd89d6..7a6a581 100644
+index caf990f..7b61535 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -273,8 +273,8 @@ if(WITH_PYTHON)
+@@ -281,8 +281,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 0c6329c..85a3adc 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0004-filter_docs_to_install.patch
@@ -8,10 +8,10 @@ Install relevant documentation
1 file changed, 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 7a6a581..7480ab8 100644
+index 7b61535..dadf1fc 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -218,8 +218,6 @@ else()
+@@ -226,8 +226,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 b5bb113..2926e4f 100644
--- a/debian/patches/0005-locales_directory_install.patch
+++ b/debian/patches/0005-locales_directory_install.patch
@@ -1,5 +1,5 @@
-From: "Matteo F. Vescovi" <m.vescovi at revese.it>
-Date: Thu, 22 Dec 2011 18:17:18 +0100
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sat, 28 Apr 2012 10:58:56 +0200
Subject: locales_directory_install
Change where locales are installed
@@ -11,20 +11,20 @@ Change where locales are installed
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 d96011f..67d02dc 100644
+index 435ca87..8f48bae 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
-@@ -109,7 +109,7 @@ static const char *locales[] = {
+@@ -110,7 +110,7 @@ static const char *locales[] = {
void BLF_lang_init(void)
{
-- char *messagepath= BLI_get_folder(BLENDER_DATAFILES, "locale");
+- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
+ char *messagepath= BLI_get_folder(BLENDER_SYSTEM_LOCALE, NULL);
BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name));
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
-index 68bb1a7..ba1852e 100644
+index e02b48f..5c0ac22 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -62,6 +62,7 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check);
@@ -36,24 +36,24 @@ 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 bbdb9bc..06043a5 100644
+index 3c59ca8..4cf617f 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -1090,6 +1090,9 @@ char *BLI_get_folder(int folder_id, const char *subfolder)
+@@ -1104,6 +1104,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;
return NULL;
+
+ case BLENDER_SYSTEM_LOCALE:
-+ BLI_strncpy(path,"/usr/share/locale",FILE_MAX);break;
++ BLI_strncpy(path, "/usr/share/locale", FILE_MAX); break;
}
return path;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 7480ab8..b0469e6 100644
+index dadf1fc..857e3d4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -285,9 +285,9 @@ endif()
+@@ -293,9 +293,9 @@ endif()
if(WITH_INTERNATIONAL)
install(
DIRECTORY
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index c544c75..d2c6461 100644
--- a/debian/patches/0006-update_manpages.patch
+++ b/debian/patches/0006-update_manpages.patch
@@ -150,10 +150,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 b0469e6..46b8fe3 100644
+index 857e3d4..2e7c1cd 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -314,6 +314,7 @@ if(UNIX AND NOT APPLE)
+@@ -322,6 +322,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
@@ -161,7 +161,7 @@ index b0469e6..46b8fe3 100644
DESTINATION ${TARGETDIR}
)
-@@ -377,7 +378,9 @@ if(UNIX AND NOT APPLE)
+@@ -385,7 +386,9 @@ if(UNIX AND NOT APPLE)
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts
)
install(
diff --git a/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch b/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
index 95ae784..23026d2 100644
--- a/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
+++ b/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
@@ -13,10 +13,10 @@ Signed-off-by: Antonio Ospite <ospite at studenti.unina.it>
2 files changed, 63 insertions(+)
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
-index 582086d..9852fd7 100644
+index 9dbbb46..cbc510a 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
-@@ -35,6 +35,7 @@
+@@ -32,6 +32,7 @@
#include <libavcodec/avcodec.h>
#include <libavutil/rational.h>
@@ -24,7 +24,7 @@ index 582086d..9852fd7 100644
#include <libavutil/opt.h>
#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
-@@ -49,6 +50,67 @@
+@@ -46,6 +47,67 @@
#define FFMPEG_HAVE_AVIO 1
#endif
@@ -93,7 +93,7 @@ index 582086d..9852fd7 100644
#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
#endif
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
-index c4c3eb4..09ed61d 100644
+index 59c3811..9dff954 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -36,6 +36,7 @@
diff --git a/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch b/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
index 8ac0ce8..79d07a2 100644
--- a/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
+++ b/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
@@ -1,5 +1,5 @@
-From: Antonio Ospite <ospite at studenti.unina.it>
-Date: Fri, 6 Jan 2012 14:31:50 +0100
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sat, 28 Apr 2012 11:02:59 +0200
Subject: do_not_use_version_number_in_the_system_path
Global installation expects system patch to be something like
@@ -9,10 +9,10 @@ Global installation expects system patch to be something like
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
-index 06043a5..c5e1146 100644
+index 4cf617f..b2a584d 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -89,7 +89,7 @@
+@@ -90,7 +90,7 @@
# else /* new XDG ~/blender/.config/ */
# define BLENDER_USER_FORMAT "%s/blender/%s"
# endif // WITH_XDG_USER_DIRS
@@ -21,7 +21,7 @@ index 06043a5..c5e1146 100644
#endif
/* local */
-@@ -1027,7 +1027,7 @@ static int get_path_system(char *targetpath, const char *folder_name, const char
+@@ -1040,7 +1040,7 @@ static int get_path_system(char *targetpath, const char *folder_name, const char
system_base_path = (const char *)GHOST_getSystemDir();
if (system_base_path) {
@@ -29,4 +29,4 @@ index 06043a5..c5e1146 100644
+ BLI_snprintf(system_path, FILE_MAX, BLENDER_SYSTEM_FORMAT, system_base_path);
}
- if(!system_path[0])
+ if (!system_path[0])
diff --git a/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
index 19267a2..2166957 100644
--- a/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
@@ -1,5 +1,5 @@
From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Tue, 21 Feb 2012 19:51:50 +0100
+Date: Sat, 28 Apr 2012 12:05:51 +0200
Subject: look_for_droid_ttf_with_fontconfig
* Remove bad installation of fonts directory into locales.
@@ -10,17 +10,17 @@ Signed-off-by: Kevin Roy <kiniou at gmail.com>
---
CMakeLists.txt | 10 +++++
build_files/cmake/Modules/FindFontconfig.cmake | 49 ++++++++++++++++++++++
- build_files/cmake/macros.cmake | 6 ++-
+ build_files/cmake/macros.cmake | 4 ++
source/blender/blenfont/CMakeLists.txt | 7 ++++
source/blender/blenfont/intern/blf_translation.c | 23 ++++++++++
source/blender/blenlib/BLI_fileops.h | 1 +
source/blender/blenlib/intern/fileops.c | 43 +++++++++++++++++++
source/creator/CMakeLists.txt | 1 -
- 8 files changed, 138 insertions(+), 2 deletions(-)
+ 8 files changed, 137 insertions(+), 1 deletion(-)
create mode 100644 build_files/cmake/Modules/FindFontconfig.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0b14b7..139aed8 100644
+index 7e9e50f..c6e55db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,9 @@ option(WITH_BLENDER "Build blender (disable to build only the blender player)" O
@@ -33,7 +33,7 @@ index e0b14b7..139aed8 100644
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)
-@@ -510,6 +513,13 @@ if(UNIX AND NOT APPLE)
+@@ -581,6 +584,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -103,10 +103,10 @@ index 0000000..337ece9
+
+endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 406f253..ba88ea8 100644
+index eeefcf7..6de7fa8 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -244,6 +244,10 @@ macro(setup_liblinks
+@@ -242,6 +242,10 @@ macro(setup_liblinks
endif()
endif()
@@ -117,13 +117,6 @@ index 406f253..ba88ea8 100644
if(WITH_OPENAL)
target_link_libraries(${target} ${OPENAL_LIBRARY})
endif()
-@@ -677,4 +681,4 @@ macro(set_lib_path
- endif()
-
-
--endmacro()
-\ No newline at end of file
-+endmacro()
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index ebf9ff4..550aa0d 100644
--- a/source/blender/blenfont/CMakeLists.txt
@@ -143,7 +136,7 @@ index ebf9ff4..550aa0d 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 0ddb654..83ed78b 100644
+index 12fa15a..8100fad 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@ -57,13 +57,35 @@
@@ -153,14 +146,14 @@ index 0ddb654..83ed78b 100644
+#ifdef WITH_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#else
- static const char unifont_filename[]="droidsans.ttf.gz";
+ static const char unifont_filename[] ="droidsans.ttf.gz";
+#endif
- static unsigned char *unifont_ttf= NULL;
- static int unifont_size= 0;
+ static unsigned char *unifont_ttf = NULL;
+ static int unifont_size = 0;
unsigned char *BLF_get_unifont(int *unifont_size_r)
{
- if(unifont_ttf==NULL) {
+ if (unifont_ttf == NULL) {
+#ifdef WITH_FONTCONFIG
+ FcFontSet *fontset = NULL;
+ FcValue v;
@@ -189,12 +182,12 @@ index 0ddb654..83ed78b 100644
+#endif
}
- *unifont_size_r= unifont_size;
+ *unifont_size_r = unifont_size;
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index 2e8f1a5..0e66218 100644
+index 73220cb..30981d9 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
-@@ -70,6 +70,7 @@ int BLI_file_touch(const char *file);
+@@ -79,6 +79,7 @@ int 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);
@@ -203,10 +196,10 @@ 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 ad04780..f902106 100644
+index 4b5ea44..2fa648b 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
-@@ -147,6 +147,49 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
+@@ -152,6 +152,49 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
return mem;
}
@@ -257,10 +250,10 @@ index ad04780..f902106 100644
/* return 1 when file can be written */
int BLI_file_is_writable(const char *filename)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 46b8fe3..f047426 100644
+index 2e7c1cd..3e34146 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -286,7 +286,6 @@ if(WITH_INTERNATIONAL)
+@@ -294,7 +294,6 @@ if(WITH_INTERNATIONAL)
install(
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/locale/
diff --git a/debian/patches/0010-Fix_german_translation_of_desktop_file.patch b/debian/patches/0010-Fix_german_translation_of_desktop_file.patch
deleted file mode 100644
index e9bfcfc..0000000
--- a/debian/patches/0010-Fix_german_translation_of_desktop_file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Wed, 4 Apr 2012 10:53:23 +0200
-Subject: Fix_german_translation_of_desktop_file
-
----
- release/freedesktop/blender.desktop | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/release/freedesktop/blender.desktop b/release/freedesktop/blender.desktop
-index 34b2b9b..be142c0 100644
---- a/release/freedesktop/blender.desktop
-+++ b/release/freedesktop/blender.desktop
-@@ -2,10 +2,11 @@
- Name=Blender
- GenericName=3D modeller
- GenericName[es]=modelador 3D
--GenericName[de]=3D Modellierer
-+GenericName[de]=3D-Modellierer
- GenericName[fr]=modeleur 3D
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
-+Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
- Comment[es]=modelado 3D, animación, renderizado y post-producción
- Exec=blender
- Icon=blender
diff --git a/debian/patches/0011-Fix_FTBFS_on_openjpeg_transition.patch b/debian/patches/0011-Fix_FTBFS_on_openjpeg_transition.patch
deleted file mode 100644
index a69c5cb..0000000
--- a/debian/patches/0011-Fix_FTBFS_on_openjpeg_transition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Tue, 24 Apr 2012 10:57:44 +0200
-Subject: Fix_FTBFS_on_openjpeg_transition
-
----
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/670219
-Forwarded: no
-Reviewed-By: Matteo F. Vescovi <mfv.debian at gmail.com>
-Last-Update: 2012-04-24
-
- source/blender/imbuf/intern/jp2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
-index f8082c9..2e7a65a 100644
---- a/source/blender/imbuf/intern/jp2.c
-+++ b/source/blender/imbuf/intern/jp2.c
-@@ -329,7 +329,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres)
-
- static void cinema_parameters(opj_cparameters_t *parameters)
- {
-- parameters->tile_size_on = false;
-+ parameters->tile_size_on = 0;
- parameters->cp_tdx=1;
- parameters->cp_tdy=1;
-
diff --git a/debian/patches/series b/debian/patches/series
index 32753d5..85eef24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,3 @@
0007-fix_FTBFS_with_ffmpeg_from_debian.patch
0008-do_not_use_version_number_in_the_system_path.patch
0009-look_for_droid_ttf_with_fontconfig.patch
-0010-Fix_german_translation_of_desktop_file.patch
-0011-Fix_FTBFS_on_openjpeg_transition.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list