Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at Tue Dec 28 23:56:13 CET 2010. -------- --- blender/blender.changes 2010-06-26 07:58:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/blender/blender.changes 2010-12-14 13:01:56.000000000 +0100 @@ -1,0 +2,453 @@ +Tue Dec 14 11:12:25 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot blender-2.55.33653 +- Upstream bugfixes : + #25211, #25209, #23922, #23826, #25207, #23420, #25191, #25197, + #25199, #25178, #25184, #25185, #25188, #24752, #23395, #25186, + #25183, #25179, #25177, #22967, #25071, #22477, #25106, #25170, + #25153, #25095, #25135, #25116, #25155, #25154, #25159, #25027, + #25150, #25147, #25120, #25119, #25104, #24814, #20598, #25099, + #25086 +- Upstream changes : + *New math util funcitons: + equals_v2v2 + project_v2_v2v2 + isect_seg_seg_v2_point + which would be necessery for my further multires interpolation + commit + *M_Geometry_LineIntersect2D now uses isect_seg_seg_v2_point(). + *Behaviour of this function was changed a bit -- it haven't + returned intersection point in several cases when two segments + are making angle. + *2.4 feature back: + For constraints that have 'disabled' flag (because it has + invalid input) the name was drawn in red. Easy to recognize + constraints that stopped working. + *Moved extensions_framework into addons/modules + +------------------------------------------------------------------- +Wed Dec 8 11:28:57 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot blender-2.55.33554 +- Upstream changes : + *Bugfixes #25023 #25003 #25060 #21246 #25073 #25076 #25074 + #25049 #24163a #25085 #25079 #25088 #25081 #25082 #24052 + +------------------------------------------------------------------- +Mon Dec 6 12:04:34 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot blender-2.55.33504 +- Upstream changes : + *CMake: use a global list to store libraries built rather then + cmake_blender_libs.txt file + *bugfixes [#24967] [#24995] [#25057] [#25030] [#25046] [#25047] + [#22663] [#25050] [#25041] [#25042] [#25036] + *Fixed memory leak in thumbnail_joblist_free + *fix for camera border going outside the clipping range while in + camera view. + *use constant strings for outliner menus rather then sprint'ing + them together. + *Fixed dead-lock when subviding curve + *use PyUnicode_DecodeFSDefault rather then + PyUnicode_DecodeUTF8(str, strlen(str), "surrogateescape"), + for converting non utf8 names. + *extensions_framework: prefer user config and scripts dirs, if + set, to save addon config files to. + *Dependency graph: changed DAG_id_flush_update to + DAG_id_tag_update. + *bpath iterator updates + *use BLI_strnlen rather then strlen when comparing against fixed + lengths. + +------------------------------------------------------------------- +Sat Dec 4 16:28:52 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot blender-2.55.33472 +- Upstream changes : + *Bug fix #21900, Bugfix #21893, Bugfix #24699, Bugfix #25033 + *Give functions that use printf style formatting GCC format attributes + so if incorrect formatting is used the compiler will warn of this. + *minor changes to bone UI script.fix for strict prototype error. + *remove shadowed definitions but keep them as zero this time. + *Const conflict in PIL_dynlib_find_symbol + *Bugfix #2508, Bugfix #24568, Bugfix #25026, Bugfix #24999 + *Curve editmode was missing hotkey for operator "Select Inverse" + Is now added like Mesh, CTRL+I + *Text editor, "Add new" caused zero-user block. + *Nurbs edit: 'switch order' crashed when order was higher than amount of + points. + *Fix for compilation error caused by strict prototype checking + *Fix #25017: Bezier Curve Deform Twisting after adding Shape Keys + *Bugfix #20565, Bugfix #24890, Bugfix #24903, Bugfix #25010 + *Fix for [#24899]Align Objects operator was broken due to incorrect order of vector by + matrix multiplication + *updates to patch from Dan Eicher, allow adding a NodeGroup through bpy.data.node_groups.new(name, type) + *fix [#24938] Seed value on Particle settings gives Error when trying to insert key. + *fix [#25015] Ctrl+L linking to scene list does not scroll when the list is larger than screen resolution + correction to error message from Dan Eicher + *fix crash when report timer was set but no usable error reports were found. + *Fix for [#25006] Particle system crash (missing check for negative index) + *bugfix [#24913] Text bevel normals wrong + *Fix for [#25001] Enable Smoke High Resolution is greyout after baking + *Additional fix for #24958 Cloth pinning not working + *Adding some descriptions for animation-related operators that were missing them. + *patch [#23212] Python api for Nodes + *fixed crash with rigid body constraints not having their child pointer read correctly. + *Fix for [#24958] Cloth pinning not working + +------------------------------------------------------------------- +Wed Dec 1 10:06:26 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot blender-2.55.33410 +- Upstream changes : + *fix for crashes trying to resolve paths "location[]" or "location.." + *increase the reference counts when setting default scene compo nodes + else removing them can set the user count < 0. + *quit blender if the first X11 window fails to open. + mainly just to avoid a segfault so the user knows its not a bug. + *workaround [#24958] Cloth pinning not working + *bugfix [#23406] DPX Images load darker then saved, UI broken. + *patch from JacobF on IRC, copy smoke settings. double checked none + of these are used for runtime. + *bugfix [#22638] Alpha channel not saved when using texture paint + *minor console changes. + remove report argument from console functions. + don't update the scroll area while drawing, do this within operators instead. + dont redraw while selecting text unless selection changes. + *bugfix [#23423] Multi-window : closing game windows cause blender crash + *Smoke now uses only one point cache where both normal and high resolution smoke are stored together: + Separate caches were causing quite a lot of problems both in principle and practice. + For example it doesn't really make sense to have different frame ranges for normal and high resolution smoke, but this was fully possible before. + Also to fully bake the smoke you had to do a "Bake All Dynamics", which completely defeats the whole point of the feature! + As a result of this change the smoke cache usage is much much simpler and less error prone. + This is quite a big change, but hopefully there should be less rather than more problems as a result :) + Some other related changes: + Changing the cache name now works for disk caches properly too, it + now just renames the cache files so should be faster too! + Smoke is now always forced to disk cache with step 1 on file load + as there were some strange cases where smoke was trying to use memory cache. + Disabled smoke debug prints from console. + Disabled changing smoke parameters when smoke is baked. + *misc small changes. + commented unused View3D->flag's + popup dialog now centers over the mouse + only overwrite image alpha with render settings on save if saving the render result. + *Bugfix #24986 bugfix [#24974] bugfix [#24798] Bugfix #24976 fix [#24990] + +------------------------------------------------------------------- +Mon Nov 29 08:13:24 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot blender-2.55.33375 +- Upstream changes : + *fix for error when changing DISBALE_PYTHON -> WITH_PYTHON, + *Fix [#24964] HISTOGRAM: Inconsistency in spaces + *Fix [#20241] half-transparent objects in volume have no shadow. + *include headers in cmake source, added a script to check for + consistency, reporting missing headers & C files. + *Fix: [#24170] Camera inside volume error, [#24838] Light inside + Volume material drops on it's walls - it may be double + *fix [#24921] Crash after inserting keyframing UV coords and + changing frame in edit mode zero length arrays were still having + their members accessible. + *bugfix [#24947] Animations data replaced by the first animation (fbx exporter) + *Bugfix #24933 + *Bugfix #24953 + *bugfix "Export UV Layout" stalls when saving file in 2.55b + *fix for fix [#24955] Generating UV-Images within blender (Alt-N) not possible + *Detect Gallium driver. Extend NPoT workaround to opensource drivers. + *Bugfix #21385 + *[#24935] Proportional translation size stuck to none + *bugfix [#24944] Crash on attempting to keyframe HSV color prevent eternal loop + *console text underscore would draw outside the view for larger font sizes. + *fix for fix r33330, bug [#23118]. + *Particle draw was calling glColorMaterial(...) after glEnable(GL_COLOR_MATERIAL), + *added option to turn off Text anti-aliasing in the UI + *Fix #24914: 3D text glitch and crash + *remove support for rna resolving paths with collection['name'], + only support collection["name"], + *Rigid Body Joint Constraint: + *Update nurb keyindex data when subdividing + *fix building blenderplayer and a divide by zero bug with the console view. + *"Fix" for [#24934] Particle single user crash + *Bug fix: voxeldata texture extension didn't work. + *lasso select wasn't comparing the depth with particle selection, where border and circle select do. + *bugfix [#23118] Blender freezes when combing hair - OS X path changes related? + *freeing all free GPU buffers every frame could be a performance issue and is not necessary + +------------------------------------------------------------------- +Fri Nov 26 07:40:29 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot blender-2.55.33326 +- Upstream fixes : + *follow up of "Bugfix #23576" (Logic UI) + *Fix #24855: disabling shadows didn't disable AO/env with ray transparency + and AO multiply mode. + *BGE Bugfix: [#24926] + *Fix #24923: tweak falloff strength tooltip to apply both to AO and indirect. + *Fix #24775: boolean modifier crash in rendering on Mac. Problem was that this + ran out of stack memory, now it passes some arguments by reference instead of + by value to use less stack space. + *ATI X1xxx gfx cards (R500 chipset) lack full support for npot textures + although they report the GLEW_ARB_texture_non_power_of_two extension. + *Smoke domain resolutions were calculated wrong for non-cube domains in some cases. + *bugfix while looking into [#24900], color wasn't being set for face-mask mode. + *bone roll recalculate, option to use active bones Z axis. + *bugfix [#24907] bone roll z up broken and python script showing correct + method to roll bones + *Fixed bug with Text menu in font edit mode ++++ 269 more lines (skipped) ++++ between blender/blender.changes ++++ and /mounts/work_src_done/STABLE/blender/blender.changes calling whatdependson for head-i586 Old: ---- blender-2.48-bmake.patch blender-2.48-gcc43.patch blender-2.48-libtiff.patch blender-2.48-strncat.patch blender-2.48-uninitialized_variables.patch blender-2.49-uninit_var.patch blender-2.49b-arrayoverflow.patch blender-2.49b-patched.tar.bz2 blender-2.49b-rpmlintrc blender-2.49b-undefined-opp.patch blender-2.49b.tar.bz2 blender-patch-source blender-wrapper.patch blender.desktop blender_wrapper.tar.bz2 pre_checkin.sh New: ---- blender-2.50-uninit-var.patch blender-2.55-blenkernel.patch blender-2.55.33653.tar.xz blenderplayer.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.DW2P6i/_old 2010-12-28 23:54:54.000000000 +0100 +++ /var/tmp/diff_new_pack.DW2P6i/_new 2010-12-28 23:54:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package blender (Version 2.49b) +# spec file for package blender (Version 2.55.33653) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,81 +17,78 @@ # norootforbuild +%define py_ver 3.1 + +%define collada 1 +%define wplayer 1 -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 scons update-desktop-files xorg-x11 yafray -BuildRequires: desktop-file-utils shared-mime-info yasm-devel -BuildRequires: fdupes gettext-tools python-base python-devel -#noarch subpackage of binary package only possible from rpm-4.6.0 onwards. -%if %suse_version > 1110 -BuildRequires: rpm >= 4.6.0 +%define DISTRIBUTABLE 1 + +# When building svn versions the package still uses the last release version in make install for /usr/share/blender/rlversion. +%define rlversion 2.55 +BuildRequires: pcre-devel pkg-config readline-devel +# openjpeg-tools openjpeg-devel +BuildRequires: MesaGLw-devel OpenEXR-devel cmake fdupes freealut-devel freetype2-devel ftgl-devel +BuildRequires: boost-devel fftw3-devel 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 ruby-devel +BuildRequires: libtool openssl-devel update-desktop-files xorg-x11 xorg-x11-devel +BuildRequires: desktop-file-utils libsamplerate-devel libsndfile-devel libxml2-devel shared-mime-info yasm yasm-devel +BuildRequires: epydoc gettext-tools libexpat-devel libjack-devel libopenssl-devel perl-libxml-perl python3 python3-devel +BuildRequires: doxygen help2man libSDL-devel lzo-devel openal-soft-devel perl-Text-Iconv ruby xz xz-devel +%if 0%{?collada} == 1 +BuildRequires: openCOLLADA-devel %endif +BuildRequires: liblcms-devel %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.49b -Release: 4 -AutoReqProv: on -Requires: yafray + +Name: blender +License: GPLv2+ +Group: Productivity/Graphics/3D Editors +Summary: A 3D Modelling And Rendering Package Post Beta1 Svn Snapshot +Version: 2.55.33653 +Release: 1 Url: http://www.blender.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -# 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: blender-%{version}.tar.bz2 -%else -Source0: blender-%{version}-patched.tar.bz2 -Source1: blender-%{version}.tar.bz2 -%endif -#Source1: blender-examples.tar.bz2 +Source0: blender-%{version}.tar.xz +#Source1: blender-rpmlintrc Source2: geeko.blend Source3: geeko.README Source4: blender-sample -#Source5: blenderplayer.desktop +Source5: blenderplayer.1 Source6: blender.xpm -Source7: blender_wrapper.tar.bz2 -#script to repack source -Source8: blender-patch-source -Source9: blender.desktop -Source10: x-blend.desktop -Source11: blender-2.49b-rpmlintrc -Patch0: blender-2.48-bmake.patch -Patch1: blender-2.48-gcc43.patch -Patch2: blender-2.48-libtiff.patch -Patch3: blender-2.48-python64.patch -Patch4: blender-2.48-strncat.patch -Patch5: blender-2.48-undefine-operation.patch -Patch6: blender-2.48-uninitialized_variables.patch -#only fix issue lib -> lib64 in wrapper -Patch7: blender-wrapper.patch -#Patch submitted upstream - Blender Patches item #19234, -Patch8: blender-2.49-uninit_var.patch -Patch9: blender-2.49b-undefined-opp.patch -Patch10: blender-2.49b-arrayoverflow.patch +Source7: x-blend.desktop +Patch0: blender-2.48-python64.patch +Patch1: blender-2.48-undefine-operation.patch +# Patch submitted upstream - Blender Patches item #19234, +Patch2: blender-2.50-uninit-var.patch +%if %DISTRIBUTABLE == 1 +# Patch3 is needed due to the purging of everything mpeg +Patch3: blender-2.55-blenkernel.patch +%endif + Recommends: blender-doc -%{py_requires} %description -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. +Blender is a 3D modelling and rendering package. It is the in-house +software of a high quality animation studio, Blender has proven to +be an extremely fast and versatile design instrument. The software +has a personal touch, offering a unique approach to the world of +Three Dimensions. Use Blender to create TV commercials, to make +technical visualizations, business graphics, to do some morphing, +or design user interfaces. You can easy build and manage complex +environments. The renderer is versatile and extremely fast. All +basic animation principles (curves & keys) are well implemented.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. +http://www.blender.org Authors: -------- @@ -102,14 +99,10 @@ foundation(at)blender(dot)org %package doc -License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Documentation for blender -Group: Productivity/Graphics/Visualization/Raytracers -Requires: %{name} = %{version} -#noarch subpackage of binary package only possible for 11.2 onwards -%if %suse_version > 1110 +License: GPLv2+ +Group: Documentation/HTML BuildArch: noarch -%endif %description doc Being the in-house software of a high quality animation studio, Blender @@ -118,134 +111,170 @@ of Three Dimensions. Use Blender to create TV commercials, to make technical visualizations, business graphics, to do some morphing, or design user interfaces. - -You can easy build and manage complex environments. The renderer is -versatile and extremely fast. All basic animation principles (curves & -keys) are well implemented. +This package includes API documentation and example plugin programs. %package devel -License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Include files for blender plugin development +License: GPLv2+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Recommends: blender-doc %description devel This package provides the include files necessary to develop and -build plugins for Blender +build plugins for Blender. %prep -%setup -q -a7 +%setup -q %patch0 %patch1 %patch2 + +%if %DISTRIBUTABLE == 1 %patch3 -%patch4 -%patch5 -%patch6 -%if "%_lib" == "lib64" -%patch7 +rm -rf release/scripts/presets/ffmpeg intern/audaspace/ffmpeg +find ./ -name *mpeg* -exec rm -rf {} \; %endif -%patch8 -%patch9 -%patch10 -#fix locale naming -%__mv bin/.blender/locale/hr_HR bin/.blender/locale/hr -%__sed -i -e '/LLIBS/s/ c / /' config/linux2-config.py -cat > user-config.py <<EOF -REL_CFLAGS = [$(echo %{optflags} | sed -e "s/[^ ]*/'&'/g" -e "s/ /,/g")] -EOF + +%define buildir $PWD %build +export CFLAGS="$RPM_OPT_FLAGS -pipe -fPIC -funsigned-char -fno-strict-aliasing -g -ggdb" +export CXXFLAGS=$CFLAGS export BF_TIFF_LIB="%{_libdir}/libtiff.so" export BF_TIFF_INC="%{_includedir}" -export BF_PYTHON_INC="%{py_incdir}" export BF_GETTEXT_LIBPATH="%{_libdir}" -export BF_ICONV_LIBPATH="%{_libdir}" -export BF_OPENGL_LIBPATH=%{_libdir} -export BF_FFMPEG_LIBPATH="%{_libdir}" - -scons BF_QUIET=0 \ - BF_PYTHON_VERSION="%{py_ver}" \ - BF_PYTHON_INC="%{py_incdir}" \ - WITH_BF_OPENAL=true \ - BF_OPENAL_LIBPATH="%{_includedir}/AL" \ - WITH_BF_SDL=true \ - BF_PTHREADS=true \ -%if %DISTRIBUTABLE <= 0 - WITH_BF_FFMPEG=true \ +export PYTHON_LINKFLAGS=`python3.1-config --ldflags` +#WITH_INTERNATIONAL +mkdir -p Build +pushd Build +cmake ../ \ + -G"Unix Makefiles" \ + -DWITH_FFTW3:BOOL=on \ + -DWITH_JACK:BOOL=on \ + -DWITH_SNDFILE:BOOL=on \ + -DWITH_OPENCOLLADA:BOOL=on \ + -DOPENCOLLADA=%{_prefix} \ + -DOPENCOLLADA_LIBPATH=%{_libdir} \ + -DOPENCOLLADA_INC=%{_includedir} \ + -DPYTHON_LIB=%{_libdir}/libpython3.1.so \ + -DPYTHON_LIBPATH=%{_libdir} \ + -DPYTHON_INC=%{_includedir}/python3.1 \ + -DPYTHON_LINKFLAGS="" \ + -DWITH_PYTHON_INSTALL:BOOL=off \ + -DWITH_PYTHON:BOOL=on \ + -DWITH_IMAGE_OPENJPEG:BOOL=off \ + -DWITH_GAMEENGINE:BOOL=on \ +%if %DISTRIBUTABLE == 1 + -DWITH_FFMPEG:BOOL=off \ %else - WITH_BF_FFMPEG=false \ + -DWITH_FFMPEG:BOOL=on \ %endif - WITH_BF_ZLIB=true \ - WITH_BF_INTERNATIONAL=true \ - WITH_BF_ICONV=false \ - WITH_BF_GAMEENGINE=true \ - WITH_BF_VERSE=true \ - WITH_BF_PLAYER=true \ - WITH_BF_ODE=true \ - WITH_BF_OPENEXR=true \ - WITH_BF_BULLET=true \ - WITH_BF_QUICKTIME=no \ - BF_QUICKTIME_INC="%{_includedir}/quicktime" \ - WITH_BF_FTGL=true \ - BF_BUILDDIR=build \ - BF_INSTALLDIR=install \ - BF_NUMJOBS=%{jobs} \ - CFLAGS="%{optflags}" - -# Build plugins -pushd release/plugins - if [ -d ./include ]; then - %__rm -rf ./include - fi - %__ln_s ../../source/blender/blenpluginapi include - %__chmod +x bmake - %__make %{?jobs:-j%{jobs}} + -DWITH_CXX_GUARDEDALLOC:BOOL=on \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=on \ +%if %wplayer == 1 + -DWITH_PLAYER:BOOL=on \ +%else + -DWITH_PLAYER:BOOL=off \ +%endif + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} +%__make %{?jobs:-j%{jobs}} popd %install -%__install -D ./blender "%{buildroot}%{_bindir}/blender" -%__install -d "%{buildroot}%{_docdir}/%{name}" -# install -pushd install -%__install -d "%{buildroot}%{_libdir}/%{name}" -%__rm `find . -name "*make*"` -%__rm `find . -name "*c"` -%__cp -pR * "%{buildroot}%{_libdir}/%{name}" -%__cp -pR .blender "%{buildroot}%{_libdir}/%{name}" + +pushd Build +%makeinstall popd -# plugins -%__install -d "%{buildroot}%{_libdir}/%{name}/.blender/plugins" -# find all plugins create subdirs and cp them one by one -pushd release/plugins -find . -name "*so" | awk -F "/" '{line="";for(i=2;i<NF;i++) line=line $i"/";pole[line]=line} END {for( i in pole) print pole[i]}' | \ - while read line; do - pushd $line - %__install -d "%{buildroot}%{_libdir}/%{name}/.blender/plugins/${line}" - %__cp *.so "%{buildroot}/%{_libdir}/%{name}/.blender/plugins/${line}/" - popd - done + +# Factory is now of the opinion that every /usr/bin file needs a man page, +%if %wplayer == 1 +# Generate man page with help2man +pushd %{buildroot}%{_mandir}/man1 +#cp -v %%{buildroot}%%{_bindir}/blenderplayer ./ +#help2man \ +# --version-string="%%{version}" \ +# --help-option="-h" -n "a utility for previewing .blend files" \ +# -s 1 -m "User Commands" -S "Stichting Blender Foundation" -N -o blenderplayer.1 ./'blenderplayer -h ""' +#rm blenderplayer +cp -v %{S:5} ./ +popd +%endif + +# Fix any .py files with shebangs and wrong permissions. +if test -z `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ +then break; +else chmod -f 0755 `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ +fi + +# Copy text files to correct place. +mkdir -p %{buildroot}%{_docdir} +mv -f %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/ +# install blender sample. +%__install -D -m 0644 %{S:2} %{buildroot}%{_docdir}/%{name}/ +%__install -D -m 0644 %{S:3} %{buildroot}%{_docdir}/%{name}/ +%__install -D -m 0755 %{S:4} %{buildroot}%{_bindir}/ + +# Doxygen is broken in 11.3 see bnc # 650330 +pushd doc +if test `doxygen --version` != 1.6.3; \ +then \ +# Build documentation until the script is fixed +doxygen -u Doxyfile; \ +doxygen Doxyfile; \ +fi + +cp -r * %{buildroot}%{_docdir}/%{name}/ +rm -rf %{buildroot}%{_docdir}/%{name}/Doxy* %{buildroot}%{_docdir}/%{name}/doxy* %{buildroot}%{_docdir}/%{name}/python_api \ + %{buildroot}%{_docdir}/%{name}/manpage; \ +popd + +# blender-devel stuff soon depreciated. +mkdir -p %{buildroot}%{_includedir}/%{name} +cp -pr source/blender/blenpluginapi/* %{buildroot}%{_includedir}/%{name}/ +rm -f %{buildroot}%{_includedir}/%{name}/blenpluginapi + +# Add more icons. +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/ +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/ +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ +cp release/freedesktop/icons/16x16/blender.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/ +cp release/freedesktop/icons/22x22/blender.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/ +cp release/freedesktop/icons/32x32/blender.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ +pushd %{buildroot}%{_datadir}/pixmaps/ +ln -s ../icons/hicolor/32x32/apps/blender.png blender.png popd -# fix exutable bit on various scripts (they should not be exutable) -find "%{buildroot}%{_libdir}/%{name}/.blender" -name '*py' -exec %__chmod u-x,g-x,o-x \{\} \; -# copy doc into right place -%__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 + +# Install s6=blender.xpm and s11=v-2.55 +%__install -D -m 0644 %{S:6} %{buildroot}%{_datadir}/pixmaps/ + +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +ln -s ../../../../pixmaps/blender.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/blender.svg +popd + +# Install s6=blender.xpm +%__install -D -m 0644 %{S:6} %{buildroot}%{_datadir}/pixmaps/ + +rm -f %{buildroot}%{_includedir}/%{name}/CMakeLists.txt %{buildroot}%{_includedir}/%{name}/SConscript %{buildroot}%{_includedir}/%{name}/intern/Makefile \ + %{buildroot}%{_includedir}/%{name}/intern/pluginapi.c %{buildroot}%{_includedir}/%{name}/Makefile + +%suse_update_desktop_file -i "%{name}" + # x-blend.desktop -%__install -D -m 0644 "%{SOURCE10}" "%{buildroot}%{_datadir}/applications/x-blend.desktop" +%__install -D -m 0644 "%{S:7}" "%{buildroot}%{_datadir}/applications/x-blend.desktop" %suse_update_desktop_file %{buildroot}/%{_datadir}/applications/x-blend.desktop -# symlink blenderplayer -%__ln_s %{_libdir}/blender/blenderplayer %{buildroot}/%{_bindir}/blenderplayer -#mv "%{buildroot}%{_libdir}/%{name}/.blender/locale" "%{buildroot}%{_datadir}/ + +# Remove executables from buildroot/_docdir}/name +#find %%{buildroot}%%{_docdir}/%%{name} -name *.py -delete +if test -z `find %{buildroot}%{_docdir}/%{name} -name *.py -perm 0755 -print0|xargs -0r grep -l '#!'`; \ +then break; +else chmod -f 0644 `find %{buildroot}%{_docdir}/%{name} -name *.py -perm 0755 -print0|xargs -0r grep -l '#!'`; \ +fi + %find_lang %{name} -%fdupes -s %{buildroot}%{_libdir}/%{name}/plugins +%fdupes -s %{buildroot} %post /usr/bin/update-mime-database "%{_datadir}/mime" >/dev/null @@ -259,73 +288,42 @@ %files -f %{name}.lang %defattr(-,root,root) %{_bindir}/blender +%{_bindir}/blender-thumbnailer.py %{_bindir}/blender-sample +%{_docdir}/%{name}/geeko.* + +%if %wplayer == 1 %{_bindir}/blenderplayer -%dir %{_libdir}/blender/ -%{_libdir}/blender/blender -%{_libdir}/blender/blenderplayer -%dir %{_libdir}/blender/plugins -%{_libdir}/blender/plugins/Makefile -%dir %{_libdir}/blender/plugins/texture -%{_libdir}/blender/plugins/texture/Makefile -%dir %{_libdir}/blender/plugins/sequence -%{_libdir}/blender/plugins/sequence/Makefile -%dir %{_libdir}/blender/.blender -%{_libdir}/blender/.blender/.Blanguages -%{_libdir}/blender/.blender/.bfont.ttf -%dir %{_libdir}/blender/.blender/plugins/ -%dir %{_libdir}/blender/.blender/plugins/sequence -%{_libdir}/blender/.blender/plugins/sequence/*.so -%dir %{_libdir}/blender/.blender/plugins/texture -%{_libdir}/blender/.blender/plugins/texture/*.so -%dir %{_libdir}/blender/.blender/scripts -%{_libdir}/blender/.blender/scripts/*.py -%dir %{_libdir}/blender/.blender/scripts/bpydata -%dir %{_libdir}/blender/.blender/scripts/bpydata/config -%dir %{_libdir}/blender/.blender/scripts/bpymodules -%{_libdir}/blender/.blender/scripts/bpymodules/*.py -%dir %{_libdir}/blender/.blender/scripts/bpymodules/colladaImEx -%{_libdir}/blender/.blender/scripts/bpymodules/colladaImEx/*.py -%{_libdir}/blender/.blender/scripts/bpymodules/colladaImEx/*.png -%dir %{_libdir}/blender/.blender/locale -%dir %{_libdir}/blender/.blender/locale/*/ -%dir %{_libdir}/blender/.blender/locale/*/LC_MESSAGES -%{_libdir}/blender/.blender/locale/ar/LC_MESSAGES/blender.mo -%{_libdir}/blender/.blender/locale/*/LC_MESSAGES/blender.mo -%dir %{_libdir}/blender/.blender/locale/hr/hr_HR/LC_MESSAGES -%{_libdir}/blender/.blender/locale/hr/hr_HR -%{_libdir}/blender/.blender/locale/hr/hr_HR/LC_MESSAGES/*.mo -%dir %{_libdir}/blender/icons -%{_libdir}/blender/icons/16x16 -%{_libdir}/blender/icons/22x22 -%{_libdir}/blender/icons/32x32 -%{_libdir}/blender/icons/scalable -%{_libdir}/blender/icons/*/blender.png -%{_libdir}/blender/icons/*/blender.xcf.bz2 -%{_libdir}/blender/icons/*/blender.svg -#%{_libdir}/blender/icons/scalable/blender.svg -%{_libdir}/blender/verse -%doc %{_libdir}/blender/*.txt -%doc %{_libdir}/blender/.blender/scripts/bpydata/*.txt -%doc %{_libdir}/blender/.blender/scripts/bpydata/config/readme.txt +%{_mandir}/man1/blenderplayer.1.gz +%endif + +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/%{rlversion} +%{_datadir}/%{name}/%{rlversion}/* + +%{_mandir}/man1/blender.1.gz + %{_datadir}/applications/blender.desktop -/usr/share/applications/x-blend.desktop +%{_datadir}/applications/x-blend.desktop + %{_datadir}/pixmaps/blender.xpm +%{_datadir}/icons/hicolor/16x16/apps/blender.png +%{_datadir}/icons/hicolor/22x22/apps/blender.png +%{_datadir}/icons/hicolor/32x32/apps/blender.png +%{_datadir}/icons/hicolor/scalable/apps/blender.svg +%{_datadir}/pixmaps/blender.svg +%{_datadir}/pixmaps/blender.png %files doc %defattr(-,root,root) -%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.* +%dir %{_docdir}/%{name}/ +%{_docdir}/%{name}/* +%exclude %{_docdir}/%{name}/geeko.* %files devel %defattr(-,root,root) -%dir %{_libdir}/blender/plugins/include/ -%{_libdir}/blender/plugins/include/*.h -%{_libdir}/blender/plugins/include/*.DEF +%dir %{_includedir}/%{name}/ +%{_includedir}/%{name}/*.h +%{_includedir}/%{name}/*.DEF %changelog ++++++ blender-2.48-python64.patch ++++++ --- /var/tmp/diff_new_pack.DW2P6i/_old 2010-12-28 23:54:54.000000000 +0100 +++ /var/tmp/diff_new_pack.DW2P6i/_new 2010-12-28 23:54:54.000000000 +0100 @@ -1,8 +1,8 @@ Index: source/gameengine/Expressions/Value.cpp =================================================================== ---- source/gameengine/Expressions/Value.cpp.orig -+++ source/gameengine/Expressions/Value.cpp -@@ -586,8 +586,8 @@ CValue* CValue::ConvertPythonToValue(PyO +--- source/gameengine/Expressions/Value.cpp.orig 2010-04-18 12:28:37.000000000 +0200 ++++ source/gameengine/Expressions/Value.cpp 2010-10-28 14:56:24.000000000 +0200 +@@ -543,8 +543,8 @@ CValue* CValue::ConvertPythonToValue(PyO CListValue* listval = new CListValue(); bool error = false; ++++++ blender-2.48-undefine-operation.patch ++++++ --- /var/tmp/diff_new_pack.DW2P6i/_old 2010-12-28 23:54:54.000000000 +0100 +++ /var/tmp/diff_new_pack.DW2P6i/_new 2010-12-28 23:54:54.000000000 +0100 @@ -1,7 +1,7 @@ Index: release/plugins/sequence/dnr.c =================================================================== ---- release/plugins/sequence/dnr.c.orig -+++ release/plugins/sequence/dnr.c +--- release/plugins/sequence/dnr.c.orig 2008-11-12 23:16:53.000000000 +0200 ++++ release/plugins/sequence/dnr.c 2010-10-28 14:56:30.000000000 +0200 @@ -110,9 +110,12 @@ static void doit(unsigned char * src_, u unsigned char * dst = dst_; ++++++ blender-2.50-uninit-var.patch ++++++ Index: extern/bullet2/src/LinearMath/btVector3.h =================================================================== --- extern/bullet2/src/LinearMath/btVector3.h.orig 2009-03-17 23:44:58.000000000 +0200 +++ extern/bullet2/src/LinearMath/btVector3.h 2010-10-28 14:56:38.000000000 +0200 @@ -63,7 +63,8 @@ public: public: /**@brief No initialization constructor */ - SIMD_FORCE_INLINE btVector3() {} + SIMD_FORCE_INLINE btVector3() { + m_floats[0]=m_floats[1]=m_floats[2]=m_floats[3]=btScalar(0.);} Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h =================================================================== --- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h.orig 2009-09-14 16:45:32.000000000 +0200 +++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h 2010-10-28 14:56:38.000000000 +0200 @@ -94,7 +94,8 @@ ATTRIBUTE_ALIGNED16 (struct) btOptimized //for child nodes int m_subPart; int m_triangleIndex; - int m_padding[5];//bad, due to alignment + int:5*8*sizeof(int); +// int m_padding[5];//bad, due to alignment }; ++++++ blender-2.55-blenkernel.patch ++++++ Index: source/blender/blenkernel/CMakeLists.txt =================================================================== --- source/blender/blenkernel/CMakeLists.txt.orig 2010-12-08 10:43:06.000000000 +0200 +++ source/blender/blenkernel/CMakeLists.txt 2010-12-08 13:42:34.000000000 +0200 @@ -136,7 +136,6 @@ set(SRC intern/unit.c intern/world.c intern/writeavi.c - intern/writeffmpeg.c intern/writeframeserver.c BKE_DerivedMesh.h @@ -217,7 +216,6 @@ set(SRC BKE_utildefines.h BKE_world.h BKE_writeavi.h - BKE_writeffmpeg.h BKE_writeframeserver.h depsgraph_private.h intern/CCGSubSurf.h Index: source/gameengine/VideoTexture/CMakeLists.txt =================================================================== --- source/gameengine/VideoTexture/CMakeLists.txt.orig 2010-12-08 10:43:06.000000000 +0200 +++ source/gameengine/VideoTexture/CMakeLists.txt 2010-12-08 13:42:34.000000000 +0200 @@ -63,7 +63,6 @@ set(SRC PyTypeList.cpp Texture.cpp VideoBase.cpp - VideoFFmpeg.cpp blendVideoTex.cpp BlendType.h @@ -82,7 +81,6 @@ set(SRC PyTypeList.h Texture.h VideoBase.h - VideoFFmpeg.h ) if(WITH_CODEC_FFMPEG) ++++++ blenderplayer.1 ++++++ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH BLENDERPLAYER "1" "November 2010" "Stichting Blender Foundation" "User Commands" .SH NAME blenderplayer \- a utility for previewing .blend files .SH DESCRIPTION usage: blenderplayer [\-w [w h l t]] [\-f [fw fh fb ff]] [\-g gamengineoptions] [\-s stereomode] filename.blend .HP \fB\-h\fR: Prints this command summary .HP \fB\-w\fR: display in a window .HP \fB\-\-Optional\fR parameters\-\- .IP w = window width h = window height .IP l = window left coordinate t = window top coordinate Note: If w or h is defined, both must be defined. .IP Also, if l or t is defined, all options must be used. .HP \fB\-f\fR: start game in full screen mode .HP \fB\-\-Optional\fR parameters\-\- .IP fw = full screen mode pixel width fh = full screen mode pixel height .IP fb = full screen mode bits per pixel ff = full screen mode frequency Note: If fw or fh is defined, both must be defined. .IP Also, if fb is used, fw and fh must be used. ff requires all options. .HP \fB\-s\fR: start player in stereo .TP stereomode: hwpageflip (Quad buffered shutter glasses) .TP syncdoubling (Above Below) .TP sidebyside (Left Right) .TP anaglyph (Red\-Blue glasses) .TP vinterlace (Vertical interlace for autostereo display) .IP depending on the type of stereo you want .HP \fB\-D\fR: start player in dome mode .HP \fB\-\-Optional\fR parameters\-\- .TP angle = field of view in degrees .TP tilt = tilt angle in degrees .IP warpdata = a file to use for warping the image (absolute path) mode: fisheye (Fisheye) .TP truncatedfront (Front\-Truncated) .TP truncatedrear (Rear\-Truncated) .TP cubemap (Cube Map) .TP sphericalpanoramic (Spherical Panoramic) .IP depending on the type of dome you are using .HP \fB\-i\fR: parent windows ID .HP \fB\-d\fR: turn debugging on .HP \fB\-g\fR: game engine options: .TP Name Default Description .HP \fB\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\fR .TP fixedtime 0 "Enable all frames" .TP nomipmap 0 Disable mipmaps .TP show_framerate 0 Show the frame rate .TP show_properties 0 Show debug properties .TP show_profile 0 Show profiling information .TP blender_material 0 Enable material settings .TP ignore_deprecation_warnings 1 Ignore deprecation warnings .IP \- : all arguments after this are ignored, allowing python to access them from sys.argv .PP example: blenderplayer \fB\-w\fR 320 200 10 10 \fB\-g\fR noaudio//home//user//filename.blend example: blenderplayer \fB\-g\fR show_framerate = 0 //home//user//filename.blend ++++++ x-blend.desktop ++++++ --- /var/tmp/diff_new_pack.DW2P6i/_old 2010-12-28 23:54:54.000000000 +0100 +++ /var/tmp/diff_new_pack.DW2P6i/_new 2010-12-28 23:54:54.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Comment=Blender Template Name=blender -Icon=/usr/share//pixmaps/blender.xpm +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