Hello community,
here is the log from the commit of package blender for openSUSE:Factory
checked in at Fri Jan 7 14:02:42 CET 2011.
--------
--- blender/blender.changes 2010-12-14 13:01:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/blender/blender.changes 2011-01-02 12:49:45.000000000 +0100
@@ -1,0 +2,15 @@
+Sat Jan 1 18:34:31 UTC 2011 - davejplater@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!
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
blender-2.55.33653.tar.xz
New:
----
blender-2.55-gcc46fix.patch
blender-2.56.34000.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.0z22Rl/_old 2011-01-07 14:02:01.000000000 +0100
+++ /var/tmp/diff_new_pack.0z22Rl/_new 2011-01-07 14:02:01.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package blender (Version 2.55.33653)
+# spec file for package blender (Version 2.56.34000)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -17,25 +17,22 @@
# norootforbuild
-%define py_ver 3.1
-
%define collada 1
%define wplayer 1
# Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code.
%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: boost-devel fftw3-devel gcc-c++ 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
+#BuildRequires: libjpeg-devel
+BuildRequires: libjpeg62-devel
%if 0%{?collada} == 1
BuildRequires: openCOLLADA-devel
%endif
@@ -48,11 +45,11 @@
License: GPLv2+
Group: Productivity/Graphics/3D Editors
Summary: A 3D Modelling And Rendering Package Post Beta1 Svn Snapshot
-Version: 2.55.33653
+Version: 2.56.34000
Release: 1
Url: http://www.blender.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: blender-%{version}.tar.xz
+Source0: %{name}-%{version}.tar.xz
#Source1: blender-rpmlintrc
Source2: geeko.blend
Source3: geeko.README
@@ -64,6 +61,7 @@
Patch1: blender-2.48-undefine-operation.patch
# Patch submitted upstream - Blender Patches item #19234,
Patch2: blender-2.50-uninit-var.patch
+Patch4: blender-2.55-gcc46fix.patch
%if %DISTRIBUTABLE == 1
# Patch3 is needed due to the purging of everything mpeg
Patch3: blender-2.55-blenkernel.patch
@@ -124,11 +122,30 @@
This package provides the include files necessary to develop and
build plugins for Blender.
+find %1 -name '*.pyc' -exec rm -f {} \\; \
+python3 -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+%global __python3 /usr/bin/python3
+%global python3_ver %(python3 -c "import sys; v=sys.version_info[:2]; print('%%d.%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND)
+%global python3_prefix %(python3 -c "import sys; print(sys.prefix)" 2>/dev/null || echo PYTHON-NOT-FOUND)
+%global python3_libdir %{python3_prefix}/%{_lib}/python%{python3_ver}
+%global python3_incdir %{python3_prefix}/include/python%{python3_ver}
+%global python3_sitedir %{python3_libdir}/site-packages
+%global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())" 2>/dev/null || echo PYTHON-NOT-FOUND)
+%global python3_compile \
+%{-O: \
+find %1 -name '*.pyo' -exec rm -f {} \\; \
+python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+}
+%global python3_requires \
+%define minver %python3_ver \
+%define maxver %(python3 -c "import sys; a,b=sys.version_info[:2]; print('%%d.%%d'%%(a,b+1))" 2>/dev/null || echo PYTHON-NOT-FOUND) BuildRequires: python3 %{-d:python3-devel} PreReq: python3 >= %minver, python3 < %maxver
+
%prep
%setup -q
%patch0
%patch1
%patch2
+%patch4
%if %DISTRIBUTABLE == 1
%patch3
@@ -137,6 +154,17 @@
%endif
%define buildir $PWD
+echo %{buildir}
+echo %{_builddir}
+
+echo "python3_ver = %python3_ver"
+echo "python3_prefix = %python3_prefix"
+echo "python3_libdir = %python3_libdir"
+echo "python3_incdir = %python3_incdir"
+echo "python3_sitedir = %python3_sitedir"
+echo "python3_sitelib = %python3_sitelib"
+echo "python3_requires = %python3_requires"
+echo "python_sitelib = %python_sitelib"
%build
@@ -145,10 +173,10 @@
export BF_TIFF_LIB="%{_libdir}/libtiff.so"
export BF_TIFF_INC="%{_includedir}"
export BF_GETTEXT_LIBPATH="%{_libdir}"
-export PYTHON_LINKFLAGS=`python3.1-config --ldflags`
#WITH_INTERNATIONAL
mkdir -p Build
pushd Build
+# -DPYTHON_LIB=%%{_libdir}/libpython3.1.so \
cmake ../ \
-G"Unix Makefiles" \
-DWITH_FFTW3:BOOL=on \
@@ -158,10 +186,8 @@
-DOPENCOLLADA=%{_prefix} \
-DOPENCOLLADA_LIBPATH=%{_libdir} \
-DOPENCOLLADA_INC=%{_includedir} \
- -DPYTHON_LIB=%{_libdir}/libpython3.1.so \
-DPYTHON_LIBPATH=%{_libdir} \
- -DPYTHON_INC=%{_includedir}/python3.1 \
- -DPYTHON_LINKFLAGS="" \
+ -DPYTHON_INC=%{python3_incdir} \
-DWITH_PYTHON_INSTALL:BOOL=off \
-DWITH_PYTHON:BOOL=on \
-DWITH_IMAGE_OPENJPEG:BOOL=off \
@@ -183,11 +209,17 @@
popd
%install
-
+# Get the current release version for blender.
+# use relvers in the install section, rlversion only works in the files section.
+%define rlversion %(python %{_builddir}/%{name}-%{version}/release/getversion.py)
+#%%define rlversion %%{echo:%%{relvers}}
+echo %{rlversion}
+echo %{relvers}
pushd Build
-%makeinstall
+make DESTDIR=%{?buildroot} install
popd
+echo %{rlversion}
# Factory is now of the opinion that every /usr/bin file needs a man page,
%if %wplayer == 1
# Generate man page with help2man
@@ -198,8 +230,8 @@
# --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
+cp -v %{S:5} %{buildroot}%{_mandir}/man1
%endif
# Fix any .py files with shebangs and wrong permissions.
++++++ blender-2.55-gcc46fix.patch ++++++
Index: extern/Eigen2/Eigen/src/Core/util/Memory.h
===================================================================
--- extern/Eigen2/Eigen/src/Core/util/Memory.h.orig 2009-10-20 11:50:24.000000000 +0200
+++ extern/Eigen2/Eigen/src/Core/util/Memory.h 2010-12-17 01:36:30.000000000 +0200
@@ -26,6 +26,7 @@
#ifndef EIGEN_MEMORY_H
#define EIGEN_MEMORY_H
+#include