Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at Mon Nov 2 12:40:31 CET 2009. -------- --- blender/blender.changes 2009-10-10 15:31:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/blender/blender.changes 2009-10-31 18:47:19.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Oct 31 17:46:02 UTC 2009 - davejplater@gmail.com + +-Fixed x-blend.desktop errors and build flags + +------------------------------------------------------------------- +Fri Oct 23 06:17:46 UTC 2009 - davejplater@gmail.com + +-Reincorporated pre_checkin.sh script +-Created blender-2.49b-undefined-opp.patch to fix undefined opperation + +------------------------------------------------------------------- @@ -4,0 +16,20 @@ + +------------------------------------------------------------------- +Sat Sep 19 19:40:48 UTC 2009 - dave.plater@yahoo.co.uk + +- Removed kde3 dependency + +------------------------------------------------------------------- +Thu Sep 17 05:56:50 UTC 2009 - dave.plater@yahoo.co.uk + +- Update to blender-2.49b +- Upstream bug fixes :- SoftBody, vertex groups were not notified on deletion & fixes for + Mass and Spring Painting. + Softbody, non mesh objects missing initializers [bug #18982]. + Self Shadow Vertex Colors, improved blur method to give more even results. + Converting nurbs to a mesh ignored smoothing for Alt+C and from python. + Object Active to Other, Fix python error when running in local view. + Ancient resource leak where checkPackedFile would open a file and never close it. + Fix for uninitialized memory use with X11 keyboard and tablet events. + For more info see :- + http://www.blender.org/development/release-logs/blender-249/249-update/ calling whatdependson for head-i586 Old: ---- blender-2.49a-fdleak.patch blender-2.49a.tar.bz2 blenderplayer.desktop New: ---- blender-2.49b-patched.tar.bz2 blender-2.49b-undefined-opp.patch blender-2.49b.tar.bz2 x-blend.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.rWNhsU/_old 2009-11-02 12:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.rWNhsU/_new 2009-11-02 12:39:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package blender (Version 2.49a) +# spec file for package blender (Version 2.49b) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,35 +17,55 @@ # norootforbuild + +Name: blender +%define DISTRIBUTABLE 1 +# Patched code is built by default. +# Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code. BuildRequires: Mesa-devel OpenEXR-devel SDL-devel freealut-devel freetype2-devel ftgl-devel BuildRequires: gcc-c++ libjpeg-devel libogg-devel libstdc++-devel libtheora-devel zlib-devel BuildRequires: libao-devel libdrm-devel libpng-devel libquicktime-devel libtiff-devel libvorbis-devel BuildRequires: openal-devel openssl-devel python-devel scons update-desktop-files xorg-x11 yafray -BuildRequires: desktop-file-utils kdebase3-runtime shared-mime-info yasm-devel +BuildRequires: desktop-file-utils shared-mime-info yasm-devel +#BuildRequires: kdebase3-runtime BuildRequires: gettext-tools +#noarch subpackage of binary package only possible from rpm-4.6.0 onwards. %if %suse_version > 1110 BuildRequires: rpm >= 4.6.0 %endif - -Name: blender +%if %DISTRIBUTABLE <= 0 +BuildRequires: ffmpeg-devel +%endif License: GNU General Public License version 2 or later (GPL v2 or later) Group: Productivity/Graphics/Visualization/Raytracers Summary: 3D Animation and Rendering Software -Version: 2.49a -Release: 3 +Version: 2.49b +Release: 1 AutoReqProv: on Requires: yafray Url: http://www.blender.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: blender-%{version}.tar.bz2 +# WARNING: This is not a comment, but the real command to repack source: +#%(sh %{_sourcedir}/%{name}-patch-source %{name}-%{version}.tar.bz2 ) +#The script pre_checkin.sh calls blender-patch-source at the start of the build process +#to ensure no restricted formats are built +%(sh pre_checkin.sh) +%if %DISTRIBUTABLE <= 0 +Source0: %{name}-%{version}.tar.bz2 +%else +Source0: blender-%{version}-patched.tar.bz2 +%endif #Source1: blender-examples.tar.bz2 Source2: geeko.blend Source3: geeko.README Source4: blender-sample -Source5: blenderplayer.desktop +#Source5: blenderplayer.desktop Source6: blender.xpm Source7: blender_wrapper.tar.bz2 +#script to repack source +Source8: blender-patch-source Source9: blender.desktop +Source10: x-blend.desktop Patch0: blender-2.48-bmake.patch Patch1: blender-2.48-gcc43.patch Patch2: blender-2.48-libtiff.patch @@ -57,16 +77,18 @@ Patch7: blender-wrapper.patch #Patch submitted upstream - Blender Patches item #19234, Patch8: blender-2.49-uninit_var.patch -Patch9: blender-2.49a-fdleak.patch +Patch9: blender-2.49b-undefined-opp.patch Recommends: blender-doc %description -Blender is the open source software for 3D modeling, animation, -rendering, post-production, interactive creation and playback. -Available for all major operating systems under the GNU General Public -License. - - +Blender is a free 3D animation studio. It includes tools for modeling, +sculpting, texturing (painting, node-based shader materials, or UV +mapped), UV mapping, rigging and constraints, weight painting, particle +systems, simulation (fluids, physics, and soft body dynamics and an +external crowd simulator), rendering, node-based compositing, and non +linear video editing, as well as an integrated game engine for real-time +interactive 3D, and game creation and playback with cross-platform +compatibility. Authors: -------- @@ -146,7 +168,15 @@ BF_OPENAL_LIBPATH="%{_usr}/include/AL" \ WITH_BF_SDL=true \ BF_PTHREADS=true \ +%if %DISTRIBUTABLE <= 0 + WITH_BF_FFMPEG=true \ + WITH_BF_LIBMP3LAME=yes \ + WITH_BF_X264=yes \ +%else WITH_BF_FFMPEG=false \ + WITH_BF_LIBMP3LAME=no \ + WITH_BF_X264=no \ +%endif WITH_BF_ZLIB=true \ WITH_BF_INTERNATIONAL=true \ WITH_BF_GAMEENGINE=true \ @@ -159,9 +189,7 @@ BF_QUICKTIME_INC="%{_usr}/include/quicktime" \ WITH_BF_FTGL=true \ WITH_BF_ICONV=no \ - WITH_BF_LIBMP3LAME=no \ - WITH_BF_X264=no \ - CFLAGS="%{optflags}" + CCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" blenderplayer # Build plugins pushd release/plugins if [ -d ./include ]; then @@ -201,23 +229,18 @@ %__cp -p "%{SOURCE2}" "%{SOURCE3}" COPYING README doc/* \ "%{buildroot}%{_docdir}/%{name}/" %__install -m0755 "%{SOURCE4}" "%{buildroot}%{_bindir}/" +%__mv "%{buildroot}%{_libdir}/%{name}/BlenderQuickStart.pdf" "%{buildroot}%{_docdir}/%{name}/BlenderQuickStart.pdf" +%__mv "%{buildroot}%{_libdir}/%{name}/blender.html" "%{buildroot}%{_docdir}/%{name}/blender.html" %__install -d "%{buildroot}%{_datadir}/pixmaps" %__install -D -m 0644 "%{SOURCE6}" "%{buildroot}%{_datadir}/pixmaps/blender.xpm" %suse_update_desktop_file -i "%{name}" Graphics 3DGraphics # x-blend.desktop -%__install -dm 755 %{buildroot}/opt/kde3/share/mimelnk/application -%__cat > %{buildroot}/opt/kde3/share/mimelnk/application/x-blend.desktop <<EOF -%suse_update_desktop_file -c -[Desktop Entry] -Comment=Blender Template -Icon=%{_datadir}//pixmaps/blender.xpm -DefaultApp=blender -Type=MimeType -MimeType=application/x-blend -Patterns=*.blend; -EOF +%__install -D -m 0644 "%{SOURCE10}" "%{buildroot}%{_datadir}/applications/x-blend.desktop" +%suse_update_desktop_file %{buildroot}/%{_datadir}/applications/x-blend.desktop +#%%fdupes -s $RPM_BUILD_ROOT # symlink blenderplayer %__ln_s %{_libdir}/blender/blenderplayer %{buildroot}/%{_bindir}/blenderplayer +%find_lang blender %post /usr/bin/update-mime-database "%{_datadir}/mime" >/dev/null @@ -282,19 +305,19 @@ %doc %{_libdir}/blender/*.txt %doc %{_libdir}/blender/.blender/scripts/bpydata/*.txt %doc %{_libdir}/blender/.blender/scripts/bpydata/config/readme.txt +%{_datadir}/applications/blender.desktop +/usr/share/applications/x-blend.desktop +%{_datadir}/pixmaps/blender.xpm %files doc %defattr(-,root,root) -%{_datadir}/applications/blender.desktop -/opt/kde3/share/mimelnk/application/x-blend.desktop -%{_datadir}/pixmaps/blender.xpm %dir %{_datadir}/doc/packages/blender/ %{_datadir}/doc/packages/blender/* #%{_datadir}/doc/packages/blender/BlenderQuickStart.pdf #%{_datadir}/doc/packages/blender/blender.html #%{_datadir}/doc/packages/blender/COPYING #%{_datadir}/doc/packages/blender/README -#%{_datadir}/doc/packages/blender/geeko.* +%{_datadir}/doc/packages/blender/geeko.* %files devel %defattr(-,root,root) ++++++ blender-2.49b-undefined-opp.patch ++++++ Index: blender-2.49b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp =================================================================== --- source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1780,7 +1780,9 @@ bool CcdShapeConstructionInfo::UpdateMes { if(mf->v4) { fv_pt= quad_verts; - *poly_index_pt++ = *poly_index_pt++ = index[i]; + *poly_index_pt = index[i]; + *poly_index_pt++; + *poly_index_pt++; flen= 4; } else { fv_pt= tri_verts; @@ -1833,7 +1835,9 @@ bool CcdShapeConstructionInfo::UpdateMes if(mf->v4) { fv_pt= quad_verts; - *poly_index_pt++ = *poly_index_pt++ = index[i]; + *poly_index_pt = index[i]; + *poly_index_pt++; + *poly_index_pt++; } else { fv_pt= tri_verts; ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.rWNhsU/_old 2009-11-02 12:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.rWNhsU/_new 2009-11-02 12:39:17.000000000 +0100 @@ -1,3 +1,6 @@ #!/bin/sh +if test -e blender-*-patched.tar.bz2; then +exit 0 +fi bash blender-patch-source blender-2*.tar.bz2 ++++++ x-blend.desktop ++++++ [Desktop Entry] Comment=Blender Template Name=blender Icon=/usr/share//pixmaps/blender.xpm Type=Application MimeType=application/x-blend; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org