From 98115817a8c11f8ae623cb1bf546eded7f6018b8 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Jan 08 2015 21:11:16 +0000 Subject: New upstream release --- diff --git a/.gitignore b/.gitignore index 7789f12..c37cc61 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,9 @@ blender-2.49b-repack.tar.bz2 /blender-2.70.tar.gz /blender-2.70a.tar.gz /blender-2.71.tar.gz +<<<<<<< HEAD +======= +/blender-2.72.tar.gz +/blender-2.72b.tar.gz +/blender-2.73.tar.gz +>>>>>>> 0d88b50... New upstream release diff --git a/blender-2.68a-droid.patch b/blender-2.68a-droid.patch deleted file mode 100644 index 46d45dc..0000000 --- a/blender-2.68a-droid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up blender-2.68a/source/blender/blenfont/intern/blf_translation.c.droid blender-2.68a/source/blender/blenfont/intern/blf_translation.c ---- blender-2.68a/source/blender/blenfont/intern/blf_translation.c.droid 2013-03-20 19:42:09.000000000 +0100 -+++ blender-2.68a/source/blender/blenfont/intern/blf_translation.c 2013-09-04 17:05:04.775210317 +0200 -@@ -59,7 +59,7 @@ unsigned char *BLF_get_unifont(int *unif - { - #ifdef WITH_INTERNATIONAL - if (unifont_ttf == NULL) { -- const char * const fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts"); -+ const char * const fontpath = "/usr/share/fonts/blender"; - if (fontpath) { - char unifont_path[1024]; - -@@ -94,7 +94,7 @@ unsigned char *BLF_get_unifont_mono(int - { - #ifdef WITH_INTERNATIONAL - if (unifont_mono_ttf == NULL) { -- const char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts"); -+ const char *fontpath = "/usr/share/fonts/blender"; - if (fontpath) { - char unifont_path[1024]; - diff --git a/blender-2.72-size_t.patch b/blender-2.72-size_t.patch deleted file mode 100644 index 6fe34a5..0000000 --- a/blender-2.72-size_t.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -up blender-2.72/intern/guardedalloc/intern/mallocn.c.size_t blender-2.72/intern/guardedalloc/intern/mallocn.c ---- blender-2.72/intern/guardedalloc/intern/mallocn.c.size_t 2014-10-11 10:30:15.630102814 -0400 -+++ blender-2.72/intern/guardedalloc/intern/mallocn.c 2014-10-11 11:33:02.370102814 -0400 -@@ -53,11 +53,11 @@ void (*MEM_set_error_callback)(void (*fu - bool (*MEM_check_memory_integrity)(void) = MEM_lockfree_check_memory_integrity; - void (*MEM_set_lock_callback)(void (*lock)(void), void (*unlock)(void)) = MEM_lockfree_set_lock_callback; - void (*MEM_set_memory_debug)(void) = MEM_lockfree_set_memory_debug; --uintptr_t (*MEM_get_memory_in_use)(void) = MEM_lockfree_get_memory_in_use; --uintptr_t (*MEM_get_mapped_memory_in_use)(void) = MEM_lockfree_get_mapped_memory_in_use; -+size_t (*MEM_get_memory_in_use)(void) = MEM_lockfree_get_memory_in_use; -+size_t (*MEM_get_mapped_memory_in_use)(void) = MEM_lockfree_get_mapped_memory_in_use; - unsigned int (*MEM_get_memory_blocks_in_use)(void) = MEM_lockfree_get_memory_blocks_in_use; - void (*MEM_reset_peak_memory)(void) = MEM_lockfree_reset_peak_memory; --uintptr_t (*MEM_get_peak_memory)(void) = MEM_lockfree_get_peak_memory; -+size_t (*MEM_get_peak_memory)(void) = MEM_lockfree_get_peak_memory; - - #ifndef NDEBUG - const char *(*MEM_name_ptr)(void *vmemh) = MEM_lockfree_name_ptr; -diff -up blender-2.72/intern/guardedalloc/intern/mallocn_guarded_impl.c.size_t blender-2.72/intern/guardedalloc/intern/mallocn_guarded_impl.c ---- blender-2.72/intern/guardedalloc/intern/mallocn_guarded_impl.c.size_t 2014-10-11 11:28:19.470102814 -0400 -+++ blender-2.72/intern/guardedalloc/intern/mallocn_guarded_impl.c 2014-10-11 11:30:04.110102814 -0400 -@@ -1151,9 +1151,9 @@ void MEM_guarded_reset_peak_memory(void) - mem_unlock_thread(); - } - --uintptr_t MEM_guarded_get_memory_in_use(void) -+size_t MEM_guarded_get_memory_in_use(void) - { -- uintptr_t _mem_in_use; -+ size_t _mem_in_use; - - mem_lock_thread(); - _mem_in_use = mem_in_use; -@@ -1162,9 +1162,9 @@ uintptr_t MEM_guarded_get_memory_in_use( - return _mem_in_use; - } - --uintptr_t MEM_guarded_get_mapped_memory_in_use(void) -+size_t MEM_guarded_get_mapped_memory_in_use(void) - { -- uintptr_t _mmap_in_use; -+ size_t _mmap_in_use; - - mem_lock_thread(); - _mmap_in_use = mmap_in_use; -diff -up blender-2.72/intern/guardedalloc/intern/mallocn_intern.h.size_t blender-2.72/intern/guardedalloc/intern/mallocn_intern.h ---- blender-2.72/intern/guardedalloc/intern/mallocn_intern.h.size_t 2014-10-11 10:30:58.000102814 -0400 -+++ blender-2.72/intern/guardedalloc/intern/mallocn_intern.h 2014-10-11 11:31:07.570102814 -0400 -@@ -132,11 +132,11 @@ void MEM_lockfree_set_error_callback(voi - bool MEM_lockfree_check_memory_integrity(void); - void MEM_lockfree_set_lock_callback(void (*lock)(void), void (*unlock)(void)); - void MEM_lockfree_set_memory_debug(void); --uintptr_t MEM_lockfree_get_memory_in_use(void); --uintptr_t MEM_lockfree_get_mapped_memory_in_use(void); -+size_t MEM_lockfree_get_memory_in_use(void); -+size_t MEM_lockfree_get_mapped_memory_in_use(void); - unsigned int MEM_lockfree_get_memory_blocks_in_use(void); - void MEM_lockfree_reset_peak_memory(void); --uintptr_t MEM_lockfree_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; -+size_t MEM_lockfree_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; - #ifndef NDEBUG - const char *MEM_lockfree_name_ptr(void *vmemh); - #endif -@@ -159,11 +159,11 @@ void MEM_guarded_set_error_callback(void - bool MEM_guarded_check_memory_integrity(void); - void MEM_guarded_set_lock_callback(void (*lock)(void), void (*unlock)(void)); - void MEM_guarded_set_memory_debug(void); --uintptr_t MEM_guarded_get_memory_in_use(void); --uintptr_t MEM_guarded_get_mapped_memory_in_use(void); -+size_t MEM_guarded_get_memory_in_use(void); -+size_t MEM_guarded_get_mapped_memory_in_use(void); - unsigned int MEM_guarded_get_memory_blocks_in_use(void); - void MEM_guarded_reset_peak_memory(void); --uintptr_t MEM_guarded_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; -+size_t MEM_guarded_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; - #ifndef NDEBUG - const char *MEM_guarded_name_ptr(void *vmemh); - #endif -diff -up blender-2.72/intern/guardedalloc/intern/mallocn_lockfree_impl.c.size_t blender-2.72/intern/guardedalloc/intern/mallocn_lockfree_impl.c ---- blender-2.72/intern/guardedalloc/intern/mallocn_lockfree_impl.c.size_t 2014-10-11 10:31:22.310102814 -0400 -+++ blender-2.72/intern/guardedalloc/intern/mallocn_lockfree_impl.c 2014-10-11 11:31:35.850102814 -0400 -@@ -442,12 +442,12 @@ void MEM_lockfree_set_memory_debug(void) - malloc_debug_memset = true; - } - --uintptr_t MEM_lockfree_get_memory_in_use(void) -+size_t MEM_lockfree_get_memory_in_use(void) - { - return mem_in_use; - } - --uintptr_t MEM_lockfree_get_mapped_memory_in_use(void) -+size_t MEM_lockfree_get_mapped_memory_in_use(void) - { - return mmap_in_use; - } -@@ -463,7 +463,7 @@ void MEM_lockfree_reset_peak_memory(void - peak_mem = 0; - } - --uintptr_t MEM_lockfree_get_peak_memory(void) -+size_t MEM_lockfree_get_peak_memory(void) - { - return peak_mem; - } -diff -up blender-2.72/intern/guardedalloc/MEM_guardedalloc.h.size_t blender-2.72/intern/guardedalloc/MEM_guardedalloc.h ---- blender-2.72/intern/guardedalloc/MEM_guardedalloc.h.size_t 2014-10-11 11:27:43.290102814 -0400 -+++ blender-2.72/intern/guardedalloc/MEM_guardedalloc.h 2014-10-11 11:28:05.440102814 -0400 -@@ -165,9 +165,9 @@ extern "C" { - * Memory usage stats - * - MEM_get_memory_in_use is all memory - * - MEM_get_mapped_memory_in_use is a subset of all memory */ -- extern uintptr_t (*MEM_get_memory_in_use)(void); -+ extern size_t (*MEM_get_memory_in_use)(void); - /** Get mapped memory usage. */ -- extern uintptr_t (*MEM_get_mapped_memory_in_use)(void); -+ extern size_t (*MEM_get_mapped_memory_in_use)(void); - /** Get amount of memory blocks in use. */ - extern unsigned int (*MEM_get_memory_blocks_in_use)(void); - diff --git a/blender-2.73-droid.patch b/blender-2.73-droid.patch new file mode 100644 index 0000000..3c3a67e --- /dev/null +++ b/blender-2.73-droid.patch @@ -0,0 +1,21 @@ +diff -up blender-2.73/source/blender/blenfont/intern/blf_translation.c.droid blender-2.73/source/blender/blenfont/intern/blf_translation.c +--- blender-2.73/source/blender/blenfont/intern/blf_translation.c.droid 2015-01-08 16:18:54.819213786 +0100 ++++ blender-2.73/source/blender/blenfont/intern/blf_translation.c 2015-01-08 16:31:38.720228573 +0100 +@@ -64,7 +64,7 @@ unsigned char *BLF_get_unifont(int *r_un + { + #ifdef WITH_INTERNATIONAL + if (unifont_ttf == NULL) { +- const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); ++ const char * const fontpath = "/usr/share/fonts/blender"; + if (fontpath) { + char unifont_path[1024]; + +@@ -99,7 +99,7 @@ unsigned char *BLF_get_unifont_mono(int + { + #ifdef WITH_INTERNATIONAL + if (unifont_mono_ttf == NULL) { +- const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); ++ const char *fontpath = "/usr/share/fonts/blender"; + if (fontpath) { + char unifont_path[1024]; + diff --git a/blender.spec b/blender.spec index f519097..d3b1138 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.72 +%global blender_api 2.73 %global blender_fontdir %{_fontbasedir}/blender # [Fedora] Turn off the brp-python-bytecompile script @@ -21,8 +21,8 @@ Name: blender Epoch: 1 -Version: %{blender_api}b -Release: 3%{?dist} +Version: %{blender_api} +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -36,9 +36,7 @@ Source5: blender.xml Source10: macros.blender -Patch2: blender-2.68a-droid.patch -# https://developer.blender.org/T42183 -Patch3: blender-2.72-size_t.patch +Patch2: blender-2.73-droid.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -150,7 +148,6 @@ sets. %setup -q %patch2 -p1 -b .droid -%patch3 -p1 -b .size_t find -name '.svn' -print | xargs rm -rf @@ -299,6 +296,12 @@ fi %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt %changelog +* Thu Jan 8 2015 Jochen Schmitt - 1:2.73-1 +- New upstream release + +* Wed Nov 26 2014 Rex Dieter - 1:2.72b-4 +- rebuild (openexr) + * Thu Nov 6 2014 Jochen Schmitt - 1:2.72b-3 - Fix odd dependy issue diff --git a/sources b/sources index 23438a7..f21179a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5542766199dd101de79670e437d1ef19 blender-2.72b.tar.gz +8e546e622c6dfc1f0231636270bdf8de blender-2.73.tar.gz