Hello community,
here is the log from the commit of package blender
checked in at Mon Oct 16 19:15:49 CEST 2006.
--------
--- blender/blender.changes 2006-09-19 10:48:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/blender/blender.changes 2006-10-16 17:49:43.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Oct 16 16:33:35 CEST 2006 - pnemec@suse.cz
+
+- updated to version 2.42 see Changelog for details
+- large enhancement in package, whole specfile rewrited
+ all patches either removed or rewrited
+- new: support for quick time, better support for yafray
+- new: package contains several blender scripts and plugins
+
+-------------------------------------------------------------------
@@ -4 +13 @@
-- fixed amiguous variable evaluation
+- fixed amiguous variable evaluation
@@ -10 +19 @@
-- adde ftgl-devel to BuildRequires
+- adde ftgl-devel to BuildRequires
Old:
----
blender-2.41-missing_header.patch
blender-2.41-po.patch
blender-2.41.tar.bz2
blender-home-to-datadir.patch
blender-scons.patch
New:
----
blender-2.42a-buildfix.patch
blender-2.42a-ffmpeg.patch
blender-2.42a-libtiff.patch
blender-2.42a.tar.bz2
blender-python64.patch
makefile.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender-doc.spec ++++++
--- /var/tmp/diff_new_pack.u3It26/_old 2006-10-16 19:15:22.000000000 +0200
+++ /var/tmp/diff_new_pack.u3It26/_new 2006-10-16 19:15:22.000000000 +0200
@@ -16,7 +16,7 @@
Group: Productivity/Graphics/Visualization/Raytracers
Autoreqprov: on
Version: 2.3
-Release: 7
+Release: 13
Source: BlenderManualIen.23.html.tar.bz2
Source1: blender.xpm
BuildArch: noarch
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.u3It26/_old 2006-10-16 19:15:22.000000000 +0200
+++ /var/tmp/diff_new_pack.u3It26/_new 2006-10-16 19:15:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package blender (Version 2.41)
+# spec file for package blender (Version 2.42a)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,25 +11,29 @@
# norootforbuild
Name: blender
-BuildRequires: Mesa-devel OpenEXR-devel SDL-devel freetype2-devel ftgl ftgl-devel gcc-c++ libao-devel libdrm-devel libpng-devel libtiff-devel openal-devel openssl-devel python-devel scons update-desktop-files xorg-x11 yafray
+%define DISTRIBUTABLE 1
+BuildRequires: Mesa-devel OpenEXR-devel SDL-devel freetype2-devel ftgl-devel gcc-c++ libao-devel libdrm-devel libpng-devel libquicktime-devel libtiff-devel openal-devel openssl-devel python-devel scons update-desktop-files xorg-x11 yafray
License: Other License(s), see package, GPL
+%if %DISTRIBUTABLE
+BuildRequires: ffmpeg-devel
+%endif
Group: Productivity/Graphics/Visualization/Raytracers
Autoreqprov: on
Requires: yafray
-Version: 2.41
-Release: 7
+Version: 2.42a
+Release: 1
Source: %{name}-%{version}.tar.bz2
Source2: geeko.blend
Source3: geeko.README
Source4: blender-sample
Source6: blender.xpm
-Source7: %{name}-scons.patch
-Patch1: %{name}-%{version}-po.patch
-Patch2: %{name}-home-to-datadir.patch
-Patch3: %{name}-scons.patch
-Patch4: %{name}-%{version}-uninitialized_variables.patch
-Patch5: %{name}-%{version}-missing_header.patch
-Patch6: %{name}-%{version}-undefined_operation.patch
+Patch0: %{name}-%{version}-buildfix.patch
+Patch1: %{name}-%{version}-libtiff.patch
+Patch2: %{name}-python64.patch
+Patch3: blender-2.41-undefined_operation.patch
+Patch4: blender-2.41-uninitialized_variables.patch
+Patch5: makefile.patch
+Patch6: %{name}-%{version}-ffmpeg.patch
URL: http://www.blender.org/
#Icon: blender.xpm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,40 +53,78 @@
%prep
#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CFLAGS="$RPM_OPT_FLAGS"
-if test -z "$CFLAGS" ; then
- export CSCFLAGS=
-else
- CSCFLAGS="${CFLAGS// /', '}"
- export CSCFLAGS=", '$CSCFLAGS'"
-fi
-%setup -q -n blender
+export RPM_OPT_FLAG="${RPM_OPT_FLAGS}"
+export CFLAGS="$RPM_OPT_FLAGS}"
+#export CSCFLAGS=""
+%setup -q
+#
+#fix path`s on x86-64 architecture
+VAR_LIB=VAR_LIB
+patch_to_patch="%{P:0} %{P:6}"
+sed -i "s/$VAR_LIB/%_lib/" ${patch_to_patch}
+sed -i "s/RPMCSCFLAGS/$CSCFLAGS/" ${patch_to_patch}
+sed -i "s/RPMCFLAGS/$CFLAGS/" ${patch_to_patch}
+%patch
%patch1
%patch2
-sed -i "s%\\(CCFLAGS[[:space:]]*=[[:space:]]\\['*[^]]*\\)'\\]%\\1'$CSCFLAGS]%" extern/bFTGL/SConscript extern/qhull/SConscript
-mv bin/.blender/locale/zh_cn bin/.blender/locale/zh_CN
-mv bin/.blender/locale/pt_br bin/.blender/locale/pt_BR
-mv bin/.blender/locale/hr_HR bin/.blender/locale/hr
-#
-# fix patch to lib in Scons build file
%patch3
-PATCH3=SConstruct
-VAR_LIB=VAR_LIB
-sed -i "s/$VAR_LIB/%_lib/" ${PATCH3}
-sed -i "s/"\$CSCFLAGS"/$CSCFLAGS/" ${PATCH3}
%patch4
%patch5
+%if %DISTRIBUTABLE
%patch6
+%endif
+#fix locale naming
+mv bin/.blender/locale/zh_cn bin/.blender/locale/zh_CN
+mv bin/.blender/locale/pt_br bin/.blender/locale/pt_BR
+mv bin/.blender/locale/hr_HR bin/.blender/locale/hr
%build
rm -rf ../build
-scons
+scons BF_QUIET=0 CFLAGS="$RPM_OPT_FLAGS"
+scons BF_QUIET=0 CFLAGS="$RPM_OPT_FLAGS" blenderplayer
+# Build plugins
+pushd release/plugins
+ if [ -d ./include ]; then
+ rm -rf include
+ fi
+ ln -s ../../source/blender/blenpluginapi include
+ chmod +x bmake
+ make
+popd
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install blender blenderplayer $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/blender
+install -d $RPM_BUILD_ROOT/usr/bin
+install -d $RPM_BUILD_ROOT/%{_docdir}/blender
+pushd ../install/linux2
+#
+# install binary
+install blender $RPM_BUILD_ROOT/%{_bindir}
+install blenderplayer $RPM_BUILD_ROOT/%{_bindir}
+install blender.html BlenderQuickStart.pdf *.txt $RPM_BUILD_ROOT/%{_docdir}/blender
+#
+# locales
+install -d ${RPM_BUILD_ROOT}%{_datadir}/locale
+cp -a .blender/locale/* ${RPM_BUILD_ROOT}%{_datadir}/locale
+#
+# scripts
+install -d $RPM_BUILD_ROOT/%{_libdir}/%{name}/scripts
+cp -a .blender/scripts/* $RPM_BUILD_ROOT/%{_libdir}/%{name}/scripts
+popd
+#
+# plugins
+install -d $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins
+ # find all plugins create subdirs and cp them
+pushd release/plugins
+find . -name "*so" | awk -F "/" '{line="";for(i=2;inbuckets;
e->v0 = v0;
-@@ -117,7 +121,11 @@ void** BLI_edgehash_lookup_p(EdgeHash *e
+@@ -117,7 +120,11 @@ void** BLI_edgehash_lookup_p(EdgeHash *e
unsigned int hash;
Entry *e;
++++++ blender-2.41-uninitialized_variables.patch ++++++
--- /var/tmp/diff_new_pack.u3It26/_old 2006-10-16 19:15:24.000000000 +0200
+++ /var/tmp/diff_new_pack.u3It26/_new 2006-10-16 19:15:24.000000000 +0200
@@ -1,11 +1,26 @@
---- source/blender/blenkernel/intern/DerivedMesh.c
+Index: source/blender/blenkernel/intern/DerivedMesh.c
+===================================================================
+--- source/blender/blenkernel/intern/DerivedMesh.c.orig
+++ source/blender/blenkernel/intern/DerivedMesh.c
-@@ -2036,7 +2036,7 @@
+@@ -2102,7 +2102,7 @@ float *mesh_get_mapped_verts_nors(Object
+ void writeBobjgz(char *filename, struct Object *ob, int useGlobalCoords, int append, float time)
{
- // const int debugBobjWrite = 0; // now handled by global debug level
char debugStrBuffer[256];
- int wri,i,j;
+ int wri=0,i,j;
float wrf;
gzFile gzf;
DispListMesh *dlm = NULL;
+Index: source/blender/python/api2_2x/NLA.c
+===================================================================
+--- source/blender/python/api2_2x/NLA.c.orig
++++ source/blender/python/api2_2x/NLA.c
+@@ -1324,7 +1324,7 @@ static PyObject *ActionStrips_remove( BP
+ BLI_remlink(&self->ob->nlastrips, strip);
+ MEM_freeN(strip);
+
+- pyobj->strip = NULL;
++ //pyobj->strip = NULL;
+ Py_RETURN_NONE;
+ }
+
++++++ blender-2.42a-buildfix.patch ++++++
Index: config/linux2-config.py
===================================================================
--- config/linux2-config.py.orig
+++ config/linux2-config.py
@@ -1,6 +1,6 @@
LCGDIR = '../lib/linux2'
BF_PYTHON = '/usr'
-BF_PYTHON_VERSION = '2.4'
+BF_PYTHON_VERSION = '2.5'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
@@ -47,7 +47,7 @@ WITH_BF_INTERNATIONAL = 'true'
BF_GETTEXT = '/usr'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
BF_GETTEXT_LIB = 'gettextlib'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/VAR_LIB'
WITH_BF_FTGL = 'true'
BF_FTGL = '#extern/bFTGL'
@@ -93,8 +93,8 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/includ
BF_FREETYPE_LIB = 'freetype'
WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+BF_QUICKTIME = '/usr'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include/lqt'
# enable ffmpeg support
WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
@@ -108,7 +108,7 @@ WITH_BF_STATICOPENGL = 'false'
BF_OPENGL = '/usr'
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIBPATH = '/usr/VAR_LIB'
BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
##
@@ -120,9 +120,9 @@ CXX = 'g++'
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
CPPFLAGS = ['-DXP_UNIX']
-CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing', 'RPMCFLAGS']
REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2', 'RPMCSCFLAGS']
##BF_DEPEND = 'true'
##
##AR = ar
@@ -143,7 +143,7 @@ BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = 'false'
BF_DEBUG = 'false'
-BF_DEBUG_FLAGS = ''
+BF_DEBUG_FLAGS = ['-O2', 'RPMCSCFLAGS', '-g']
BF_BUILDDIR = '../build/linux2'
BF_INSTALLDIR='../install/linux2'
Index: tools/Blender.py
===================================================================
--- tools/Blender.py.orig
+++ tools/Blender.py
@@ -109,7 +109,7 @@ def setup_staticlibs(lenv):
#here libs for static linking
]
libincs = [
- '/usr/lib',
+ '/usr/VAR_LIB',
lenv['BF_PYTHON_LIBPATH'],
lenv['BF_OPENGL_LIBPATH'],
lenv['BF_SDL_LIBPATH'],
Index: extern/solid/examples/Makefile.am
===================================================================
--- extern/solid/examples/Makefile.am.orig
+++ extern/solid/examples/Makefile.am
@@ -7,7 +7,7 @@ gldemo_SOURCES = gldemo.cpp
physics_SOURCES = physics.cpp
mnm_SOURCES = mnm.cpp
-GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXi -lX11
+GLLIBS = -lglut -lGLU -lGL -L/usr/VAR_LIB -lXmu -lXi -lX11
sample_LDADD = ../src/libsolid.la $(QHULL_LIBS)
gldemo_LDADD = ../src/libsolid.la $(QHULL_LIBS) $(GLLIBS)
Index: intern/bsp/test/Makefile
===================================================================
--- intern/bsp/test/Makefile.orig
+++ intern/bsp/test/Makefile
@@ -51,7 +51,7 @@ SLIBS += $(NAN_GHOST)/lib/$(DEBUG_DIR)li
SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
- LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu
+ LLIBS = -L/usr/VAR_LIB -lglut -pthread -lXi -lXmu
endif
all debug:: $(LIBS) $(DIR)/$(DEBUG_DIR)BSPGhostTest
Index: intern/iksolver/test/Makefile
===================================================================
--- intern/iksolver/test/Makefile.orig
+++ intern/iksolver/test/Makefile
@@ -50,7 +50,7 @@ LIBS += $(OCGDIR)/intern/$(LIBNAME)/$(DE
SLIBS += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
- LLIBS = -L/usr/X11R6/lib -lglut -pthread
+ LLIBS = -L/usr/VAR_LIB -lglut -pthread
endif
ifeq ($(OS),$(findstring $(OS), "solaris"))
Index: source/nan_link.mk
===================================================================
--- source/nan_link.mk.orig
+++ source/nan_link.mk
@@ -69,13 +69,13 @@ ifeq ($(OS),darwin)
endif
ifeq ($(OS),freebsd)
- LLIBS = -L/usr/X11R6/lib -lX11 -lXmu -lm -lutil -lz -pthread -lc_r
+ LLIBS = -L/usr/VAR_LIB -lX11 -lXmu -lm -lutil -lz -pthread -lc_r
DADD = -lGL -lGLU
DYNLDFLAGS = -shared $(LDFLAGS)
LOPTS = -Wl,--export-dynamic
ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0"))
COMMENT = "MESA 3.0"
- SADD = /usr/X11R6/lib/libGL.a /usr/X11R6/lib/libGLU.a
+ SADD = /usr/VAR_LIB/libGL.a /usr/X11R6/lib/libGLU.a
LLIBS += -lc
else
endif
@@ -93,13 +93,13 @@ endif
ifeq ($(OS),linux)
ifeq ($(CPU),alpha)
COMMENT = "MESA 3.1"
- LLIBS = -lGL -lGLU -L/usr/X11R6/lib/ -lXmu -lXext -lX11
+ LLIBS = -lGL -lGLU -L/usr/VAR_LIB/ -lXmu -lXext -lX11
LLIBS += -lc -lm -ldl -lutil
LOPTS = -export-dynamic
endif
ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64"))
COMMENT = "MESA 3.1"
- LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
+ LLIBS = -L$(NAN_MESA)/lib -L/usr/VAR_LIB -lXmu -lXext -lX11 -lXi
LLIBS += -lutil -lc -lm -ldl -lpthread
# LLIBS += -L$(NAN_ODE)/lib -lode
LOPTS = -export-dynamic
@@ -108,7 +108,7 @@ ifeq ($(OS),linux)
DYNLDFLAGS = -shared $(LDFLAGS)
endif
ifeq ($(CPU),$(findstring $(CPU), "powerpc sparc64"))
- LLIBS = -L/usr/X11R6/lib/ -lXmu -lXext -lX11 -lc -ldl -lm -lutil
+ LLIBS = -L/usr/VAR_LIB -lXmu -lXext -lX11 -lc -ldl -lm -lutil
DADD = -lGL -lGLU
SADD = /usr/lib/libGL.a /usr/lib/libGLU.a
LOPTS = -export-dynamic
++++++ blender-2.42a-ffmpeg.patch ++++++
Index: config/linux2-config.py
===================================================================
--- config/linux2-config.py.orig
+++ config/linux2-config.py
@@ -97,7 +97,7 @@ BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
# enable ffmpeg support
-WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
+WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
BF_FFMPEG = '/usr'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='$(BF_FFMPEG)/lib'
++++++ blender-2.42a-libtiff.patch ++++++
Index: source/blender/imbuf/intern/dynlibtiff.c
===================================================================
--- source/blender/imbuf/intern/dynlibtiff.c.orig
+++ source/blender/imbuf/intern/dynlibtiff.c
@@ -85,7 +85,11 @@ void libtiff_loadlibtiff(void)
if (libtiff != NULL) return;
libtiff = PIL_dynlib_open("libtiff.dll");
if (libtiff != NULL) return;
- libtiff = PIL_dynlib_open("/usr/lib/libtiff.so");
+ #ifdef __x86_64
+ libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.3");
+ #else
+ libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3");
+ #endif
if (libtiff != NULL) return;
/* OSX has version specific library */
libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3");
Index: source/blender/imbuf/intern/gen_dynlibtiff.py
===================================================================
--- source/blender/imbuf/intern/gen_dynlibtiff.py.orig
+++ source/blender/imbuf/intern/gen_dynlibtiff.py
@@ -127,7 +127,11 @@ void libtiff_loadlibtiff(void)
if (libtiff != NULL) return;
libtiff = PIL_dynlib_open("libtiff.dll");
if (libtiff != NULL) return;
- libtiff = PIL_dynlib_open("/usr/lib/libtiff.so");
+ #ifdef __x86_64
+ libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.3");
+ #else
+ libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3");
+ #endif
if (libtiff != NULL) return;
/* OSX has version specific library */
libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3");
++++++ blender-python64.patch ++++++
Index: source/gameengine/Expressions/ListValue.cpp
===================================================================
--- source/gameengine/Expressions/ListValue.cpp.orig
+++ source/gameengine/Expressions/ListValue.cpp
@@ -163,22 +163,22 @@ listvalue_buffer_concat(PyObject * self,
static PySequenceMethods listvalue_as_sequence = {
- (inquiry)listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/
+ (lenfunc)listvalue_bufferlen,/*sq_length*/
(binaryfunc)listvalue_buffer_concat, /*sq_concat*/
- 0,//(intargfunc)buffer_repeat, /*sq_repeat*/
- (intargfunc)listvalue_buffer_item, /*sq_item*/
- (intintargfunc)listvalue_buffer_slice, /*sq_slice*/
- 0,//(intobjargproc)buffer_ass_item, /*sq_ass_item*/
- 0,//(intintobjargproc)buffer_ass_slice, /*sq_ass_slice*/
+ 0,/*sq_repeat*/
+ (ssizeargfunc)listvalue_buffer_item, /*sq_item*/
+ (ssizessizeargfunc)listvalue_buffer_slice, /*sq_slice*/
+ 0,/*sq_ass_item*/
+ 0,/*sq_ass_slice*/
};
/* Is this one used ? */
static PyMappingMethods instance_as_mapping = {
- (inquiry)listvalue_bufferlen, /*mp_length*/
+ (lenfunc)listvalue_bufferlen, /*mp_length*/
(binaryfunc)listvalue_mapping_subscript, /*mp_subscript*/
- 0,//(objobjargproc)instance_ass_subscript, /*mp_ass_subscript*/
+ 0,/*mp_ass_subscript*/
};
Index: source/gameengine/Expressions/Value.cpp
===================================================================
--- source/gameengine/Expressions/Value.cpp.orig
+++ source/gameengine/Expressions/Value.cpp
@@ -649,8 +649,8 @@ CValue* CValue::ConvertPythonToValue(PyO
CListValue* listval = new CListValue();
bool error = false;
- int i;
- int numitems = PyList_Size(pyobj);
+ Py_ssize_t i;
+ Py_ssize_t numitems = PyList_Size(pyobj);
for (i=0;i