Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2016-03-26 15:28:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2015-12-29 13:00:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2016-03-26 15:28:06.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Mar 23 16:24:41 UTC 2016 - [email protected] + +- Update to version 2.77 +- Upstream changes: + Cycles: Better Subsurface Scattering, GPU support for Smoke/Fire + and Point Density. + Grease pencil stroke sculpting and improved workflow. + OpenVDB caching for smoke/volumetric simulations. + Reworked library handling to manage missing and deleted + datablocks. + Redesigned progress bar. + Edit mode boolean tool, better decimate modifier. + Improved extruding and weight painting tools for + sculpting/painting. + And: 100s of bug fixes and other improvements! +- Added blender-2.77-bufferoverflow.patch to correct incorrect + use of strncat. Reported upstream and already corrected in git. + + +------------------------------------------------------------------- Old: ---- blender-2.76b.tar.gz blender-getversion.py New: ---- blender-2.77-bufferoverflow.patch blender-2.77.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.HirsBl/_old 2016-03-26 15:28:08.000000000 +0100 +++ /var/tmp/diff_new_pack.HirsBl/_new 2016-03-26 15:28:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package blender # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ # blender has versions like x.xxy which have x.xx (notice the missing # trailing y) in the directory path. This makes this additional variable # necessary. -%define _version 2.76 +%define _version %(echo %{version} | cut -b 1-4) # NOTE: this is to enable blender to build without cycles for 13.2 BUILD_ORIG = 1 see boo#960234 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 %bcond_without ffmpeg @@ -42,25 +42,25 @@ %endif %endif Name: blender -Version: 2.76b +Version: 2.77 Release: 0 Summary: A 3D Modelling And Rendering Package License: GPL-2.0+ Group: Productivity/Graphics/3D Editors Url: http://www.blender.org/ # http://download.blender.org/source/ -Source0: http://download.blender.org/source/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 Source2: geeko.blend Source3: geeko.README Source4: blender-sample Source6: blender.xpm Source7: x-blend.desktop -Source8: blender-getversion.py -# Refreshed for 2.67b +# Refreshed for 2.77 Patch1: blender-2.58-python_include.patch +Patch2: blender-2.77-bufferoverflow.patch # libquicktime-devel BuildRequires: OpenEXR-devel -BuildRequires: SDL-devel +BuildRequires: SDL2-devel BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -93,9 +93,11 @@ BuildRequires: perl-Text-Iconv BuildRequires: pkg-config # Needed since blender 2.71. Otherwise it won't build -BuildRequires: python3-devel >= 3.4 BuildRequires: python3-numpy-devel +BuildRequires: pkgconfig(python3) >= 3.5 +%if 0%{?suse_version} > 1320 BuildRequires: python3-requests +%endif BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: shared-mime-info @@ -110,8 +112,10 @@ BuildRequires: pkgconfig(libxml-2.0) # See bnc#713346 Requires: python3-numpy -Requires: python3-requests Requires: python3-xml +%if 0%{?suse_version} > 1320 +Requires: python3-requests +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 BuildRequires: libGLw-devel @@ -179,6 +183,7 @@ %prep %setup -q %patch1 +%patch2 # binreloc is not a part of fedora rm -rf extern/ffmpeg @@ -193,6 +198,7 @@ rm -rf extern/qhull rm -rf extern/make rm -rf extern/verse +echo %{_version} %build # sse options not supported by PowerPC @@ -203,12 +209,11 @@ export psver=$(pkg-config python3 --modversion) export pver=$(pkg-config python3 --modversion)$(python3-config --abiflags) mkdir -p Build && pushd Build -# Since Blender 2.71 Python >=3.4 is a hard requirement for building. + # FIXME: This comes from a stupid osc spec formatter # blender's flags are complex enough already without %%cmake macro spamming the build log. # It also puts _smp_mflags where it shouldn't, I had to write make -j1 to stop it. # NOTE: Don't use cmake macro. -# FIXME: you should use %%cmake macros cmake ../ -DBUILD_SHARED_LIBS:BOOL=off \ -DWITH_FFTW3:BOOL=on \ -DWITH_JACK:BOOL=on \ @@ -246,8 +251,12 @@ -DWITH_SDL:BOOL=ON \ %ifnarch x86_64 -DSUPPORT_SSE2_BUILD=false \ -%endif + -DWITH_RAYOPTIMIZATION:BOOL=OFF \ -DWITH_MOD_OCEANSIM:BOOL=OFF \ +%else + -DWITH_RAYOPTIMIZATION:BOOL=on \ + -DWITH_MOD_OCEANSIM:BOOL=ON \ +%endif -DCMAKE_VERBOSE_MAKEFILE=on \ -DCMAKE_C_FLAGS="%{optflags} ${sseflags}" \ -DCMAKE_CXX_FLAGS="%{optflags} ${sseflags}" \ @@ -259,7 +268,7 @@ -DWITH_PYTHON_INSTALL_NUMPY=off export LDFLAGS="$LDFLAGS -lclew" -pushd extern/libmv +pushd intern/libmv make -j1 popd # A further attempt to stop out of memory failures. @@ -282,12 +291,7 @@ %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}" +echo "release version = %{_version}" # make install pushd Build %make_install @@ -308,8 +312,7 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ install -D -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ install -D -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/ -# Install s6=blender.xpm -#install -D -m 0644 %%{SOURCE6} %%{buildroot}%%{_datadir}/pixmaps/ + 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 '#!'`; \ ++++++ blender-2.58-python_include.patch ++++++ --- /var/tmp/diff_new_pack.HirsBl/_old 2016-03-26 15:28:08.000000000 +0100 +++ /var/tmp/diff_new_pack.HirsBl/_new 2016-03-26 15:28:08.000000000 +0100 @@ -1,8 +1,8 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig 2015-10-12 00:58:22.000000000 +0200 -+++ CMakeLists.txt 2015-10-17 13:29:50.654210215 +0200 -@@ -900,6 +900,7 @@ if(UNIX AND NOT APPLE) +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -880,6 +880,7 @@ if(UNIX AND NOT APPLE) # XXX Linking errors with debian static python :/ # find_package_wrapper(PythonLibsUnix REQUIRED) find_package(PythonLibsUnix REQUIRED) ++++++ blender-2.77-bufferoverflow.patch ++++++ Index: source/blender/editors/space_file/file_ops.c =================================================================== --- source/blender/editors/space_file/file_ops.c.orig +++ source/blender/editors/space_file/file_ops.c @@ -1375,7 +1375,7 @@ int file_exec(bContext *C, wmOperator *e } else { BLI_cleanup_dir(G.main->name, sfile->params->dir); - strncat(sfile->params->dir, file->relpath, sizeof(sfile->params->dir)); + strncat(sfile->params->dir, file->relpath, sizeof(sfile->params->dir)-strlen(sfile->params->dir)-1); BLI_add_slash(sfile->params->dir); } ++++++ blender-2.76b.tar.gz -> blender-2.77.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/blender/blender-2.76b.tar.gz /work/SRC/openSUSE:Factory/.blender.new/blender-2.77.tar.bz2 differ: char 1, line 1
