Hello community, here is the log from the commit of package blender.1323 for openSUSE:12.2:Update checked in at 2013-02-15 12:22:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/blender.1323 (Old) and /work/SRC/openSUSE:12.2:Update/.blender.1323.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender.1323", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-09 11:18:20.872010756 +0100 +++ /work/SRC/openSUSE:12.2:Update/.blender.1323.new/blender.changes 2013-02-15 12:23:00.000000000 +0100 @@ -0,0 +1,1112 @@ +------------------------------------------------------------------- +Fri Feb 8 10:12:56 UTC 2013 - davejpla...@gmail.com + +- Added blender-2.63a-CVE-2010-5105.patch to fix bnc#855092 + +------------------------------------------------------------------- +Fri May 11 04:33:12 UTC 2012 - badshah...@gmail.com + +- Update to version 2.63a: + + See + http://www.blender.org/development/release-logs/blender-263/ + for upstream changes. +- Add blender-fix-locale-files-path.patch to fix the path where + locale files are installed. Split out a lang package with extra + locale files. +- Do not enable verbose make file logs. + +------------------------------------------------------------------- +Thu May 3 12:15:53 UTC 2012 - davejpla...@gmail.com + +- Used Fedora 2.62 src rpm packaged by Richard Shaw to update to + version 2.63 +- Patch blender-2.62-blenkernel.patch no longer needed upstream + remove all undistributable directories if ffmpeg is disabled or + not available. +- blender-collada858.patch no longer needed, fixed upstream +- blender-gcc47.patch no longer needed, fixed upstream +- Blender now fully compatible with "second life" see bnc#652536 +- See http://www.blender.org/development/release-logs/blender-263/ + for upstream changes. + +------------------------------------------------------------------- +Wed Apr 11 18:56:09 UTC 2012 - dims...@opensuse.org + +- Add blender-collada858.patch: openCOLLADA >= svn 858 installs + the headers to /usr/include/COLLADA* instead of + /usr/include/COLLADA*/include, thus messing up the build of + blender. +- Add blender-gcc47.patch: Fix build with gcc 4.7. Taken from + upstream svn, r44000. + +------------------------------------------------------------------- +Wed Sep 7 17:02:34 UTC 2011 - davejpla...@gmail.com + +- 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 - davejpla...@gmail.com + +- Added "Requires: python3-xml to fix bnc#713346 + +------------------------------------------------------------------- +Wed May 4 16:25:51 UTC 2011 - davejpla...@gmail.com + +- Created blender-2.57b-nobuffer_ftoa_utf_link.patch to stop + blender's linker looking for libs buffer, ftoa and UTF from + openCOLLADA as these libs are now static included in the other + libraries and no longer exist. + +------------------------------------------------------------------- +Thu Apr 28 21:35:09 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.57b Release. +- Fix new patch blender-2.56-gcc46.patch to apply cleanly. +- Upstream changes : + *The Blender Foundation and online developer community is proud to + present Blender 2.57a. This is the first stable release of the + Blender 2.5 series, representing the culmination of many years of + redesign and development work. + *We name this version "Stable" not only because it's mostly feature + complete, but especially thanks to the 1000s of fixes and feature + updates we did since the 2.5 beta versions were published. + *The next 2 months we will keep working on finishing a couple of + left-over 2.5 targets and we expect to get feedback and bug reports + from users to handle as well. If all goes well, the 2.58 version + then can be the final release of the 2.5 series, with a massive + amount of new projects to be added for an exciting cycle of 2.6x + versions. Target is to release updates every 2 months this year. + +------------------------------------------------------------------- +Thu Apr 28 09:30:53 UTC 2011 - idoen...@novell.com + +- Add blender-2.56-gcc46.patch to fix compilation with gcc 4.6 + +------------------------------------------------------------------- +Sun Apr 17 15:08:37 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.57 stable +- Upstream news : + The Blender Foundation and online developer community is proud to + present Blender 2.57. This is the first stable release of the + Blender 2.5 series, representing the culmination of many years of + redesign and development work. + We name this version "Stable" not only because it's mostly feature + complete, but especially thanks to the 1000s of fixes and feature + updates we did since the 2.5 beta versions were published. + The next 2 months we will keep working on finishing a couple of + left-over 2.5 targets and we expect to get feedback and bug reports + from users to handle as well. If all goes well, the 2.58 version + then can be the final release of the 2.5 series, with a massive + amount of new projects to be added for an exciting cycle of + 2.6x versions. Target is to release updates every 2 months this year. + +------------------------------------------------------------------- +Thu Apr 14 10:51:48 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.57.36147 2.57 release. +- For upstream changes see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Thu Apr 7 22:43:56 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.57.36007 +- For upstream changes see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Mon Apr 4 18:59:09 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.57.35927 +- For upstream changes see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Wed Mar 23 15:45:23 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.56.35927 +- For upstream changes see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Tue Mar 22 15:49:18 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.56.35701 +- For upstream changes see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Tue Mar 8 12:40:59 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.56.35402 +- Enable blenderplayer to build +- For more changes see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Mon Mar 7 19:59:05 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.56.35390 +- Upstream changes : + *fix for building with opencollada 833 on linux. + For more changes see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Thu Feb 17 14:54:57 UTC 2011 - davejpla...@gmail.com + +- Update to blender-2.56.34784 +- For upstream changes see /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Sat Feb 12 08:56:01 UTC 2011 - davejpla...@gmail.com + +- Update to 2.56 beta svn snapshot blender-2.56.34 +- Upstream changes: +- *Bugfixes: #26021, #26039, #26040, #25973, #25978, #26030 + #26013, #26001, #26004, #26002, #26007, #25831, #25968, #25523, + #25969, #25957, #25977, #25975, #25693, #25801, #25970, #25965, + #25963, #25926, #25955, #25934, #25951, #25953, #25937, #25824, + #25947, #25948, #25693, #25944, #25608, #25871, #25923, #25933 + *For many new features and 2.49 functionality restored see : + /usr/share/doc/packages/blender/Changes.txt + +------------------------------------------------------------------- +Sat Jan 1 18:34:31 UTC 2011 - davejpla...@gmail.com + +- Update to 2.56 beta svn snapshot blender-2.56.34000 +- Upstream changes : + The Blender Foundation and online developer community is proud to + present Blender 2.56 Beta. This release is the fourth official + beta release of the Blender 2.5 series, representing the + culmination of many years of redesign and development work. + This version is called a "Beta" because it's now for the most + part feature complete. The Python API has had some extensive + changes, most notably in naming conventions and in creation and + access of properties. + Since Blender 2.55 beta over 440 bugs were fixed! + +------------------------------------------------------------------- ++++ 915 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.blender.1323.new/blender.changes New: ---- Changes.txt blender-2.63a-CVE-2010-5105.patch blender-2.63a.tar.gz blender-fix-locale-files-path.patch blender-getversion.py blender-sample blender.changes blender.spec blender.xpm blenderplayer.1 geeko.README geeko.blend x-blend.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ # # spec file for package blender # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global __python %{__python3} # [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') %define collada 1 %define wplayer 1 %define documentation 0 # Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code. %define DISTRIBUTABLE 1 %global svnrev 44995 Name: blender Version: 2.63a Release: 0 %define _version 2.63 Summary: A 3D Modelling And Rendering Package License: GPL-2.0+ Group: Productivity/Graphics/3D Editors Url: http://www.blender.org/ Source0: http://download.blender.org/source/%{name}-%{version}.tar.gz Source1: Changes.txt Source2: geeko.blend Source3: geeko.README Source4: blender-sample Source5: blenderplayer.1 Source6: blender.xpm Source7: x-blend.desktop Source8: blender-getversion.py #Fix the path that locale files are installed to Patch0: blender-fix-locale-files-path.patch # Fixes CVE-2010-5105 see bnc#779210 Patch1: blender-2.63a-CVE-2010-5105.patch %if 0%{?fedora} BuildRequires: expat-devel BuildRequires: fftw-devel BuildRequires: freetype-devel BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libstdc++-devel BuildRequires: mesa-libGLw-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: xorg-x11-proto-devel %else BuildRequires: gettext-tools %if 0%{?suse_version} > 1210 BuildRequires: libGLw-devel %else BuildRequires: MesaGLw-devel %endif BuildRequires: libexpat-devel BuildRequires: pkg-config BuildRequires: python3-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11 %if %documentation == 1 Recommends: blender-doc %endif %endif # libquicktime-devel BuildRequires: OpenEXR-devel BuildRequires: SDL-devel BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: epydoc BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: graphviz BuildRequires: help2man BuildRequires: hicolor-icon-theme BuildRequires: jack-audio-connection-kit-devel BuildRequires: libao-devel BuildRequires: libdrm-devel BuildRequires: liblcms-devel BuildRequires: libpng-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: lzo-devel BuildRequires: openal-soft-devel BuildRequires: openssl-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: perl-Text-Iconv BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: shared-mime-info BuildRequires: xorg-x11-devel BuildRequires: xz BuildRequires: xz-devel BuildRequires: yasm BuildRequires: yasm-devel BuildRequires: pkgconfig(libxml-2.0) %if 0%{?fedora} >= 14 || 0%{?suse_version} >= 1140 BuildRequires: libjpeg62-devel %else BuildRequires: libjpeg-devel %endif %if 0%{?collada} == 1 BuildRequires: openCOLLADA-devel >= svn838 %endif BuildRequires: graphviz BuildRequires: liblcms-devel # See bnc#713346 Requires: python3-xml %if %DISTRIBUTABLE <= 0 BuildRequires: libffmpeg-devel %endif %description 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. %if %documentation == 1 %package doc Summary: Documentation for blender Group: Documentation BuildArch: noarch %description doc Being 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. This package includes API documentation and example plugin programs. %endif %lang_package %prep %setup -q %patch0 %patch1 %if %DISTRIBUTABLE == 1 rm -rf release/scripts/presets/ffmpeg %endif # binreloc is not a part of fedora rm -rf extern/ffmpeg rm -rf extern/fftw rm -rf extern/glew rm -rf extern/libmp3lame rm -rf extern/libopenjpeg rm -rf extern/libredcode rm -rf extern/ode rm -rf extern/x264 rm -rf extern/xvidcore rm -rf extern/qhull rm -rf extern/make rm -rf extern/verse %build mkdir -p Build && pushd Build cmake ../ -DBUILD_SHARED_LIBS:BOOL=off \ -DWITH_FFTW3:BOOL=on \ -DWITH_JACK:BOOL=on \ -DWITH_CODEC_SNDFILE:BOOL=on \ -DWITH_IMAGE_OPENJPEG:BOOL=off \ -DWITH_OPENCOLLADA:BOOL=on \ -DWITH_PYTHON:BOOL=on \ -DWITH_PYTHON_INSTALL:BOOL=off \ -DWITH_GAMEENGINE:BOOL=ON \ %if %DISTRIBUTABLE == 1 -DWITH_CODEC_FFMPEG:BOOL=off \ %else -DWITH_CODEC_FFMPEG:BOOL=on \ %endif -DWITH_CXX_GUARDEDALLOC:BOOL=off \ %if %wplayer == 1 -DWITH_PLAYER:BOOL=on \ %else -DWITH_PLAYER:BOOL=off \ %endif -DWITH_INSTALL_PORTABLE:BOOL=OFF \ -DWITH_BUILTIN_GLEW:BOOL=OFF \ -DWITH_MOD_OCEANSIM:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} make %{?_smp_mflags} popd %if %documentation == 1 # Build documentation pushd doc/doxygen doxygen -u Doxyfile doxygen Doxyfile popd mv doc/doxygen/html doc/ rm -rf doc/doxygen %endif %install export blender_version=$(grep BLENDER_VERSION source/blender/blenkernel/BKE_blender.h | tr -dc 0-9) export blender_version=$(expr $blender_version / 100).$(expr $blender_version % 100) %define rlversion %(echo $blender_version) echo "release version = $blender_version" echo "rlversion is %{?rlversion}" # make install pushd Build %make_install popd # Remove folder, it's not supposed to be installed here. rm -rf %{buildroot}%{_datadir}/%{name}/%{_version}/datafiles/fonts # 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 popd #cp -v %%{SOURCE5} %%{buildroot}%%{_mandir}/man1 %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}/%{name} cp -v %{buildroot}%{_datadir}/doc/blender/* %{buildroot}%{_docdir}/%{name}/ rm -rf %{buildroot}%{_datadir}/doc/blender # install blender sample. install -D -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ install -D -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ install -D -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/ # Add Changes.txt cp -v %{SOURCE1} %{buildroot}%{_docdir}/%{name}/ %if 1 == 1 # Add more icons. mkdir -p %{buildroot}%{_datadir}/pixmaps/ pushd %{buildroot}%{_datadir}/pixmaps/ ln -s ../icons/hicolor/32x32/apps/blender.png blender.png popd # Install s6=blender.xpm and s11=v-2.55 install -D -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ln -s ../icons/hicolor/scalable/apps/blender.svg %{buildroot}%{_datadir}/pixmaps %endif # Install s6=blender.xpm install -D -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ # Install blender template desktop file. desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE7} # Validate blender.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/blender.desktop 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 %fdupes %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/ %find_lang %{name} %{?no_lang_C} %post update-desktop-database &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database &> /de%{_docdir}/%{name}-devel-%{version}v/null || : update-mime-database %{_datadir}/mime &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files lang -f %{name}.lang %files %defattr (-, root, root) %{_bindir}/* %{_mandir}/man1/* %{_datadir}/%{name} %{_datadir}/applications/blender.desktop %{_datadir}/applications/x-blend.desktop %{_datadir}/icons/hicolor/*/apps/blender.png %{_datadir}/icons/hicolor/scalable/apps/blender.svg %{_datadir}/pixmaps/blender.svg %{_datadir}/pixmaps/blender.xpm %{_datadir}/pixmaps/blender.png %if %documentation == 0 %doc %{_docdir}/%{name} %else %files doc %defattr (-, root, root) %doc doc/ %endif %changelog ++++++ Changes.txt ++++++ ++++ 18686 lines (skipped) ++++++ blender-2.63a-CVE-2010-5105.patch ++++++ Index: source/blender/blenkernel/intern/blender.c =================================================================== --- source/blender/blenkernel/intern/blender.c.orig 2013-02-08 12:08:06.571198492 +0200 +++ source/blender/blenkernel/intern/blender.c 2013-02-08 12:08:21.229495923 +0200 @@ -40,6 +40,7 @@ # define write _write #endif +#include <errno.h> #include <stdlib.h> #include <stdio.h> #include <stddef.h> @@ -706,7 +707,8 @@ void BKE_undo_save_quit(void) { UndoElem *uel; MemFileChunk *chunk; - int file; + int file = -1; + int flags = O_BINARY+O_WRONLY+O_CREAT+O_TRUNC+O_EXCL; char str[FILE_MAX]; if ( (U.uiflag & USER_GLOBALUNDO)==0) return; @@ -722,10 +724,16 @@ void BKE_undo_save_quit(void) BLI_make_file_string("/", str, BLI_temporary_dir(), "quit.blend"); - file = BLI_open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666); - if (file == -1) { - //XXX error("Unable to save %s, check you have permissions", str); - return; + while (file == -1) { + file = BLI_open(str,flags, 0666); + if (file == -1) { + if (errno == EEXIST) { + flags ^= O_CREAT; + } else { + //XXX error("Unable to save %s, check you have permissions", str); + return; + } + } } chunk= uel->memfile.chunks.first; ++++++ blender-fix-locale-files-path.patch ++++++ Index: source/creator/CMakeLists.txt =================================================================== --- source/creator/CMakeLists.txt.orig 2013-02-08 12:08:06.618199446 +0200 +++ source/creator/CMakeLists.txt 2013-02-08 12:08:10.903286400 +0200 @@ -295,11 +295,16 @@ endif() if(WITH_INTERNATIONAL) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/datafiles/locale ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) + install( + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + DESTINATION ${CMAKE_INSTALL_PREFIX}/share + PATTERN ".svn" EXCLUDE + ) endif() # helpful tip when using make Index: release/environment-unix =================================================================== --- release/environment-unix.orig 2013-02-08 12:08:06.594198960 +0200 +++ release/environment-unix 2013-02-08 12:08:10.904286420 +0200 @@ -11,7 +11,7 @@ BLENDER_USER_BASE=${HOME}/.blender/${BLENDER_VERSION} BLENDER_SYSTEM_BASE=${BLENDER_SHARE}/${BLENDER_VERSION} BLENDER_USER_DATAFILES=${HOME}/.blender/${BLENDER_VERSION}/datafiles -BLENDER_SYSTEM_DATAFILES=${BLENDER_SHARE}/${BLENDER_VERSION}/datafiles +BLENDER_SYSTEM_DATAFILES=/usr/share BLENDER_USER_PY=${HOME}/.blender/${BLENDER_VERSION}/py BLENDER_SYSTEM_PY=${BLENDER_SHARE}/${BLENDER_VERSION}/py BLENDER_USER_PLUGINS=${HOME}/.blender/${BLENDER_VERSION}/plugins Index: source/blender/blenfont/intern/blf_lang.c =================================================================== --- source/blender/blenfont/intern/blf_lang.c.orig 2013-02-08 12:08:06.618199446 +0200 +++ source/blender/blenfont/intern/blf_lang.c 2013-02-08 12:08:10.904286420 +0200 @@ -110,17 +110,7 @@ static const char *locales[] = { void BLF_lang_init(void) { - char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale"); - - BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); - - if (messagepath) { - BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); - } - else { - printf("%s: 'locale' data path for translations not found, continuing\n", __func__); - global_messagepath[0] = '\0'; - } + *global_messagepath = "/usr/share/locale/"; } Index: source/blender/blenlib/intern/path_util.c =================================================================== --- source/blender/blenlib/intern/path_util.c.orig 2013-02-08 12:08:06.618199446 +0200 +++ source/blender/blenlib/intern/path_util.c 2013-02-08 12:08:10.904286420 +0200 @@ -994,38 +994,6 @@ static int get_path_system(char *targetp char system_path[FILE_MAX]; 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'; if (test_env_path(system_path, envvar)) { ++++++ blender-getversion.py ++++++ #!/usr/bin/env python # -*- mode: python; tab-width: 4; indent-tabs-mode: t; -*- # vim: tabstop=4 # $Id: getversion.py 33381 2010-11-29 17:23:06Z ton $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2008 by the Blender Foundation # All rights reserved. # # The Original Code is: see repository. # # Contributor(s): see repository. # <pep8-80 compliant> import sys import os import re nanblenderhome = os.getenv("NANBLENDERHOME") if nanblenderhome is None: nanblenderhome = os.path.dirname(os.path.abspath(sys.argv[0])) + "/.." config = nanblenderhome + "/source/blender/blenkernel/BKE_blender.h" infile = open(config) major = None minor = None for line in infile.readlines(): m = re.search("#define BLENDER_VERSION\s+(\d+)", line) if m: major = m.group(1) m = re.search("#define BLENDER_SUBVERSION\s+(\d+)", line) if m: minor = m.group(1) if minor and major: major = float(major) / 100.0 break infile.close() # Major was changed to float, but minor is still a string # Note: removed returning minor, this messes up with install path code in BLI module if major: print "%.2f" % major else: print "unknownversion" ++++++ blender-sample ++++++ #! /bin/sh /usr/bin/blender /usr/share/doc/packages/blender/geeko.blend ++++++ blender.xpm ++++++ /* XPM */ static char * blender_xpm[] = { "48 48 462 2", " c None", ". c #EDA45B", "+ c #E89039", "@ c #EB8C2F", "# c #EA9642", "$ c #E68E31", "% c #EE9034", "& c #EE8E31", "* c #F08F34", "= c #EF9032", "- c #E7A158", "; c #F08E31", "> c #F08F2F", ", c #EF9133", "' c #F18D2F", ") c #EF9038", "! c #EC9031", "~ c #E29442", "{ c #EC963F", "] c #ED9032", "^ c #EE9035", "/ c #F28F30", "( c #F48D30", "_ c #F48C2B", ": c #EB9840", "< c #E9913B", "[ c #EF8E2E", "} c #EC9034", "| c #ED8F37", "1 c #EF9238", "2 c #ED8F32", "3 c #EE8C32", "4 c #E6A15B", "5 c #E59C4E", "6 c #EA8E2D", "7 c #F39030", "8 c #EE8E36", "9 c #F29032", "0 c #F09031", "a c #F28B2D", "b c #E69543", "c c #ECA863", "d c #E88F32", "e c #F0912C", "f c #EE8F35", "g c #EE8F36", "h c #F08F30", "i c #E79747", "j c #ED923A", "k c #F09136", "l c #EF9034", "m c #E98E36", "n c #DF9B4F", "o c #E89642", "p c #EE933C", "q c #EC943C", "r c #EC923B", "s c #EA933D", "t c #EE922E", "u c #E89A4D", "v c #EA9542", "w c #F49134", "x c #F09034", "y c #ED8E33", "z c #EC9038", "A c #F08F36", "B c #F48D34", "C c #E8903B", "D c #EF8F30", "E c #EB9541", "F c #F18B2A", "G c #EB8F38", "H c #F19132", "I c #EE9033", "J c #EA8E38", "K c #EF8E33", "L c #EF9036", "M c #E99036", "N c #EF9035", "O c #EE8E35", "P c #ED912F", "Q c #EE912E", "R c #F09032", "S c #EF9033", "T c #EE9133", "U c #EB9135", "V c #F19137", "W c #EF8E2F", "X c #F19235", "Y c #F19034", "Z c #EA9238", "` c #E69038", " . c #F18F2C", ".. c #F38E2F", "+. c #EE902E", "@. c #F28E35", "#. c #F58E2B", "$. c #F18E32", "%. c #F19036", "&. c #F09038", "*. c #F09036", "=. c #F19037", "-. c #F08E36", ";. c #F08F37", ">. c #F48F35", ",. c #F68D32", "'. c #EC9136", "). c #EB9235", "!. c #ED9132", "~. c #EB8F36", "{. c #E78E34", "]. c #E6A054", "^. c #EC923D", "/. c #E58F35", "(. c #EA8D2E", "_. c #E78C2E", ":. c #EE8F34", "<. c #EF9948", "[. c #EE9038", "}. c #EB9036", "|. c #EE8E32", "1. c #F1902F", "2. c #EE8D2C", "3. c #E9953F", "4. c #EA9E4F", "5. c #E78C30", "6. c #F48C28", "7. c #E9943E", "8. c #E49C4E", "9. c #EC8E32", "0. c #F08E33", "a. c #F48E34", "b. c #F28E36", "c. c #ED8F36", "d. c #F28E2F", "e. c #EF8E34", "f. c #F0902F", "g. c #E29445", "h. c #DF9B50", "i. c #EE9030", "j. c #F3902A", "k. c #E98F33", "l. c #EA9C4B", "m. c #E99C47", "n. c #E49642", "o. c #F28F2F", "p. c #F29031", "q. c #F39035", "r. c #EE9036", "s. c #F19032", "t. c #E39848", "u. c #E9943F", "v. c #F38E31", "w. c #ED9034", "x. c #F29034", "y. c #ED9134", "z. c #EE9132", "A. c #F19035", "B. c #E69544", "C. c #E39A50", "D. c #F08E32", "E. c #ED9135", "F. c #EC9130", "G. c #F18F32", "H. c #E3A25D", "I. c #E2913E", "J. c #F28D30", "K. c #EE9135", "L. c #EE9235", "M. c #F18F36", "N. c #EE9031", "O. c #F18F2E", "P. c #EB9744", "Q. c #4E7D9C", "R. c #356A8D", "S. c #5C86A1", "T. c #E6A461", "U. c #EC8E2F", "V. c #EF8F36", "W. c #EE8F32", "X. c #E48E35", "Y. c #E69E54", "Z. c #F18F30", "`. c #EE9138", " + c #EE9032", ".+ c #EE8F3A", "++ c #F4912E", "@+ c #E89440", "#+ c #1D5982", "$+ c #044C7E", "%+ c #024C80", "&+ c #015086", "*+ c #015188", "=+ c #064F82", "-+ c #2A6288", ";+ c #E69E52", ">+ c #F38E30", ",+ c #EC8F34", "'+ c #F29132", ")+ c #E99642", "!+ c #E99540", "~+ c #F18E2E", "{+ c #F08F33", "]+ c #EC9037", "^+ c #ED9030", "/+ c #EE9037", "(+ c #ED8D2E", "_+ c #0A5080", ":+ c #015085", "<+ c #015289", "[+ c #014F82", "}+ c #015186", "|+ c #015187", "1+ c #015185", "2+ c #155482", "3+ c #E79644", "4+ c #EF9137", "5+ c #ED8F34", "6+ c #F18C31", "7+ c #E99038", "8+ c #F28F31", "9+ c #EC9036", "0+ c #EF9031", "a+ c #135784", "b+ c #005288", "c+ c #015083", "d+ c #015284", "e+ c #004F84", "f+ c #005188", "g+ c #005086", "h+ c #01538A", "i+ c #015287", "j+ c #21608C", "k+ c #E09E55", "l+ c #F48C2C", "m+ c #EC9033", "n+ c #F28F2B", "o+ c #EA9B4B", "p+ c #E7A056", "q+ c #E58F39", "r+ c #F09134", "s+ c #F08E30", "t+ c #ED8E2E", "u+ c #ED9A48", "v+ c #205A80", "w+ c #014F83", "x+ c #005186", "y+ c #015286", "z+ c #024C81", "A+ c #4B789A", "B+ c #F28D33", "C+ c #EC8F30", "D+ c #F28E37", "E+ c #F0912D", "F+ c #EA9643", "G+ c #EE8F30", "H+ c #F49030", "I+ c #F09033", "J+ c #EE9233", "K+ c #EE8F2E", "L+ c #E69A4E", "M+ c #31688E", "N+ c #01538C", "O+ c #015084", "P+ c #015590", "Q+ c #1F5C86", "R+ c #EA923F", "S+ c #EF9130", "T+ c #E88E36", "U+ c #EE923D", "V+ c #F19236", "W+ c #DBA766", "X+ c #28648E", "Y+ c #025288", "Z+ c #015184", "`+ c #326A91", " @ c #EE9944", ".@ c #EF8F32", "+@ c #F09C44", "@@ c #ED8E32", "#@ c #EB8F34", "$@ c #EE9134", "%@ c #EA9640", "&@ c #EF9642", "*@ c #F08F35", "=@ c #EF8E2C", "-@ c #E0A25E", ";@ c #2A638A", ">@ c #005187", ",@ c #005087", "'@ c #005289", ")@ c #014E82", "!@ c #015089", "~@ c #14527E", "{@ c #EE9236", "]@ c #EC8F33", "^@ c #EF8D2D", "/@ c #F4AB66", "(@ c #E69039", "_@ c #EF8F31", ":@ c #EE8E33", "<@ c #F29232", "[@ c #EE9136", "}@ c #EB8F32", "|@ c #EE9742", "1@ c #ED9E51", "2@ c #F28F33", "3@ c #EC9234", "4@ c #ED9234", "5@ c #F28E2E", "6@ c #014D84", "7@ c #015088", "8@ c #014E87", "9@ c #055287", "0@ c #044E83", "a@ c #F19033", "b@ c #F08E2F", "c@ c #F2AE68", "d@ c #EB973F", "e@ c #F08F2C", "f@ c #F29030", "g@ c #F29134", "h@ c #F09030", "i@ c #F18E2F", "j@ c #E89643", "k@ c #E89A4B", "l@ c #F78E33", "m@ c #E79B4C", "n@ c #185782", "o@ c #015087", "p@ c #005088", "q@ c #025186", "r@ c #015189", "s@ c #025087", "t@ c #406E8F", "u@ c #F09C4A", "v@ c #EE8E30", "w@ c #E98C30", "x@ c #EA9038", "y@ c #F29235", "z@ c #E59039", "A@ c #E9A058", "B@ c #F19135", "C@ c #F2943E", "D@ c #295F86", "E@ c #014A7F", "F@ c #025084", "G@ c #025284", "H@ c #025188", "I@ c #044A7A", "J@ c #3E6D8F", "K@ c #E89748", "L@ c #EF9239", "M@ c #EF8F34", "N@ c #EB9038", "O@ c #E98E30", "P@ c #F49036", "Q@ c #EA8F36", "R@ c #F49439", "S@ c #F19130", "T@ c #F09037", "U@ c #EE9A47", "V@ c #266591", "W@ c #225D85", "X@ c #145488", "Y@ c #236290", "Z@ c #226088", "`@ c #E99F53", " # c #EA8E34", ".# c #ED8F35", "+# c #F29237", "@# c #ED9B4B", "## c #E59A4A", "$# c #F18F38", "%# c #ED9037", "&# c #F28E32", "*# c #F09439", "=# c #F3A052", "-# c #F39E4D", ";# c #EA8E36", "># c #F28F35", ",# c #F08E2B", "'# c #E29E57", ")# c #F28C2E", "!# c #EE9237", "~# c #F48F2C", "{# c #F28F2D", "]# c #F4A050", "^# c #F58D33", "/# c #EE9137", "(# c #EE9130", "_# c #F29133", ":# c #F49C4B", "<# c #E6A25E", "[# c #ED8F2F", "}# c #ED8F33", "|# c #F19134", "1# c #F19031", "2# c #E29B52", "3# c #F09035", "4# c #EE8F38", "5# c #E68C30", "6# c #E6A056", "7# c #F39536", "8# c #EF9132", "9# c #F28E34", "0# c #EA923D", "a# c #EEA352", "b# c #EA9844", "c# c #EC9039", "d# c #EE8F31", "e# c #F08E34", "f# c #E9913C", "g# c #EE9942", "h# c #EB9A49", "i# c #F29439", "j# c #EC9138", "k# c #EB9B4C", "l# c #EEA459", "m# c #F1A555", "n# c #F5B06F", "o# c #EB9D50", "p# c #EA9036", "q# c #EF9234", "r# c #EF9135", "s# c #F38E34", "t# c #F08D31", "u# c #EC933B", "v# c #F4AD69", "w# c #F09337", "x# c #F2963C", "y# c #EC8E34", "z# c #F08F32", "A# c #EA9139", "B# c #F4A65D", "C# c #F39134", "D# c #EE8F33", "E# c #F68E33", "F# c #EF9037", "G# c #E99032", "H# c #F4A151", "I# c #EF9136", "J# c #EE8E2F", "K# c #E59344", "L# c #F6AA63", "M# c #F09238", "N# c #ED9033", "O# c #EB8E2F", "P# c #E89641", "Q# c #F19E4C", "R# c #F09237", "S# c #EE9131", "T# c #F4912C", "U# c #EA8C2D", "V# c #F29F51", "W# c #F0943B", "X# c #F09239", "Y# c #EE8E34", "Z# c #E6943E", "`# c #F39A44", " $ c #F29941", ".$ c #F09F49", " ", " ", " ", " ", " ", " ", " . + @ # ", " $ % & * = - ", " ; > , ' ) ! ~ ", " { ] ^ / ( _ : ", " < [ } | 1 2 3 4 ", " 5 6 7 8 9 0 a b ", " c d e * f g h i ", " j k l l l l m ", " n o p p p p p p p p p p p p p p p p q r s t l l l l 0 > u ", " v w % x x x x x x x x x x x x x x x x y z A B l l l l / C D E ", " F G H I I I I J K % ^ L L L L M } N O L P Q R % S T U V W X Y Z ", " ` .9 x x x x ..} +.@.l l l l #.$.%.&.*.=.-.;.l L >.,.'.).!.Q ~.{.]. ", " ^./.(.(.(.(.3 _.:.<.l l l l [.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g. ", " h.l l l l i.j.k.l. m.n.o.p.g q.r.s.t. ", " u.v.w.x.y.z.A.B. C.D.E.F.R l G.H. ", " I.J.K.L.M.N.O.P. Q.R.S. T.U.V.D.W.h X. ", " Y.Z.D.0 `. +.+++@+ #+$+%+&+*+=+-+ ;+>+*.,+R '+)+ ", " !+~+{+ +]+^+x /+(+ _+:+<+<+[+}+|+1+2+ 3+N.4+N 5+6+ ", " 7+8+9+x x 0+S %.= @+ a+b+c+d+e+f+b+g+h+i+j+ k+l+m+z.l n+o+ ", " p+q+r+s+/+l l l l ^ t+u+ v+w+x+x+x+x+x+x+x+x+y+z+A+ B+C+% D+E+F+ ", " < G+H+I+k I+l l l l J+K+L+ M+N+x+x+x+x+x+x+x+x+O+P+Q+ R+G+I ;.S+T+ ", " U+%.S x W.N V+l l l l :.O.W+ X+Y+x+x+x+x+x+x+x+x+Z+*+`+ @I l x W..@ ", " +@@@W.#@$@r.I+N.%@&@*@$@x N =@-@ ;@<+>@b+,@g+d+d+x+'@)@!@~@ {@K.Y ]@N ^@/@", " u.(@_@l :@<@[@}@|@ 1@2@3@K 4@5@t. 6@y+O+&+7@!@8@,@O+9@0@ ]@2 a@r.y b@c@", " d@e@f@K.g@s+h@i@j@ k@f@$@A.T l@m@ n@o@p@g+*+q@*+r@|+s@t@ u@v@I+* x % w@ ", " } 0 s.x@:.h y@z@A@ B@S x * x C@ D@E@,@F@G@7@H@I@J@ K@o.L@^ R M@N@ ", " O@s.$@P@x % k Q@ R@x l I+S@T@U@ V@W@X@Y@Z@ `@ #W.^ .#+#! @# ", " ##8+1.3@$#%#&#*# =#L l l G.l s.-# ;#%#W.>#% ^ ,#'# ", " )+)#S !#~#{#u. ]#^#/#(#&.J+l _#:# <#[#$@}#|#x s.1#N@ ", " 2#|.3#4#5#6# 7#K.8#[@I+9#I % 0#a# b#c#i@d# +% 9.e#K+ ", " f#g#h# i#l I+I+k R z.W ] j#k#l#m#n#*.o#p#~+g@v@q#R } r#s#t#u# ", " v#w#A.I x#x I i.& w.y#z#S *.S W.W.l l l l *.% 2 3#A# ", " B#*.8+C#*.S i.& I D#= S l l S S l l l l m+E#F#G# ", " H#9 I#l S z.J# +@@.@= l l l % l l l l x l K# ", " L#M#N#% I N.@@% :.R l l x *.L A A % O#P# ", " Q#R#S S# +W.W.S l l I+{+*@T#U#l. ", " V#W#X#l M@= S I+b@Y#b Z# ", " `# $ $.$ ", " ", " ", " ", " "}; ++++++ 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 ++++++ geeko.README ++++++ Blender sample - SuSE Geeko by Florian Sailer <fsai...@suse.de>. ++++++ x-blend.desktop ++++++ [Desktop Entry] Comment=Blender Template Name=blender Icon=/usr/share/pixmaps/blender.xpm Type=Application MimeType=application/x-blend; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
