[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33299] trunk/lib/darwin-9.x.universal: OSX 10.5 libs: Python update to 3.1.2.
Damien Plisson
damien.plisson at yahoo.fr
Wed Nov 24 22:24:40 CET 2010
Revision: 33299
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33299
Author: damien78
Date: 2010-11-24 22:24:40 +0100 (Wed, 24 Nov 2010)
Log Message:
-----------
OSX 10.5 libs: Python update to 3.1.2.
Thanks to Jens Verwiebe for making the build and the patch to make the Game Engine build again with it.
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/README
trunk/lib/darwin-9.x.universal/python/include/python3.1/Python.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/abstract.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/bytearrayobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/ceval.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/code.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/datetime.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/descrobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/dictobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/import.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/longintrepr.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/longobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/object.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/objimpl.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/patchlevel.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/py_curses.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pyconfig.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pyctype.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pyerrors.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pymacconfig.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pymath.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pymem.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pyport.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pystate.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/pythonrun.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/setobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/structseq.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/symtable.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/sysmodule.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/token.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/traceback.h
trunk/lib/darwin-9.x.universal/python/include/python3.1/unicodeobject.h
trunk/lib/darwin-9.x.universal/python/lib/python3.1/libpython3.1.a
trunk/lib/darwin-9.x.universal/release/python_i386.zip
trunk/lib/darwin-9.x.universal/release/python_ppc.zip
trunk/lib/darwin-9.x.universal/release/python_ppc64.zip
trunk/lib/darwin-9.x.universal/release/python_x86_64.zip
Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README 2010-11-24 20:56:25 UTC (rev 33298)
+++ trunk/lib/darwin-9.x.universal/README 2010-11-24 21:24:40 UTC (rev 33299)
@@ -9,7 +9,7 @@
jpeg (version 6b)
openal (headers from darwin8, dylibs included in OSX from 10.4)
png (version 1.2.29)
-python (release3.1-maint)
+python (release 3.1.2 release31-maint:85925)
release (python_??.zip)
tiff (version 3.9.2)
@@ -46,16 +46,7 @@
./configure --disable-shared --with-jpeg-include-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/include --with-jpeg-lib-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/lib --with-apple-opengl-framework --build=powerpc-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXX="g++-4.2" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
-Python:
-./configure CC=gcc-4.2 CXX=g++-4.2 CFLAGS="-arch x86_64" CXXFLAGS="-arch x86_64" OBJCFLAGS="-arch x86_64" OBJCXXFLAGS="-arch x86_64" LDFLAGS="-arch x86_64" --enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk --with-universal-archs="all"
-
-
-./configure --enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk --with-universal-archs="all"
-
-
-./configure --enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk --with-universal-archs="64-bit"
-
Libsamplerate:
/Volumes/Daten250GB/bf-blender/LIB_Sources/libsamplerate-0.1.7/build
@@ -147,3 +138,68 @@
patch the OpenCollada Sconstruct file with opencollada/collada_OSXbuild.patch
patch the OpenCollada source files with jesterKing patch: http://code.google.com/p/opencollada/issues/detail?id=117
python scons.py -j 2 RELEASE=1 PCRENATIVE=0 XMLPARSER=libxmlnative NOVALIDATION=1
+
+
+Python:
+
+./configure --with-universal-archs="all"--enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk MACOSX_DEPLOYMENT_TARGET=10.5
+
+Dummy-list for architecture-extract: ( redo for wanted arch simply )
+
+lipo -thin x86_64 _bisect.so -output _bisect.so
+lipo -thin x86_64 _codecs_cn.so -output _codecs_cn.so
+lipo -thin x86_64 _codecs_hk.so -output _codecs_hk.so
+lipo -thin x86_64 _codecs_iso2022.so -output _codecs_iso2022.so
+lipo -thin x86_64 _codecs_jp.so -output _codecs_jp.so
+lipo -thin x86_64 _codecs_kr.so -output _codecs_kr.so
+lipo -thin x86_64 _codecs_tw.so -output _codecs_tw.so
+lipo -thin x86_64 _collections.so -output _collections.so
+lipo -thin x86_64 _csv.so -output _csv.so
+lipo -thin x86_64 _ctypes_test.so -output _ctypes_test.so
+lipo -thin x86_64 _ctypes.so -output _ctypes.so
+lipo -thin x86_64 _curses_panel.so -output _curses_panel.so
+lipo -thin x86_64 _curses.so -output _curses.so
+lipo -thin x86_64 _dbm.so -output _dbm.so
+lipo -thin x86_64 _elementtree.so -output _elementtree.so
+lipo -thin x86_64 _gestalt.so -output _gestalt.so
+lipo -thin x86_64 _hashlib.so -output _hashlib.so
+lipo -thin x86_64 _heapq.so -output _heapq.so
+lipo -thin x86_64 _json.so -output _json.so
+lipo -thin x86_64 _lsprof.so -output _lsprof.so
+lipo -thin x86_64 _multibytecodec.so -output _multibytecodec.so
+lipo -thin x86_64 _multiprocessing.so -output _multiprocessing.so
+lipo -thin x86_64 _pickle.so -output _pickle.so
+lipo -thin x86_64 _random.so -output _random.so
+lipo -thin x86_64 _scproxy.so -output _scproxy.so
+lipo -thin x86_64 _sha256.so -output _sha256.so
+lipo -thin x86_64 _sha512.so -output _sha512.so
+lipo -thin x86_64 _socket.so -output _socket.so
+lipo -thin x86_64 _sqlite3.so -output _sqlite3.so
+lipo -thin x86_64 _ssl.so -output _ssl.so
+lipo -thin x86_64 _struct.so -output _struct.so
+lipo -thin x86_64 _testcapi.so -output _testcapi.so
+lipo -thin x86_64 _tkinter.so -output _tkinter.so
+lipo -thin x86_64 array.so -output array.so
+lipo -thin x86_64 atexit.so -output atexit.so
+lipo -thin x86_64 audioop.so -output audioop.so
+lipo -thin x86_64 binascii.so -output binascii.so
+lipo -thin x86_64 bz2.so -output bz2.so
+lipo -thin x86_64 cmath.so -output cmath.so
+lipo -thin x86_64 crypt.so -output crypt.so
+lipo -thin x86_64 datetime.so -output datetime.so
+lipo -thin x86_64 fcntl.so -output fcntl.so
+lipo -thin x86_64 grp.so -output grp.so
+lipo -thin x86_64 itertools.so -output itertools.so
+lipo -thin x86_64 math.so -output math.so
+lipo -thin x86_64 mmap.so -output mmap.so
+lipo -thin x86_64 nis.so -output nis.so
+lipo -thin x86_64 operator.so -output operator.so
+lipo -thin x86_64 parser.so -output parser.so
+lipo -thin x86_64 pyexpat.so -output pyexpat.so
+lipo -thin x86_64 resource.so -output resource.so
+lipo -thin x86_64 select.so -output select.so
+lipo -thin x86_64 syslog.so -output syslog.so
+lipo -thin x86_64 termios.so -output termios.so
+lipo -thin x86_64 time.so -output time.so
+lipo -thin x86_64 unicodedata.so -output unicodedata.so
+lipo -thin x86_64 zlib.so -output zlib.so
\ No newline at end of file
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.1/Python.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.1/Python.h 2010-11-24 20:56:25 UTC (rev 33298)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.1/Python.h 2010-11-24 21:24:40 UTC (rev 33299)
@@ -126,13 +126,8 @@
/* _Py_Mangle is defined in compile.c */
PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
-/* Convert a possibly signed character to a nonnegative int */
-/* XXX This assumes characters are 8 bits wide */
-#ifdef __CHAR_UNSIGNED__
-#define Py_CHARMASK(c) (c)
-#else
+/* Argument must be a char or an int in [-128, 127] or [0, 255]. */
#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff))
-#endif
#include "pyfpe.h"
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.1/abstract.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.1/abstract.h 2010-11-24 20:56:25 UTC (rev 33298)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.1/abstract.h 2010-11-24 21:24:40 UTC (rev 33299)
@@ -32,7 +32,7 @@
If the programmer wants to get an item from another type of object
that provides sequence behavior, there is no clear way to do it
- correctly.
+ correctly.
The persistent programmer may peruse object.h and find that the
_typeobject structure provides a means of invoking up to (currently
@@ -44,7 +44,7 @@
Also, certain semantics, especially memory management semantics, may
differ by the type of object being used. Unfortunately, these
semantics are not clearly described in the current include files.
- An abstract interface providing more consistent semantics is needed.
+ An abstract interface providing more consistent semantics is needed.
Proposal
@@ -77,7 +77,7 @@
Python distributions.
From the point of view of Python accessing services provided by C
- modules:
+ modules:
- "Python module interface": this interface consist of the basic
routines used to define modules and their members. Most of the
@@ -133,11 +133,11 @@
int PyObject_Print(PyObject *o, FILE *fp, int flags);
- Print an object, o, on file, fp. Returns -1 on
- error. The flags argument is used to enable certain printing
- options. The only option currently supported is Py_Print_RAW.
+ Print an object, o, on file, fp. Returns -1 on
+ error. The flags argument is used to enable certain printing
+ options. The only option currently supported is Py_Print_RAW.
- (What should be said about Py_Print_RAW?)
+ (What should be said about Py_Print_RAW?)
*/
@@ -145,11 +145,11 @@
int PyObject_HasAttrString(PyObject *o, char *attr_name);
- Returns 1 if o has the attribute attr_name, and 0 otherwise.
- This is equivalent to the Python expression:
- hasattr(o,attr_name).
+ Returns 1 if o has the attribute attr_name, and 0 otherwise.
+ This is equivalent to the Python expression:
+ hasattr(o,attr_name).
- This function always succeeds.
+ This function always succeeds.
*/
@@ -157,9 +157,9 @@
PyObject* PyObject_GetAttrString(PyObject *o, char *attr_name);
- Retrieve an attributed named attr_name form object o.
- Returns the attribute value on success, or NULL on failure.
- This is the equivalent of the Python expression: o.attr_name.
+ Retrieve an attributed named attr_name form object o.
+ Returns the attribute value on success, or NULL on failure.
+ This is the equivalent of the Python expression: o.attr_name.
*/
@@ -167,11 +167,11 @@
int PyObject_HasAttr(PyObject *o, PyObject *attr_name);
- Returns 1 if o has the attribute attr_name, and 0 otherwise.
- This is equivalent to the Python expression:
- hasattr(o,attr_name).
+ Returns 1 if o has the attribute attr_name, and 0 otherwise.
+ This is equivalent to the Python expression:
+ hasattr(o,attr_name).
- This function always succeeds.
+ This function always succeeds.
*/
@@ -179,9 +179,9 @@
PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name);
- Retrieve an attributed named attr_name form object o.
- Returns the attribute value on success, or NULL on failure.
- This is the equivalent of the Python expression: o.attr_name.
+ Retrieve an attributed named attr_name form object o.
+ Returns the attribute value on success, or NULL on failure.
+ This is the equivalent of the Python expression: o.attr_name.
*/
@@ -190,9 +190,9 @@
int PyObject_SetAttrString(PyObject *o, char *attr_name, PyObject *v);
- Set the value of the attribute named attr_name, for object o,
- to the value, v. Returns -1 on failure. This is
- the equivalent of the Python statement: o.attr_name=v.
+ Set the value of the attribute named attr_name, for object o,
+ to the value, v. Returns -1 on failure. This is
+ the equivalent of the Python statement: o.attr_name=v.
*/
@@ -200,9 +200,9 @@
int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
- Set the value of the attribute named attr_name, for object o,
- to the value, v. Returns -1 on failure. This is
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list