[blender: 3/3] Add patch for python 3.2
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Jan 18 19:42:37 UTC 2011
commit a23897eddbe4228bad0f0da1cb43c372eaf33f02
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Sun Jan 16 23:00:07 2011 +0100
Add patch for python 3.2
blender-2.56-ext.patch | 24 +++++++++++++++++++
blender-2.56-py32.patch | 12 ++++++++++
blender-2.49.config => blender-2.56.config | 6 ++--
blender.spec | 34 ++++++++++-----------------
4 files changed, 52 insertions(+), 24 deletions(-)
---
diff --git a/blender-2.56-ext.patch b/blender-2.56-ext.patch
new file mode 100644
index 0000000..dc6a48b
--- /dev/null
+++ b/blender-2.56-ext.patch
@@ -0,0 +1,24 @@
+diff -up blender-2.56-beta-source/extern/SConscript.ext blender-2.56-beta-source/extern/SConscript
+--- blender-2.56-beta-source/extern/SConscript.ext 2010-08-29 22:52:05.000000000 +0200
++++ blender-2.56-beta-source/extern/SConscript 2011-01-16 22:15:09.530810000 +0100
+@@ -2,8 +2,6 @@
+
+ Import('env')
+
+-SConscript(['glew/SConscript'])
+-
+ if env['WITH_BF_BULLET']:
+ SConscript(['bullet2/src/SConscript'])
+
+diff -up blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h.ext blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h
+--- blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h.ext 2010-03-06 14:43:47.000000000 +0100
++++ blender-2.56-beta-source/source/blender/editors/include/BIF_gl.h 2011-01-16 22:15:09.531810000 +0100
+@@ -31,7 +31,7 @@
+ #ifndef BIF_GL_H
+ #define BIF_GL_H
+
+-#include "../../../../extern/glew/include/GL/glew.h"
++#include <GL/glew.h>
+
+ /*
+ * these should be phased out. cpack should be replaced in
diff --git a/blender-2.56-py32.patch b/blender-2.56-py32.patch
new file mode 100644
index 0000000..4b2f506
--- /dev/null
+++ b/blender-2.56-py32.patch
@@ -0,0 +1,12 @@
+diff -up blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp.py32 blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp
+--- blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp.py32 2011-01-16 22:44:18.706809999 +0100
++++ blender-2.56-beta-source/source/gameengine/GameLogic/SCA_PythonController.cpp 2011-01-16 22:44:54.668810004 +0100
+@@ -408,7 +408,7 @@ void SCA_PythonController::Trigger(SCA_L
+ */
+
+ excdict= PyDict_Copy(m_pythondictionary);
+- resultobj = PyEval_EvalCode((PyCodeObject*)m_bytecode, excdict, excdict);
++ resultobj = PyEval_EvalCode((PyObject*)m_bytecode, excdict, excdict);
+ /* PyRun_SimpleString(m_scriptText.Ptr()); */
+ break;
+ }
diff --git a/blender-2.49.config b/blender-2.56.config
similarity index 96%
rename from blender-2.49.config
rename to blender-2.56.config
index 0fd51fb..4b64608 100644
--- a/blender-2.49.config
+++ b/blender-2.56.config
@@ -1,9 +1,9 @@
LCGDIR = 'lib/linux2'
BF_PYTHON = '/usr'
BF_PYTHON_VERSION = '@PYVER@'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}mu'
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'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}mu' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
WITH_BF_OPENAL = 'true'
@@ -119,7 +119,7 @@ CXX = 'g++'
##ifeq ($CPU),alpha)
## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
-CFLAGS += '${RPM_OPT_FLAGS}'
+# CFLAGS += '${RPM_OPT_FLAGS}'
# CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
diff --git a/blender.spec b/blender.spec
index f6fe313..4aab5f1 100644
--- a/blender.spec
+++ b/blender.spec
@@ -5,8 +5,8 @@
%global fontname blender
Name: blender
-Version: 2.55
-Release: 0.1%{?dist}
+Version: 2.56
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -15,19 +15,19 @@ License: GPLv2
URL: http://www.blender.org
# This is a customized source package without bundled dependencies
# See blender-repack.sh
-Source0: blender-2.54-beta.tar.gz
+Source0: http://download.blender.org/source/blender-%{version}-beta.tar.gz
Source5: blender.xml
Source6: blender-wrapper
Source7: blenderplayer-wraper
-Source8: blender-2.49.config
+Source8: blender-2.56.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.54-glew.patch
-Patch5: blender-2.54-desktop.patch
+Patch4: blender-2.56-ext.patch
+patch5: blender-2.56-py32.patch
# Both patches are forwarded to upstream via email
#Patch100: blender-2.46rc3-cve-2008-1103-1.patch
@@ -93,12 +93,12 @@ Professionals and novices can easily and inexpensively publish stand-alone,
secure, multi-platform content to the web, CD-ROMs, and other media.
%prep
-%setup -q -n %{name}-%{version}-beta
+%setup -q -n %{name}-%{version}-beta-source
# %patch1 -p1 -b .org
%patch2 -p1 -b .bid
# %patch3 -p1 -b .uid
-%patch4 -p1 -b .glewp
-%patch5 -p1 -b .dsk
+%patch4 -p1 -b .ext
+%patch5 -p1 -b .py32
# %patch100 -p1 -b .cve
# %patch101 -p1
@@ -122,11 +122,8 @@ PYVER=$(%{__python3} -c "import sys ; print(sys.version[:3])")
sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
<%{SOURCE8} >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 # WITH_BF_PLAYER=false BF_QUIET=0
+scons BF_QUIET=0
install -d release/plugins/include
install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
@@ -217,9 +214,10 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
fi || :
-%files -f %{name}.lang
+%files
%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
@@ -228,12 +226,6 @@ fi || :
%{blenderarch}/
%{_datadir}/mime/packages/blender.xml
-%files -n blenderplayer
-%doc COPYING
-%defattr(-,root,root,-)
-%{_bindir}/blenderplayer
-%{_bindir}/blenderplayer.bin
-
%changelog
* Wed Jan 12 2011 Rex Dieter <rdieter at fedoraproject.org> - 2.49b-11
- rebuild (openjpeg)
More information about the scm-commits
mailing list