diff --git a/.gitignore b/.gitignore index f76b70d..93e0c9f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ blender-2.49b-repack.tar.bz2 /blender-2.60a.tar.gz /blender-2.61.tar.gz /blender-2.62.tar.gz +/blender-2.63.tar.gz diff --git a/blender-2.61-gcc47.patch b/blender-2.61-gcc47.patch deleted file mode 100644 index 3254110..0000000 --- a/blender-2.61-gcc47.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up blender-2.61/intern/elbeem/intern/ntl_vector3dim.h.gcc47 blender-2.61/intern/elbeem/intern/ntl_vector3dim.h ---- blender-2.61/intern/elbeem/intern/ntl_vector3dim.h.gcc47 2012-02-08 18:57:14.006686472 +0100 -+++ blender-2.61/intern/elbeem/intern/ntl_vector3dim.h 2012-02-08 19:01:36.319268168 +0100 -@@ -27,6 +27,12 @@ - #include - #include - -+/* absolute value */ -+template < class T > -+inline T -+ABS( T a ) -+{ return (0 < a) ? a : -a ; } -+ - // hack for MSVC6.0 compiler - #ifdef _MSC_VER - #if _MSC_VER < 1300 -diff -up blender-2.61/intern/elbeem/intern/utilities.h.gcc47 blender-2.61/intern/elbeem/intern/utilities.h ---- blender-2.61/intern/elbeem/intern/utilities.h.gcc47 2011-12-13 20:42:21.000000000 +0100 -+++ blender-2.61/intern/elbeem/intern/utilities.h 2012-02-08 19:01:37.519253177 +0100 -@@ -10,8 +10,8 @@ - * - *****************************************************************************/ - #ifndef UTILITIES_H --#include "ntl_vector3dim.h" - -+#include "ntl_vector3dim.h" - - /* debugging outputs , debug level 0 (off) to 10 (max) */ - #ifdef ELBEEM_PLUGIN -@@ -177,12 +177,6 @@ inline T - MAX( T a, T b ) - { return (a < b) ? b : a ; } - --/* absolute value */ --template < class T > --inline T --ABS( T a ) --{ return (0 < a) ? a : -a ; } -- - /* sign of the value */ - template < class T > - inline T -@@ -208,4 +202,5 @@ SQUARE( T a ) - - - #define UTILITIES_H -+ - #endif diff --git a/blender-2.61-syspath.patch b/blender-2.61-syspath.patch deleted file mode 100644 index 0a3ebfd..0000000 --- a/blender-2.61-syspath.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up blender-2.61/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.61/source/blender/blenfont/intern/blf_lang.c ---- blender-2.61/source/blender/blenfont/intern/blf_lang.c.syspath 2011-12-13 20:51:08.000000000 +0100 -+++ blender-2.61/source/blender/blenfont/intern/blf_lang.c 2011-12-14 19:45:05.695753793 +0100 -@@ -101,7 +101,7 @@ static const char *locales[] = { - - void BLF_lang_init(void) - { -- char *messagepath= BLI_get_folder(BLENDER_DATAFILES, "locale"); -+ char *messagepath = "/usr/share/locale"; - - BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); - -diff -up blender-2.61/source/blender/blenlib/intern/path_util.c.syspath blender-2.61/source/blender/blenlib/intern/path_util.c ---- blender-2.61/source/blender/blenlib/intern/path_util.c.syspath 2011-12-13 20:51:07.000000000 +0100 -+++ blender-2.61/source/blender/blenlib/intern/path_util.c 2011-12-14 19:48:04.557027766 +0100 -@@ -982,35 +982,6 @@ static int get_path_system(char *targetp - 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'; - diff --git a/blender-2.62-ndof.patch b/blender-2.62-ndof.patch deleted file mode 100644 index ae643d9..0000000 --- a/blender-2.62-ndof.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- intern/ghost/intern/GHOST_NDOFManagerX11.cpp (revision 45950) -+++ intern/ghost/intern/GHOST_NDOFManagerX11.cpp (revision 45951) -@@ -75,28 +75,32 @@ - - bool GHOST_NDOFManagerX11::processEvents() - { -- GHOST_TUns64 now = m_system.getMilliSeconds(); -- - bool anyProcessed = false; -- spnav_event e; -- while (spnav_poll_event(&e)) { -- switch (e.type) { -- case SPNAV_EVENT_MOTION: -- { -- /* convert to blender view coords */ -- short t[3] = {e.motion.x, e.motion.y, -e.motion.z}; -- short r[3] = {-e.motion.rx, -e.motion.ry, e.motion.rz}; - -- updateTranslation(t, now); -- updateRotation(r, now); -- break; -+ if (m_available) { -+ GHOST_TUns64 now = m_system.getMilliSeconds(); -+ -+ spnav_event e; -+ while (spnav_poll_event(&e)) { -+ switch (e.type) { -+ case SPNAV_EVENT_MOTION: -+ { -+ /* convert to blender view coords */ -+ short t[3] = {e.motion.x, e.motion.y, -e.motion.z}; -+ short r[3] = {-e.motion.rx, -e.motion.ry, e.motion.rz}; -+ -+ updateTranslation(t, now); -+ updateRotation(r, now); -+ break; -+ } -+ case SPNAV_EVENT_BUTTON: -+ updateButton(e.button.bnum, e.button.press, now); -+ break; - } -- case SPNAV_EVENT_BUTTON: -- updateButton(e.button.bnum, e.button.press, now); -- break; -+ anyProcessed = true; - } -- anyProcessed = true; - } -+ - return anyProcessed; - } - diff --git a/blender.spec b/blender.spec index b53039f..f4ead88 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.62 +%global blender_api 2.63 # [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') @@ -11,8 +11,8 @@ Name: blender Epoch: 1 -Version: 2.62 -Release: 6%{?dist} +Version: %{blender_api} +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -27,7 +27,7 @@ Source5: blender.xml Source10: macros.blender Patch1: blender-2.44-bid.patch -Patch2: blender-2.61-syspath.patch +Patch2: blender-2.63-syspath.patch Patch4: blender-2.48-undefine-operation.patch Patch5: blender-2.50-uninit-var.patch @@ -35,9 +35,6 @@ Patch5: blender-2.50-uninit-var.patch Patch10: blender-2.58-python_include.patch Patch11: blender-2.61-openjpeg_stdbool.patch -# Upstream Patch, Should fixed in 2.63 -Patch101: blender-2.62-ndof.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libtool @@ -150,8 +147,6 @@ addon packages to extend blender. %patch10 -p1 %patch11 -p1 -b .openjpeg_stdbool -%patch101 -p0 -b .ndof - find -name '.svn' -print | xargs rm -rf %build @@ -279,8 +274,8 @@ fi || : %{_bindir}/blender %{_datadir}/applications/blender.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* -%{blenderarch}/ -%{blenderlib}/ +%{_libdir}/blender/ +%{_datadir}/blender/ %{_datadir}/mime/packages/blender.xml %{_mandir}/man1/blender.* %doc COPYING doc/license/*-license.txt @@ -296,6 +291,9 @@ fi || : %{_sysconfdir}/rpm/macros.blender %changelog +* Fri Apr 27 2012 Jochen Schmitt 1:2.63-1 +- New upstream release + * Wed Apr 25 2012 Jochen Schmitt 1:2.62-6 - Fix crash in libspnav (#814665) diff --git a/sources b/sources index 083ecec..0a195bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2357584a5081b03f6e60ba3efe2a610 blender-2.62.tar.gz +1cc18a9074ba63313a5711887de76c54 blender-2.63.tar.gz