From 7c6e28ce1703cdbea4aa1fa122b300f409085905 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Feb 21 2013 20:15:14 +0000 Subject: New upstream release --- diff --git a/.gitignore b/.gitignore index 202bf26..d9824c0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ blender-2.49b-repack.tar.bz2 /blender-2.64a.tar.gz /blender-2.65.tar.gz /blender-2.65a.tar.gz +/blender-2.66.tar.gz diff --git a/blender-2.65-droid.patch b/blender-2.65-droid.patch deleted file mode 100644 index ea03cb9..0000000 --- a/blender-2.65-droid.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up blender-2.65/source/blender/blenfont/intern/blf_translation.c.droid blender-2.65/source/blender/blenfont/intern/blf_translation.c ---- blender-2.65/source/blender/blenfont/intern/blf_translation.c.droid 2012-12-10 20:25:45.000000000 +0100 -+++ blender-2.65/source/blender/blenfont/intern/blf_translation.c 2012-12-11 22:22:12.890424604 +0100 -@@ -53,18 +53,12 @@ static int unifont_size = 0; - - unsigned char *BLF_get_unifont(int *unifont_size_r) - { -- if (unifont_ttf == NULL) { -- char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts"); -- if (fontpath) { -- char unifont_path[1024]; -- -- BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename); -+ const char *fontpath = "/usr/share/fonts/google-droid"; - -- unifont_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_size); -- } -- else { -- printf("%s: 'fonts' data path not found for international font, continuing\n", __func__); -- } -+ if (unifont_ttf == NULL) { -+ char unifont_path[1024]; -+ BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename); -+ unifont_ttf = (unsigned char *)BLI_file_to_mem(unifont_path, &unifont_size); - } - - *unifont_size_r = unifont_size; -diff -up blender-2.65/source/blender/blenlib/BLI_fileops.h.droid blender-2.65/source/blender/blenlib/BLI_fileops.h ---- blender-2.65/source/blender/blenlib/BLI_fileops.h.droid 2012-12-10 20:25:44.000000000 +0100 -+++ blender-2.65/source/blender/blenlib/BLI_fileops.h 2012-12-11 22:04:17.442332100 +0100 -@@ -81,6 +81,8 @@ 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); - -+char *BLI_file_to_mem(const char *from_file, int *size_r); -+ - size_t BLI_file_descriptor_size(int file); - size_t BLI_file_size(const char *file); - -diff -up blender-2.65/source/blender/blenlib/intern/fileops.c.droid blender-2.65/source/blender/blenlib/intern/fileops.c ---- blender-2.65/source/blender/blenlib/intern/fileops.c.droid 2012-12-10 20:25:44.000000000 +0100 -+++ blender-2.65/source/blender/blenlib/intern/fileops.c 2012-12-11 22:04:17.442332100 +0100 -@@ -155,6 +155,31 @@ char *BLI_file_ungzip_to_mem(const char - return mem; - } - -+char *BLI_file_to_mem(const char *from_file, int *size_r) -+{ -+ int file; -+ int size = 0; -+ char *mem = NULL; -+ -+ file = BLI_open(from_file, O_RDONLY, 0); -+ -+ size = BLI_file_descriptor_size(file); -+ -+ if (size == 0) { -+ close (file); -+ return 0; -+ } -+ -+ mem = MEM_callocN(size, "BLI_ungzip_to_mem"); -+ -+ read(file, mem, size); -+ -+ close (file); -+ -+ *size_r = size; -+ -+ return mem; -+} - - /* return 1 when file can be written */ - int BLI_file_is_writable(const char *filename) diff --git a/blender-2.65-syspath.patch b/blender-2.65-syspath.patch deleted file mode 100644 index e867baa..0000000 --- a/blender-2.65-syspath.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.65/source/blender/blenfont/intern/blf_lang.c ---- blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath 2012-12-10 20:25:45.000000000 +0100 -+++ blender-2.65/source/blender/blenfont/intern/blf_lang.c 2012-12-15 08:39:00.897062402 +0100 -@@ -83,7 +83,7 @@ static void free_locales(void) - - static void fill_locales(void) - { -- char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale"); -+ char languages_path[FILE_MAX] = "/usr/share/blender"; - LinkNode *lines = NULL, *line; - char *str; - int idx = 0; -@@ -184,7 +184,7 @@ EnumPropertyItem *BLF_RNA_lang_enum_prop - - void BLF_lang_init(void) - { -- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale"); -+ char *messagepath = "/usr/share/locale"; - - if (messagepath) { - bl_locale_init(messagepath, TEXT_DOMAIN_NAME); -diff -up blender-2.65/source/blender/blenlib/intern/path_util.c.syspath blender-2.65/source/blender/blenlib/intern/path_util.c ---- blender-2.65/source/blender/blenlib/intern/path_util.c.syspath 2012-12-10 20:25:44.000000000 +0100 -+++ blender-2.65/source/blender/blenlib/intern/path_util.c 2012-12-15 08:34:18.594027763 +0100 -@@ -983,38 +983,6 @@ static int get_path_system(char *targetp - char system_path[FILE_MAX]; - const char *system_base_path; - -- -- /* first allow developer only overrides to the system path -- * these are only used when running blender from source */ -- char cwd[FILE_MAX]; -- char relfolder[FILE_MAX]; -- -- if (folder_name) { -- if (subfolder_name) { -- BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name); -- } -- else { -- BLI_strncpy(relfolder, folder_name, sizeof(relfolder)); -- } -- } -- else { -- relfolder[0] = '\0'; -- } -- -- /* try CWD/release/folder_name */ -- if (BLI_current_working_dir(cwd, sizeof(cwd))) { -- if (test_path(targetpath, cwd, "release", relfolder)) { -- return 1; -- } -- } -- -- /* try EXECUTABLE_DIR/release/folder_name */ -- if (test_path(targetpath, bprogdir, "release", relfolder)) -- return 1; -- /* end developer overrides */ -- -- -- - system_path[0] = '\0'; - - if (test_env_path(system_path, envvar)) { diff --git a/blender-2.66-droid.patch b/blender-2.66-droid.patch new file mode 100644 index 0000000..3d76fe0 --- /dev/null +++ b/blender-2.66-droid.patch @@ -0,0 +1,72 @@ +diff -up blender-2.66/source/blender/blenfont/intern/blf_translation.c.droid blender-2.66/source/blender/blenfont/intern/blf_translation.c +--- blender-2.66/source/blender/blenfont/intern/blf_translation.c.droid 2013-02-13 12:52:01.000000000 +0100 ++++ blender-2.66/source/blender/blenfont/intern/blf_translation.c 2013-02-21 20:31:57.800940997 +0100 +@@ -56,17 +56,10 @@ unsigned char *BLF_get_unifont(int *unif + { + #ifdef WITH_INTERNATIONAL + if (unifont_ttf == NULL) { +- char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts"); +- if (fontpath) { +- char unifont_path[1024]; +- +- BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename); +- +- unifont_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_size); +- } +- else { +- printf("%s: 'fonts' data path not found for international font, continuing\n", __func__); +- } ++ char *fontpath = "/usr/share/fonts/goggle-droid"; ++ char unifont_path[1024]; ++ BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename); ++ unifont_ttf = (unsigned char *)BLI_file_to_mem(unifont_path, &unifont_size); + } + + *unifont_size_r = unifont_size; +diff -up blender-2.66/source/blender/blenlib/BLI_fileops.h.droid blender-2.66/source/blender/blenlib/BLI_fileops.h +--- blender-2.66/source/blender/blenlib/BLI_fileops.h.droid 2012-10-06 09:03:03.000000000 +0200 ++++ blender-2.66/source/blender/blenlib/BLI_fileops.h 2013-02-21 20:12:46.152168063 +0100 +@@ -81,6 +81,8 @@ 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); + ++char *BLI_file_to_mem(const char *from_file, int *size_r); ++ + size_t BLI_file_descriptor_size(int file); + size_t BLI_file_size(const char *file); + +diff -up blender-2.66/source/blender/blenlib/intern/fileops.c.droid blender-2.66/source/blender/blenlib/intern/fileops.c +--- blender-2.66/source/blender/blenlib/intern/fileops.c.droid 2013-02-11 01:49:00.000000000 +0100 ++++ blender-2.66/source/blender/blenlib/intern/fileops.c 2013-02-21 20:12:46.154167927 +0100 +@@ -155,6 +155,31 @@ char *BLI_file_ungzip_to_mem(const char + return mem; + } + ++char *BLI_file_to_mem(const char *from_file, int *size_r) ++{ ++ int file; ++ int size = 0; ++ char *mem = NULL; ++ ++ file = BLI_open(from_file, O_RDONLY, 0); ++ ++ size = BLI_file_descriptor_size(file); ++ ++ if (size == 0) { ++ close (file); ++ return 0; ++ } ++ ++ mem = MEM_callocN(size, "BLI_ungzip_to_mem"); ++ ++ read(file, mem, size); ++ ++ close (file); ++ ++ *size_r = size; ++ ++ return mem; ++} + + /* return 1 when file can be written */ + int BLI_file_is_writable(const char *filename) diff --git a/blender-2.66-syspath.patch b/blender-2.66-syspath.patch new file mode 100644 index 0000000..5bd2222 --- /dev/null +++ b/blender-2.66-syspath.patch @@ -0,0 +1,54 @@ +diff -up blender-2.66/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.66/source/blender/blenfont/intern/blf_lang.c +--- blender-2.66/source/blender/blenfont/intern/blf_lang.c.syspath 2013-01-21 11:46:01.000000000 +0100 ++++ blender-2.66/source/blender/blenfont/intern/blf_lang.c 2013-02-21 20:07:21.742554532 +0100 +@@ -78,7 +78,7 @@ static void free_locales(void) + + static void fill_locales(void) + { +- char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale"); ++ char languages_path[FILE_MAX] = "/usr/share/blender"; + LinkNode *lines = NULL, *line; + char *str; + int idx = 0; +diff -up blender-2.66/source/blender/blenlib/intern/path_util.c.syspath blender-2.66/source/blender/blenlib/intern/path_util.c +--- blender-2.66/source/blender/blenlib/intern/path_util.c.syspath 2013-02-06 12:24:13.000000000 +0100 ++++ blender-2.66/source/blender/blenlib/intern/path_util.c 2013-02-21 20:07:21.749554080 +0100 +@@ -989,38 +989,6 @@ static int get_path_system(char *targetp + char system_path[FILE_MAX]; + const char *system_base_path; + +- +- /* first allow developer only overrides to the system path +- * these are only used when running blender from source */ +- char cwd[FILE_MAX]; +- char relfolder[FILE_MAX]; +- +- if (folder_name) { +- if (subfolder_name) { +- BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name); +- } +- else { +- BLI_strncpy(relfolder, folder_name, sizeof(relfolder)); +- } +- } +- else { +- relfolder[0] = '\0'; +- } +- +- /* try CWD/release/folder_name */ +- if (BLI_current_working_dir(cwd, sizeof(cwd))) { +- if (test_path(targetpath, cwd, "release", relfolder)) { +- return 1; +- } +- } +- +- /* try EXECUTABLE_DIR/release/folder_name */ +- if (test_path(targetpath, bprogdir, "release", relfolder)) +- return 1; +- /* end developer overrides */ +- +- +- + system_path[0] = '\0'; + + if (test_env_path(system_path, envvar)) { diff --git a/blender.spec b/blender.spec index 298e7fb..496557f 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.65 +%global blender_api 2.66 # [Fedora] Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -12,8 +12,8 @@ Name: blender Epoch: 1 -Version: %{blender_api}a -Release: 5%{?dist} +Version: %{blender_api} +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -27,14 +27,8 @@ Source5: blender.xml Source10: macros.blender -Patch1: blender-2.65-syspath.patch - -# fix build on non-x86 64-bit arches -Patch2: blender-2.64-64bit.patch - -Patch3: blender-2.65-droid.patch -# fix typo in big endian support -Patch4: blender-2.64a-big-endian.patch +Patch1: blender-2.66-syspath.patch +Patch2: blender-2.66-droid.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -135,9 +129,7 @@ addon packages to extend blender. %setup -q %patch1 -p1 -b .syspath -%patch2 -p1 -b .64bit -%patch3 -p1 -b .droid -%patch4 -p1 -b .big-endian +%patch2 -p1 -b .droid find -name '.svn' -print | xargs rm -rf @@ -273,6 +265,9 @@ fi || : %{_sysconfdir}/rpm/macros.blender %changelog +* Thu Feb 21 2013 Jochen Schmitt - 1:2.66-1 +- New upstream release + * Sun Feb 10 2013 Denis Arnaud - 1:2.65a-5 - Rebuild for Boost-1.53.0 diff --git a/sources b/sources index 95d1d5f..c03c5a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bbe18060c5c9c2ad600c8bfe8ee4786 blender-2.65a.tar.gz +159aedda89693321c5055819fa8e91cf blender-2.66.tar.gz