[blender/f15/master: 1/2] Revert to the blender-2.49b branch
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Apr 12 17:36:24 UTC 2011
commit d7c69b51d1b6badafb8c2a0431119289e02fe166
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Apr 6 22:17:24 2011 +0200
Revert to the blender-2.49b branch
blender-2.56.config => blender-2.49.config | 15 +-
blender-2.49b-gcc46.patch | 92 +++++
blender-2.56-ext.patch | 604 ----------------------------
blender-2.56-gcc46.patch | 110 -----
blender-2.56-py32.patch | 12 -
blender.spec | 106 +++---
sources | 2 +-
7 files changed, 146 insertions(+), 795 deletions(-)
---
diff --git a/blender-2.56.config b/blender-2.49.config
similarity index 93%
rename from blender-2.56.config
rename to blender-2.49.config
index 582011e..b99b8a1 100644
--- a/blender-2.56.config
+++ b/blender-2.49.config
@@ -1,13 +1,9 @@
-import os
-env = os.environ
-rpmopt = env["RPM_OPT_FLAGS"].split(' ')
-
LCGDIR = 'lib/linux2'
BF_PYTHON = '/usr'
BF_PYTHON_VERSION = '@PYVER@'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}mu'
+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}mu' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
WITH_BF_OPENAL = 'true'
@@ -50,7 +46,7 @@ WITH_BF_INTERNATIONAL = 'true'
BF_GETTEXT = '/usr'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'qhull'
+BF_GETTEXT_LIB = 'gettextlib qhull'
BF_GETTEXT_LIBPATH = '@LIB@'
WITH_BF_FTGL = 'true'
@@ -123,14 +119,13 @@ CXX = 'g++'
##ifeq ($CPU),alpha)
## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
-# CFLAGS += '${RPM_OPT_FLAGS}'
-CFLAGS += rpmopt
+CFLAGS += '${RPM_OPT_FLAGS}'
# CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-CCFLAGS = rpmopt
CPPFLAGS = ['-DXP_UNIX']
# CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CXXFLAGS = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
##BF_DEPEND = 'true'
diff --git a/blender-2.49b-gcc46.patch b/blender-2.49b-gcc46.patch
new file mode 100644
index 0000000..88ff1a8
--- /dev/null
+++ b/blender-2.49b-gcc46.patch
@@ -0,0 +1,92 @@
+diff -Naur blender-2.49b/extern/bullet2/src/BulletSoftBody/btSoftBody.h blender-2.49b-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h
+--- blender-2.49b/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2009-09-01 12:23:19.000000000 -0300
++++ blender-2.49b-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2011-02-28 16:44:55.438864576 -0300
+@@ -177,6 +177,7 @@
+ /* Material */
+ struct Material : Element
+ {
++ Material (){}
+ btScalar m_kLST; // Linear stiffness coefficient [0,1]
+ btScalar m_kAST; // Area/Angular stiffness coefficient [0,1]
+ btScalar m_kVST; // Volume stiffness coefficient [0,1]
+@@ -191,6 +192,7 @@
+ /* Node */
+ struct Node : Feature
+ {
++ Node (){}
+ btVector3 m_x; // Position
+ btVector3 m_q; // Previous step position
+ btVector3 m_v; // Velocity
+@@ -204,6 +206,7 @@
+ /* Link */
+ struct Link : Feature
+ {
++ Link (){}
+ Node* m_n[2]; // Node pointers
+ btScalar m_rl; // Rest length
+ int m_bbending:1; // Bending link
+@@ -215,6 +218,7 @@
+ /* Face */
+ struct Face : Feature
+ {
++ Face (){}
+ Node* m_n[3]; // Node pointers
+ btVector3 m_normal; // Normal
+ btScalar m_ra; // Rest area
+@@ -255,6 +259,7 @@
+ /* Note */
+ struct Note : Element
+ {
++ Note (){}
+ const char* m_text; // Text
+ btVector3 m_offset; // Offset
+ int m_rank; // Rank
+diff -Naur blender-2.49b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h blender-2.49b-new/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
+--- blender-2.49b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h 2009-09-01 12:23:19.000000000 -0300
++++ blender-2.49b-new/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h 2011-02-28 16:46:09.816208038 -0300
+@@ -171,8 +171,12 @@
+ template <typename T>
+ static inline void ZeroInitialize(T& value)
+ {
++#if 1
+ static const T zerodummy;
+ value=zerodummy;
++#else
++ memset(&value,0,sizeof(T));
++#endif
+ }
+ //
+ template <typename T>
+diff -Naur blender-2.49b/intern/memutil/MEM_Allocator.h blender-2.49b-new/intern/memutil/MEM_Allocator.h
+--- blender-2.49b/intern/memutil/MEM_Allocator.h 2009-09-01 12:20:41.000000000 -0300
++++ blender-2.49b-new/intern/memutil/MEM_Allocator.h 2011-02-28 16:41:28.968962712 -0300
+@@ -26,6 +26,7 @@
+
+ #include "guardedalloc/MEM_guardedalloc.h"
+ #include "guardedalloc/BLO_sys_types.h"
++#include <cstddef>
+
+ #ifdef _MSC_VER
+ #if _MSC_VER < 1300 // 1200 == VC++ 6.0 according to boost
+diff -Naur blender-2.49b/source/gameengine/Expressions/PyObjectPlus.h blender-2.49b-new/source/gameengine/Expressions/PyObjectPlus.h
+--- blender-2.49b/source/gameengine/Expressions/PyObjectPlus.h 2009-09-01 12:20:45.000000000 -0300
++++ blender-2.49b-new/source/gameengine/Expressions/PyObjectPlus.h 2011-02-28 16:41:28.969962609 -0300
+@@ -40,6 +40,7 @@
+ #include "STR_String.h"
+ #include "MT_Vector3.h"
+ #include "SG_QList.h"
++#include <cstddef>
+
+ /*------------------------------
+ * Python defines
+diff -Naur blender-2.49b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp blender-2.49b-new/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
+--- blender-2.49b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp 2009-09-01 12:20:46.000000000 -0300
++++ blender-2.49b-new/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp 2011-02-28 16:41:28.969962609 -0300
+@@ -28,6 +28,7 @@
+ */
+ #include "DummyPhysicsEnvironment.h"
+ #include "PHY_IMotionState.h"
++#include <cstddef>
+
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
diff --git a/blender.spec b/blender.spec
index bcdf74c..d9daf98 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,12 +1,12 @@
%global blenderlib %{_datadir}/blender
%global blenderarch %{_libdir}/blender
-%global __python %{__python3}
%global fontname blender
Name: blender
-Version: 2.56
-Release: 7%{?dist}
+Epoch: 1
+Version: 2.49b
+Release: 14%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -15,20 +15,18 @@ License: GPLv2
URL: http://www.blender.org
# This is a customized source package without bundled dependencies
# See blender-repack.sh
-Source0: http://download.blender.org/source/blender-%{version}-beta.tar.gz
+Source0: blender-%{version}-repack.tar.bz2
Source5: blender.xml
Source6: blender-wrapper
Source7: blenderplayer-wraper
-Source8: blender-2.56.config
+Source8: blender-2.49.config
Source100: blender-repack.sh
Patch1: blender-2.49-scons.patch
Patch2: blender-2.44-bid.patch
Patch3: blender-2.49b-uid.patch
-Patch4: blender-2.56-ext.patch
-Patch5: blender-2.56-py32.patch
-Patch6: blender-2.56-gcc46.patch
+Patch4: blender-2.49b-gcc46.patch
# Both patches are forwarded to upstream via email
#Patch100: blender-2.46rc3-cve-2008-1103-1.patch
@@ -48,7 +46,7 @@ BuildRequires: libtool
BuildRequires: libvorbis-devel
BuildRequires: freealut-devel
BuildRequires: openssl-devel
-BuildRequires: python3-devel
+BuildRequires: python-devel
BuildRequires: scons
BuildRequires: SDL-devel
BuildRequires: zlib-devel
@@ -61,7 +59,6 @@ BuildRequires: freetype-devel
BuildRequires: OpenEXR-devel
BuildRequires: glew-devel
-BuildRequires: libsamplerate-devel
BuildRequires: fftw-devel
BuildRequires: ftgl-devel
BuildRequires: ode-devel
@@ -93,6 +90,8 @@ animation, rendering and post-production to interactive creation and playback.
Professionals and novices can easily and inexpensively publish stand-alone,
secure, multi-platform content to the web, CD-ROMs, and other media.
+
+
%package -n blenderplayer
Summary: Standalone blender player
Group: Applications/Multimedia
@@ -102,21 +101,21 @@ This package contains a stand alone release of the blender player.
You will need this package to play games which are based on the
Blender Game Engine.
+
+
%prep
-%setup -q -n %{name}-%{version}-beta-source
-# %patch1 -p1 -b .org
+%setup -q
+%patch1 -p1 -b .org
%patch2 -p1 -b .bid
-# %patch3 -p1 -b .uid
-%patch4 -p1 -b .ext
-%patch5 -p1 -b .py32
-%patch6 -p1 -b .gcc46
+%patch3 -p1 -b .uid
+%patch4 -p1 -b .gcc64
-# %patch100 -p1 -b .cve
+%patch100 -p1 -b .cve
# %patch101 -p1
# No executable or shared library outside the gettext package is
# supposed to link against libgettextlib or libgettextsrc.
-sed -i -e"s,gettextlib,,g" build_files/scons/config/linux2-config.py
+sed -i -e"s,gettextlib,,g" config/linux2-config.py
# binreloc is not a part of fedora
rm -rf extern/ffmpeg
@@ -132,7 +131,7 @@ rm -rf extern/qhull
rm -rf extern/make
rm -rf extern/verse
-PYVER=$(%{__python3} -c "import sys ; print(sys.version[:3])")
+PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
<%{SOURCE8} >user-config.py
@@ -141,12 +140,11 @@ sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
# supposed to link against libgettextlib or libgettextsrc.
sed -i -e"s,gettextlib,,g" user-config.py
+iconv -f iso-8859-1 -t utf-8 doc/bf-members.txt -o doc/bf-members.txt.utf8
+mv doc/bf-members.txt.utf8 doc/bf-members.txt
+
%build
-scons blenderplayer \
-%ifnarch %{ix86} x86_64
- WITH_BF_RAYOPTIMIZATION=False \
-%endif
- BF_QUIET=0
+scons %{?_smp_mflags} blenderplayer BF_QUIET=0
install -d release/plugins/include
install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
@@ -183,14 +181,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/textu
install -pm 755 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/sequence
install -pm 755 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/texture
-# find bin/.blender/locale -name '.svn' -exec rm -f {} ';'
+find bin/.blender/locale -name '.svn' -exec rm -f {} ';'
-# cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
+cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts
install -pm 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib}
-# install -pm 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib}
+install -pm 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib}
#
# Create link to DejaVu-Sans
@@ -213,9 +211,11 @@ desktop-file-install --vendor fedora \
release/freedesktop/blender.desktop
#Fix perm
-#chmod +x ${RPM_BUILD_ROOT}%{blenderlib}/scripts/bpymodules/blend2renderinfo.py
+chmod +x ${RPM_BUILD_ROOT}%{blenderlib}/scripts/bpymodules/blend2renderinfo.py
+
+%find_lang %{name}
+
-# %find_lang %{name}
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -228,6 +228,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
fi
%{_bindir}/update-desktop-database %{_datadir}/applications || :
+
%postun
%{_bindir}/update-mime-database %{_datadir}/mime
%{_bindir}/update-desktop-database %{_datadir}/applications
@@ -236,10 +237,10 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi || :
-%files
+
+%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc COPYING
-# README doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt
+%doc COPYING README doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt
%{_bindir}/blender
%{_bindir}/blender.bin
%{_datadir}/applications/fedora-blender.desktop
@@ -249,38 +250,27 @@ fi || :
%{_datadir}/mime/packages/blender.xml
%files -n blenderplayer
-%defattr(-,root,root,-)
%doc COPYING
+%defattr(-,root,root,-)
%{_bindir}/blenderplayer
%{_bindir}/blenderplayer.bin
%changelog
-* Tue Feb 08 2011 Paulo Roma <roma at lcg.ufrj.br> - 2.56-7
-- Rebuilt without linking to libgettextlib (bugzilla #650471).
-- Applied gcc46 patch
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.56-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Apr 7 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.49b-14
+- Revert to the blender-2.49b branch
+- Increase Epoch to allow downgrade
+- Add gcc-46 patch
-* Wed Jan 19 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.56-5
-- Remove ref to #extern/glew/include from all scons files
+* Mon Apr 4 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-13
+- Largefile support on 32-bit again (#685022)
-* Wed Jan 19 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.56-4
-- Readd blenderplayer subpackage
-
-* Wed Jan 19 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.56-3
-- Fix RPM_OPT_FLAGS honour issue
-
-* Wed Jan 19 2011 Dan Horák <dan[at]danny.cz> 2.56-2
-- use SSE optimization only on x86 platforms
-
-* Wed Jan 12 2011 Rex Dieter <rdieter at fedoraproject.org> 2.49b-11
-- rebuild (openjpeg)
+* Mon Feb 07 2011 Paulo Roma <roma at lcg.ufrj.br> - 2.49b-11
+- Rebuilt without linking to libgettextlib (bugzilla #650471).
-* Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> 2.49b-10
+* Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> - 2.49b-10
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-* Mon Jun 21 2010 Nicolas Chauvet <kwizart at gmail.com> 2.49b-9
+* Mon Jun 21 2010 Nicolas Chauvet <kwizart at gmail.com> - 2.49b-9
- Rebuild for gettext
* Wed May 26 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-8
@@ -317,16 +307,16 @@ fi || :
* Mon Aug 3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-4
- Rebuild for python-2.6.2
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.49a-3
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.49a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Mon Jul 6 2009 kwizart < kwizart at gmail.com > 2.49a-2
+* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 2.49a-2
- Fix perm on blend2renderinfo.py - raised by #506957
-* Fri Jun 19 2009 kwizart < kwizart at gmail.com > 2.49a-1
+* Fri Jun 19 2009 kwizart < kwizart at gmail.com > - 2.49a-1
- Update to 2.49a
-* Fri Jun 19 2009 kwizart < kwizart at gmail.com > 2.49-6
+* Fri Jun 19 2009 kwizart < kwizart at gmail.com > - 2.49-6
- Update blender-wrapper script.
- Repackage the sources archive.
- Remove deprecated import/export-3ds-0.7.py
diff --git a/sources b/sources
index b48040e..bd97074 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d853bbd7bf17f3390addbc2c7455cd3 blender-2.56-beta.tar.gz
+8537ec34afbd72ea517843efdc4b0cae blender-2.49b-repack.tar.bz2
More information about the scm-commits
mailing list