Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at Fri Sep 9 11:58:40 CEST 2011.
-------- --- blender/blender.changes 2011-05-04 19:28:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/blender/blender.changes 2011-09-07 19:54:03.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Sep 7 17:02:34 UTC 2011 - [email protected] + +- Update to release 2.59, added patch + blender-2.59-colladainclude.patch to correct build. +- Upstream changes: + *This is mostly a bug fix release with 140 fixes since 2.58a. + Additions include improved keymap editing, 3D mouse support, + some new addons and Node UI improvements. + too numerous to list all please refer to: + http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/changelog_259 + +------------------------------------------------------------------- +Tue Sep 6 16:00:09 UTC 2011 - [email protected] + +- Added "Requires: python3-xml to fix bnc#713346 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- blender-2.57b.tar.bz2 New: ---- blender-2.59-colladainclude.patch blender-2.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.gPRRWU/_old 2011-09-09 11:58:35.000000000 +0200 +++ /var/tmp/diff_new_pack.gPRRWU/_new 2011-09-09 11:58:35.000000000 +0200 @@ -18,13 +18,14 @@ # norootforbuild %global __python3 /usr/bin/python3 -%global python3_ver %(python3 -c "import sys; v=sys.version_info[:2]; print('%%d.%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND) +#%%global py3_ver %%(python3 -c "import sys; v=sys.version_info[:2]; print('%%d.%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND) %global nodot3_ver %(python3 -c "import sys; v=sys.version_info[:2]; print('%%d%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND) %global python3_prefix %(python3 -c "import sys; print(sys.prefix)" 2>/dev/null || echo PYTHON-NOT-FOUND) -%global python3_libdir %{python3_prefix}/%{_lib}/python%{python3_ver}%{py3_abi_kind} -%global python3_incdir %{python3_prefix}/include/python%{python3_ver}%{py3_abi_kind} -%global python3_sitedir %{python3_libdir}/site-packages -%global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())" 2>/dev/null || echo PYTHON-NOT-FOUND) +%global python3_libdir %{python3_prefix}/%{_lib}/python%{py3_ver}%{py3_abi_kind} +#%%global python3_incdir %%{py3_incdir}%%{py3_abi_kind} +%global python3_incdir %{python3_prefix}/include/python%{py3_ver}%{py3_abi_kind} +#%%global python3_sitedir %%{python3_libdir}/site-packages +#%%global python3_sitelib %%(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())" 2>/dev/null || echo PYTHON-NOT-FOUND) # end python3 macros #Redefine _docdir macro for fedora @@ -41,11 +42,7 @@ BuildRequires: expat-devel fftw-devel freetype-devel gcc-c++ libstdc++-devel python3-devel %else Recommends: blender-doc -%if 0%{?suse_version} >= 1130 -BuildRequires: pkgconfig(python3) python3 -%else -BuildRequires: python3 python3-devel -%endif +BuildRequires: python3-devel BuildRequires: MesaGLw-devel pkg-config xorg-x11 BuildRequires: gettext-tools libexpat-devel update-desktop-files %endif @@ -67,12 +64,14 @@ %if %DISTRIBUTABLE <= 0 BuildRequires: ffmpeg-devel %endif +# See bnc#713346 +Requires: python3-xml Name: blender License: GPLv2+ Group: Productivity/Graphics/3D Editors Summary: A 3D Modelling And Rendering Package -Version: 2.57b +Version: 2.59 Release: 1 Url: http://www.blender.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,6 +91,8 @@ Patch4: blender-2.56-gcc46.patch # libOpenCOLLADA0 no longer provides libbuffer, libftoa and libUTF this patch fixes the build Patch5: blender-2.57b-nobuffer_ftoa_utf_link.patch +# The collada include and library paths were hard coded into CMakeLists.txt and incorrect, this patch fixes the issue. +Patch9: blender-2.59-colladainclude.patch %if 0%{?nodot3_ver} <= 031 # FIXME The following three patches revert blender to build with python 3.1 Patch6: blender-2.56-svn35386.patch @@ -157,17 +158,18 @@ %prep %setup -q # This removes the error with python 3.1 python3-config --abiflags -%if 0%{?nodot3_ver} <= 031 -%global py3_abi_kind $NULL -%else +#%%if 0%%{?nodot3_ver} <= 031 +#%%global py3_abi_kind $NULL +#%%else %global py3_abi_kind %(python3-config --abiflags) -%endif +#%%endif %patch0 %patch1 %patch2 %patch3 %patch4 %patch5 +%patch9 %if 0%{nodot3_ver} <= 031 %patch6 %patch7 @@ -177,18 +179,19 @@ %if %DISTRIBUTABLE == 1 %patch10 rm -rf release/scripts/presets/ffmpeg intern/audaspace/ffmpeg -find ./ -name *mpeg* -exec rm -rf {} \; +for i in $(find ./ -name '*mpeg*'); do rm -rf ${i}; done %endif %define buildir %{_builddir}/%{name}/%{version} echo %{buildir} echo "python3 nodotver = %{?nodot3_ver}" -echo "python3_version = %{?python3_ver}" +echo "py3_version = %{?py3_ver}" echo "python3_prefix = %{?python3_prefix}" echo "python3_libdir = %{?python3_libdir}" echo "python3_incdir = %{?python3_incdir}" -echo "python3_sitedir = %{?python3_sitedir}" +echo "py3_incdir = %{?py3_incdir}" +echo "python3_sitearch = %{?python3_sitearch}" echo "python3_sitelib = %{?python3_sitelib}" %build @@ -216,15 +219,17 @@ %if %{collada} == 1 -DWITH_OPENCOLLADA:BOOL=on \ -DOPENCOLLADA=%{_prefix} \ - -DOPENCOLLADA_LIBPATH=/%{_lib} \ - -DOPENCOLLADA_INC=/include \ + -DOPENCOLLADA_LIB:STRING=%{_libdir} \ + -DOPENCOLLADA_INC=%{_includedir} \ + -DOPENCOLLADA_INCLUDE_DIR:STRING=%{_includedir} \ %else -DWITH_OPENCOLLADA:BOOL=off \ %endif - -DPYTHON_VERSION=%{python3_ver} \ + -DPYTHON_VERSION=%{py3_ver} \ -DPYTHON_LIBPATH=%{_libdir} \ - -DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_ver}%{py3_abi_kind}.so \ + -DPYTHON_LIBRARY=%{_libdir}/libpython%{py3_ver}%{py3_abi_kind}.so \ -DPYTHON_INCLUDE_DIRS=%{python3_incdir} \ + -DPYTHON_INCLUDE_DIR=%{python3_incdir} \ -DWITH_PYTHON_INSTALL:BOOL=off \ -DWITH_PYTHON:BOOL=on \ -DWITH_IMAGE_OPENJPEG:BOOL=off \ ++++++ blender-2.55-blenkernel.patch ++++++ --- /var/tmp/diff_new_pack.gPRRWU/_old 2011-09-09 11:58:35.000000000 +0200 +++ /var/tmp/diff_new_pack.gPRRWU/_new 2011-09-09 11:58:35.000000000 +0200 @@ -1,16 +1,16 @@ Index: source/blender/blenkernel/CMakeLists.txt =================================================================== ---- source/blender/blenkernel/CMakeLists.txt.orig 2011-04-28 19:05:03.000000000 +0200 -+++ source/blender/blenkernel/CMakeLists.txt 2011-04-28 23:39:11.011100861 +0200 -@@ -143,7 +143,6 @@ set(SRC +--- source/blender/blenkernel/CMakeLists.txt.orig 2011-08-11 18:43:37.000000000 +0200 ++++ source/blender/blenkernel/CMakeLists.txt 2011-09-06 21:45:22.796997638 +0200 +@@ -147,7 +147,6 @@ set(SRC intern/unit.c intern/world.c intern/writeavi.c - intern/writeffmpeg.c intern/writeframeserver.c - + BKE_DerivedMesh.h -@@ -225,7 +224,6 @@ set(SRC +@@ -228,7 +227,6 @@ set(SRC BKE_utildefines.h BKE_world.h BKE_writeavi.h @@ -20,9 +20,9 @@ intern/CCGSubSurf.h Index: source/gameengine/VideoTexture/CMakeLists.txt =================================================================== ---- source/gameengine/VideoTexture/CMakeLists.txt.orig 2011-04-28 19:03:24.000000000 +0200 -+++ source/gameengine/VideoTexture/CMakeLists.txt 2011-04-28 23:39:11.012100836 +0200 -@@ -63,7 +63,6 @@ set(SRC +--- source/gameengine/VideoTexture/CMakeLists.txt.orig 2011-08-11 18:41:50.000000000 +0200 ++++ source/gameengine/VideoTexture/CMakeLists.txt 2011-09-06 21:45:22.818997638 +0200 +@@ -67,7 +67,6 @@ set(SRC PyTypeList.cpp Texture.cpp VideoBase.cpp @@ -30,7 +30,7 @@ blendVideoTex.cpp BlendType.h -@@ -82,7 +81,6 @@ set(SRC +@@ -86,7 +85,6 @@ set(SRC PyTypeList.h Texture.h VideoBase.h @@ -38,3 +38,15 @@ ) if(WITH_CODEC_FFMPEG) +Index: source/blender/imbuf/CMakeLists.txt +=================================================================== +--- source/blender/imbuf/CMakeLists.txt.orig 2011-08-11 18:44:38.000000000 +0200 ++++ source/blender/imbuf/CMakeLists.txt 2011-09-06 21:51:47.594997614 +0200 +@@ -105,7 +105,6 @@ set(SRC + intern/openexr/openexr_multi.h + + # orphan include +- ../../../intern/ffmpeg/ffmpeg_compat.h + ) + + if(WITH_IMAGE_OPENEXR) ++++++ blender-2.56-gcc46.patch ++++++ --- /var/tmp/diff_new_pack.gPRRWU/_old 2011-09-09 11:58:35.000000000 +0200 +++ /var/tmp/diff_new_pack.gPRRWU/_new 2011-09-09 11:58:35.000000000 +0200 @@ -1,7 +1,7 @@ Index: extern/bullet2/src/BulletSoftBody/btSoftBody.h =================================================================== ---- extern/bullet2/src/BulletSoftBody/btSoftBody.h.orig 2011-04-28 19:10:16.000000000 +0200 -+++ extern/bullet2/src/BulletSoftBody/btSoftBody.h 2011-04-28 23:52:48.230570602 +0200 +--- extern/bullet2/src/BulletSoftBody/btSoftBody.h.orig 2011-08-11 18:47:59.000000000 +0200 ++++ extern/bullet2/src/BulletSoftBody/btSoftBody.h 2011-09-06 21:12:35.220997936 +0200 @@ -201,6 +201,7 @@ public: /* Material */ struct Material : Element @@ -44,8 +44,8 @@ int m_rank; // Rank Index: extern/Eigen2/Eigen/src/Core/util/Memory.h =================================================================== ---- extern/Eigen2/Eigen/src/Core/util/Memory.h.orig 2011-04-28 23:52:28.000000000 +0200 -+++ extern/Eigen2/Eigen/src/Core/util/Memory.h 2011-04-28 23:52:48.251570079 +0200 +--- extern/Eigen2/Eigen/src/Core/util/Memory.h.orig 2011-09-06 21:12:35.175997937 +0200 ++++ extern/Eigen2/Eigen/src/Core/util/Memory.h 2011-09-06 21:12:35.221997936 +0200 @@ -38,6 +38,8 @@ #define EIGEN_FREEBSD_MALLOC_ALREADY_ALIGNED 0 #endif @@ -57,13 +57,13 @@ #else Index: source/blender/collada/AnimationImporter.cpp =================================================================== ---- source/blender/collada/AnimationImporter.cpp.orig 2011-04-28 19:05:31.000000000 +0200 -+++ source/blender/collada/AnimationImporter.cpp 2011-04-28 23:52:48.314568510 +0200 +--- source/blender/collada/AnimationImporter.cpp.orig 2011-08-11 18:44:01.000000000 +0200 ++++ source/blender/collada/AnimationImporter.cpp 2011-09-06 21:12:35.258997943 +0200 @@ -52,6 +52,7 @@ #include "ArmatureImporter.h" #include <algorithm> +#include <cstddef> - // use this for retrieving bone names, since these must be unique + // first try node name, if not available (since is optional), fall back to original id template<class T> ++++++ blender-2.57b-nobuffer_ftoa_utf_link.patch ++++++ --- /var/tmp/diff_new_pack.gPRRWU/_old 2011-09-09 11:58:35.000000000 +0200 +++ /var/tmp/diff_new_pack.gPRRWU/_new 2011-09-09 11:58:35.000000000 +0200 @@ -1,42 +1,42 @@ 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") +--- CMakeLists.txt.orig 2011-08-11 18:49:56.000000000 +0200 ++++ CMakeLists.txt 2011-09-07 17:32:37.207995841 +0200 +@@ -432,7 +432,7 @@ if(UNIX AND NOT APPLE) + set(OPENCOLLADA /usr/local/opencollada CACHE PATH "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(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2) ++ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver pcre xml2) + set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}) - 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(PCRE /usr CACHE PATH "PCRE Directory") +@@ -676,9 +676,7 @@ elseif(WIN32) + ${LIBDIR}/opencollada/lib/MathMLSolver.lib + ${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib + ${LIBDIR}/opencollada/lib/xml2.lib +- ${LIBDIR}/opencollada/lib/buffer.lib +- ${LIBDIR}/opencollada/lib/ftoa.lib +- ${LIBDIR}/opencollada/lib/UTF.lib ++ + ) + set(PCRE_LIB + ${LIBDIR}/opencollada/lib/pcre.lib +@@ -815,7 +813,7 @@ elseif(WIN32) set(OPENCOLLADA ${LIBDIR}/gcc/opencollada) - set(OPENCOLLADA_INC ${OPENCOLLADA}/include) + set(OPENCOLLADA_INCLUDE_DIR ${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(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa) ++ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver expat pcre) set(PCRE_LIB pcre) endif() -@@ -939,7 +939,7 @@ elseif(APPLE) +@@ -1026,7 +1024,7 @@ elseif(APPLE) set(OPENCOLLADA ${LIBDIR}/opencollada) - set(OPENCOLLADA_INC ${OPENCOLLADA}/include) + set(OPENCOLLADA_INCLUDE_DIR ${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" ) +- set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" ) ++ set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lxml2" ) #pcre is bundled with openCollada #set(PCRE ${LIBDIR}/pcre) #set(PCRE_LIBPATH ${PCRE}/lib) ++++++ blender-2.59-colladainclude.patch ++++++ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2011-09-07 17:32:37.000000000 +0200 +++ CMakeLists.txt 2011-09-07 17:40:08.639995773 +0200 @@ -429,11 +429,12 @@ if(UNIX AND NOT APPLE) endif() if(WITH_OPENCOLLADA) - set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory") + set(OPENCOLLADA /usr CACHE PATH "OpenCollada Directory") mark_as_advanced(OPENCOLLADA) - set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) + set(OPENCOLLADA_LIBPATH ${OPENCOLLADA_LIB}) + mark_as_advanced(OPENCOLLADA_LIBPATH) set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver pcre xml2) - set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}) + set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include) set(PCRE /usr CACHE PATH "PCRE Directory") mark_as_advanced(PCRE) @@ -676,7 +677,6 @@ elseif(WIN32) ${LIBDIR}/opencollada/lib/MathMLSolver.lib ${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib ${LIBDIR}/opencollada/lib/xml2.lib - ) set(PCRE_LIB ${LIBDIR}/opencollada/lib/pcre.lib ++++++ blender-2.57b.tar.bz2 -> blender-2.59.tar.bz2 ++++++ blender/blender-2.57b.tar.bz2 /mounts/work_src_done/STABLE/blender/blender-2.59.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
