Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at Mon May 9 10:28:04 CEST 2011.
-------- --- blender/blender.changes 2011-04-28 11:58:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/blender/blender.changes 2011-05-05 21:34:25.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 5 19:32:07 UTC 2011 - [email protected] + +- Added blender-2.57b-nobuffer_ftoa_utf_link.patch to fix build with + openCOLLADA-svn839. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- blender-2.55-gcc46fix.patch blender-2.56-svn35386.patch blender-2.56-svn35395.patch blender-2.57b-PYC_INTERPRETER_ACTIVE.patch blender-2.57b-nobuffer_ftoa_utf_link.patch blender-2.57b.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.WB1hMr/_old 2011-05-09 10:27:11.000000000 +0200 +++ /var/tmp/diff_new_pack.WB1hMr/_new 2011-05-09 10:27:11.000000000 +0200 @@ -49,7 +49,7 @@ #BuildRequires: libjpeg-devel BuildRequires: libjpeg62-devel %if 0%{?collada} == 1 -BuildRequires: openCOLLADA-devel >= svn825 +BuildRequires: openCOLLADA-devel >= svn838 %endif BuildRequires: liblcms-devel %if %DISTRIBUTABLE <= 0 @@ -61,7 +61,7 @@ Group: Productivity/Graphics/3D Editors Summary: A 3D Modelling And Rendering Package Version: 2.56.34784 -Release: 7 +Release: 10 Url: http://www.blender.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.xz @@ -77,6 +77,7 @@ # Patch submitted upstream - Blender Patches item #19234, Patch2: blender-2.50-uninit-var.patch Patch4: blender-2.56-gcc46.patch +Patch5: blender-2.57b-nobuffer_ftoa_utf_link.patch %if %DISTRIBUTABLE == 1 # Patch3 is needed due to the purging of everything mpeg Patch3: blender-2.55-blenkernel.patch @@ -144,6 +145,7 @@ %patch1 %patch2 %patch4 -p1 +%patch5 %if %DISTRIBUTABLE == 1 %patch3 @@ -179,11 +181,12 @@ -DWITH_JACK:BOOL=on \ -DWITH_CODEC_SNDFILE:BOOL=on \ -DWITH_IMAGE_OPENJPEG:BOOL=off \ + -DWITH_BUILTIN_GLEW:BOOL=off \ %if %{collada} == 1 -DWITH_OPENCOLLADA:BOOL=on \ -DOPENCOLLADA=%{_prefix} \ - -DOPENCOLLADA_LIBPATH=%{_libdir} \ - -DOPENCOLLADA_INC=%{_includedir} \ + -DOPENCOLLADA_LIBPATH=/%{_libdir} \ + -DOPENCOLLADA_INC=/include \ %else -DWITH_OPENCOLLADA:BOOL=off \ %endif ++++++ blender-2.55-gcc46fix.patch ++++++ Index: extern/Eigen2/Eigen/src/Core/util/Memory.h =================================================================== --- extern/Eigen2/Eigen/src/Core/util/Memory.h.orig 2009-10-20 11:50:24.000000000 +0200 +++ extern/Eigen2/Eigen/src/Core/util/Memory.h 2011-03-12 16:24:18.180638921 +0200 @@ -26,6 +26,7 @@ #ifndef EIGEN_MEMORY_H #define EIGEN_MEMORY_H +#include <stddef.h> // FreeBSD 6 seems to have 16-byte aligned malloc // See http://svn.freebsd.org/viewvc/base/stable/6/lib/libc/stdlib/malloc.c?view=markup ++++++ blender-2.56-svn35386.patch ++++++ Index: release/scripts/startup/bl_ui/space_userpref.py =================================================================== --- release/scripts/startup/bl_ui/space_userpref.py.orig 2011-04-28 19:00:52.000000000 +0200 +++ release/scripts/startup/bl_ui/space_userpref.py 2011-04-28 23:38:45.500747370 +0200 @@ -1096,7 +1096,8 @@ class WM_OT_addon_install(bpy.types.Oper addon_path = "" pyfile_dir = os.path.dirname(pyfile) for addon_path in addon_utils.paths(): - if os.path.samefile(pyfile_dir, addon_path): + # if os.path.samefile(pyfile_dir, addon_path): # Py3.2 only!, upgrade soon! + if (hasattr(os.path, "samefile") and os.path.samefile(pyfile_dir, addon_path)) or pyfile_dir == addon_path: self.report({'ERROR'}, "Source file is in the addon search path: %r" % addon_path) return {'CANCELLED'} del addon_path Index: source/gameengine/GameLogic/SCA_PythonController.cpp =================================================================== --- source/gameengine/GameLogic/SCA_PythonController.cpp.orig 2011-04-28 19:03:23.000000000 +0200 +++ source/gameengine/GameLogic/SCA_PythonController.cpp 2011-04-28 23:38:45.501747345 +0200 @@ -415,7 +415,11 @@ void SCA_PythonController::Trigger(SCA_L excdict= PyDict_Copy(m_pythondictionary); +#if PY_VERSION_HEX >= 0x03020000 resultobj = PyEval_EvalCode((PyObject *)m_bytecode, excdict, excdict); +#else + resultobj = PyEval_EvalCode((PyCodeObject *)m_bytecode, excdict, excdict); +#endif /* PyRun_SimpleString(m_scriptText.Ptr()); */ break; Index: source/blender/python/intern/bpy_interface.c =================================================================== --- source/blender/python/intern/bpy_interface.c.orig 2011-04-28 19:04:29.000000000 +0200 +++ source/blender/python/intern/bpy_interface.c 2011-04-28 23:38:45.546746209 +0200 @@ -318,7 +318,7 @@ static int python_script_exec(bContext * if (text) { char fn_dummy[FILE_MAXDIR]; - bpy_text_filename_get(fn_dummy, sizeof(fn_dummy), text); + bpy_text_filename_get(fn_dummy, text); if(text->compiled == NULL) { /* if it wasn't already compiled, do it now */ char *buf= txt_to_buf(text); Index: source/blender/python/generic/py_capi_utils.c =================================================================== --- source/blender/python/generic/py_capi_utils.c.orig 2011-04-28 19:04:33.000000000 +0200 +++ source/blender/python/generic/py_capi_utils.c 2011-04-28 23:38:45.571745571 +0200 @@ -75,6 +75,18 @@ void PyC_LineSpit(void) { fprintf(stderr, "%s:%d\n", filename, lineno); } +/* python 3.2 only, copied from frameobjec.c */ +#if PY_VERSION_HEX < 0x03020000 +int +PyFrame_GetLineNumber(PyFrameObject *f) +{ + if (f->f_trace) + return f->f_lineno; + else + return PyCode_Addr2Line(f->f_code, f->f_lasti); +} +#endif + void PyC_FileAndNum(const char **filename, int *lineno) { PyFrameObject *frame; Index: source/blender/python/generic/bpy_internal_import.c =================================================================== --- source/blender/python/generic/bpy_internal_import.c.orig 2011-04-28 19:04:33.000000000 +0200 +++ source/blender/python/generic/bpy_internal_import.c 2011-04-28 23:38:45.596744935 +0200 @@ -95,9 +95,16 @@ void bpy_import_main_set(struct Main *ma } /* returns a dummy filename for a textblock so we can tell what file a text block comes from */ -void bpy_text_filename_get(char *fn, size_t fn_len, Text *text) +void bpy_text_filename_get(char *fn, Text *text) { - BLI_snprintf(fn, fn_len, "%s%c%s", text->id.lib ? text->id.lib->filepath : G.main->name, SEP, text->id.name+2); +#if PY_VERSION_HEX >= 0x03020000 + sprintf(fn, "%s%c%s", text->id.lib ? text->id.lib->filepath : G.main->name, SEP, text->id.name+2); +#else + /* this is a bug in python's Py_CompileString()!, fixed for python 3.2. + the string encoding should not be required to be utf-8 + reported: http://bugs.python.org/msg115202 */ + strcpy(fn, text->id.name+2); +#endif } PyObject *bpy_text_import(Text *text) @@ -108,7 +115,7 @@ PyObject *bpy_text_import(Text *text) if(!text->compiled) { char fn_dummy[256]; - bpy_text_filename_get(fn_dummy, sizeof(fn_dummy), text); + bpy_text_filename_get(fn_dummy, text); buf= txt_to_buf(text); text->compiled= Py_CompileString(buf, fn_dummy, Py_file_input); Index: source/blender/python/generic/bpy_internal_import.h =================================================================== --- source/blender/python/generic/bpy_internal_import.h.orig 2011-04-28 19:04:33.000000000 +0200 +++ source/blender/python/generic/bpy_internal_import.h 2011-04-28 23:38:45.621744303 +0200 @@ -54,7 +54,7 @@ PyObject* bpy_text_import_name(char *nam PyObject* bpy_text_reimport(PyObject *module, int *found); /* void bpy_text_clear_modules(int clear_all);*/ /* Clear user modules */ -void bpy_text_filename_get(char *fn, size_t fn_len, struct Text *text); +void bpy_text_filename_get(char *fn, struct Text *text); extern PyMethodDef bpy_import_meth; extern PyMethodDef bpy_reload_meth; Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2011-04-28 19:11:55.000000000 +0200 +++ CMakeLists.txt 2011-04-28 23:38:45.647743643 +0200 @@ -840,7 +840,7 @@ elseif(APPLE) set(PYTHON_VERSION 3.2) if(PYTHON_VERSION MATCHES 3.2) - # we use precompiled libraries for py 3.2 and up by default + # we use precompiled libraries for py 3.1 and up by default set(PYTHON ${LIBDIR}/python) set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}") @@ -852,7 +852,7 @@ elseif(APPLE) # otherwise, use custom system framework set(PYTHON /System/Library/Frameworks/Python.framework/Versions/) - set(PYTHON_VERSION 3.2) + set(PYTHON_VERSION 3.1) set(PYTHON_INCLUDE_DIRS "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}") # set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet set(PYTHON_LIBRARY "") Index: source/blender/python/intern/bpy_util.h =================================================================== --- source/blender/python/intern/bpy_util.h.orig 2011-04-28 19:04:29.000000000 +0200 +++ source/blender/python/intern/bpy_util.h 2011-04-28 23:38:45.672743011 +0200 @@ -30,8 +30,8 @@ #ifndef BPY_UTIL_H #define BPY_UTIL_H -#if PY_VERSION_HEX < 0x03020000 -#error "Python 3.2 or greater is required, you'll need to update your python." +#if PY_VERSION_HEX < 0x03010000 +#error "Python 3.1 or greater is required, you'll need to update your python." #endif #include "RNA_types.h" /* for EnumPropertyItem only */ ++++++ blender-2.56-svn35395.patch ++++++ Index: source/blender/python/generic/py_capi_utils.c =================================================================== --- source/blender/python/generic/py_capi_utils.c.orig 2011-04-28 23:38:45.571745571 +0200 +++ source/blender/python/generic/py_capi_utils.c 2011-04-28 23:39:03.621288102 +0200 @@ -241,7 +241,29 @@ const char *PyC_UnicodeAsByte(PyObject * return PyBytes_AS_STRING(py_str); } else { - return PyBytes_AS_STRING((*coerce= PyUnicode_EncodeFSDefault(py_str))); + /* mostly copied from fileio.c's, fileio_init */ + PyObject *stringobj; + PyObject *u; + + PyErr_Clear(); + + u= PyUnicode_FromObject(py_str); /* coerce into unicode */ + + if (u == NULL) + return NULL; + + stringobj= PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(u), PyUnicode_GET_SIZE(u), "surrogateescape"); + Py_DECREF(u); + if (stringobj == NULL) + return NULL; + if (!PyBytes_Check(stringobj)) { /* this seems wrong but it works fine */ + // printf("encoder failed to return bytes\n"); + Py_DECREF(stringobj); + return NULL; + } + *coerce= stringobj; + + return PyBytes_AS_STRING(stringobj); } } ++++++ blender-2.57b-PYC_INTERPRETER_ACTIVE.patch ++++++ Index: source/blender/python/generic/py_capi_utils.c =================================================================== --- source/blender/python/generic/py_capi_utils.c.orig 2011-05-03 00:15:21.000000000 +0200 +++ source/blender/python/generic/py_capi_utils.c 2011-05-03 01:00:38.793967259 +0200 @@ -36,7 +36,11 @@ #include "BLI_path_util.h" #endif +#if PY_VERSION_HEX < 0x03020000 +#PYC_INTERPRETER_ACTIVE ((PyThreadState_GET()) &_PyThreadState_Current) +#else #define PYC_INTERPRETER_ACTIVE (((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL) +#endif /* for debugging */ void PyC_ObSpit(const char *name, PyObject *var) { ++++++ blender-2.57b-nobuffer_ftoa_utf_link.patch ++++++ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2011-04-28 19:11:55.000000000 +0200 +++ CMakeLists.txt 2011-05-07 22:37:02.821442890 +0200 @@ -406,8 +406,8 @@ if(UNIX AND NOT APPLE) set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory") mark_as_advanced(OPENCOLLADA) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) - set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2) - set(OPENCOLLADA_INC ${OPENCOLLADA}) + set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver pcre xml2) + set(OPENCOLLADA_INC ${OPENCOLLADA}/include) set(PCRE /usr CACHE FILEPATH "PCRE Directory") mark_as_advanced(PCRE) @@ -620,7 +620,7 @@ elseif(WIN32) set(OPENCOLLADA ${LIBDIR}/opencollada) set(OPENCOLLADA_INC ${OPENCOLLADA}/include) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) - set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF) + set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2) set(PCRE_LIB pcre) endif() @@ -742,7 +742,7 @@ elseif(WIN32) set(OPENCOLLADA ${LIBDIR}/gcc/opencollada) set(OPENCOLLADA_INC ${OPENCOLLADA}/include) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib) - set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa) + set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver expat pcre) set(PCRE_LIB pcre) endif() @@ -939,7 +939,7 @@ elseif(APPLE) set(OPENCOLLADA ${LIBDIR}/opencollada) set(OPENCOLLADA_INC ${OPENCOLLADA}/include) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) - set(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" ) + set(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lxml2" ) #pcre is bundled with openCollada #set(PCRE ${LIBDIR}/pcre) #set(PCRE_LIBPATH ${PCRE}/lib) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
