forked from pool/python-opengl
This commit is contained in:
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.osc
|
||||
3
PyOpenGL-2.0.1.09.tar.bz2
Normal file
3
PyOpenGL-2.0.1.09.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:42d3cf45ca70c4602c876d0b1dc0d8dfa3b46f27e734eb833e4dbeb87b0dc136
|
||||
size 1405718
|
||||
533
python-opengl-2.0.1.09-pep353.patch
Normal file
533
python-opengl-2.0.1.09-pep353.patch
Normal file
@@ -0,0 +1,533 @@
|
||||
--- interface/simple_typemaps.inc
|
||||
+++ interface/simple_typemaps.inc
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
%typemap(python, in) const void *buffer
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if ($input == Py_None)
|
||||
{
|
||||
--- src/config.h
|
||||
+++ src/config.h
|
||||
@@ -6,7 +6,7 @@
|
||||
#endif
|
||||
|
||||
#if PY_VERSION_HEX < 0x02000000
|
||||
-extern int PyString_AsStringAndSize(PyObject *obj, char **s, int *len);
|
||||
+extern Py_ssize_t PyString_AsStringAndSize(PyObject *obj, char **s, int *len);
|
||||
|
||||
/* Python 1.5 doesn't define these and Python 1.6 defines buggy ones */
|
||||
#undef PyMem_New
|
||||
--- src/interface/GL.ARB.texture_compression.0103.inc
|
||||
+++ src/interface/GL.ARB.texture_compression.0103.inc
|
||||
@@ -999,7 +999,7 @@
|
||||
arg3 = (GLenum) PyInt_AsLong(obj2);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj7 == Py_None)
|
||||
{
|
||||
@@ -1046,7 +1046,7 @@
|
||||
arg3 = (GLenum) PyInt_AsLong(obj2);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
@@ -1092,7 +1092,7 @@
|
||||
arg3 = (GLenum) PyInt_AsLong(obj2);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
@@ -1142,7 +1142,7 @@
|
||||
arg9 = (GLenum) PyInt_AsLong(obj8);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj9 == Py_None)
|
||||
{
|
||||
@@ -1190,7 +1190,7 @@
|
||||
arg7 = (GLenum) PyInt_AsLong(obj6);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj7 == Py_None)
|
||||
{
|
||||
@@ -1233,7 +1233,7 @@
|
||||
arg1 = (GLenum) PyInt_AsLong(obj0);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.EXT.color_table.0120.inc
|
||||
+++ src/interface/GL.EXT.color_table.0120.inc
|
||||
@@ -1037,7 +1037,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.EXT.draw_range_elements.0100.inc
|
||||
+++ src/interface/GL.EXT.draw_range_elements.0100.inc
|
||||
@@ -949,7 +949,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.EXT.subtexture.0111.inc
|
||||
+++ src/interface/GL.EXT.subtexture.0111.inc
|
||||
@@ -997,7 +997,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
@@ -1337,7 +1337,7 @@
|
||||
arg8 = (GLenum) PyInt_AsLong(obj7);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj8 == Py_None)
|
||||
{
|
||||
@@ -1728,7 +1728,7 @@
|
||||
arg10 = (GLenum) PyInt_AsLong(obj9);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj10 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.EXT.texture3D.0116.inc
|
||||
+++ src/interface/GL.EXT.texture3D.0116.inc
|
||||
@@ -967,7 +967,7 @@
|
||||
arg9 = (GLenum) PyInt_AsLong(obj8);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj9 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.GL__init___.0100.inc
|
||||
+++ src/interface/GL.GL__init___.0100.inc
|
||||
@@ -6242,7 +6242,7 @@
|
||||
arg4 = (GLenum) PyInt_AsLong(obj3);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj4 == Py_None)
|
||||
{
|
||||
@@ -8923,7 +8923,7 @@
|
||||
|
||||
if(!PyArg_ParseTuple(args,(char *)"O:glPolygonStipple",&obj0)) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj0 == Py_None)
|
||||
{
|
||||
@@ -10759,7 +10759,7 @@
|
||||
arg7 = (GLenum) PyInt_AsLong(obj6);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj7 == Py_None)
|
||||
{
|
||||
@@ -11106,7 +11106,7 @@
|
||||
arg8 = (GLenum) PyInt_AsLong(obj7);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj8 == Py_None)
|
||||
{
|
||||
@@ -11607,7 +11607,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
@@ -11947,7 +11947,7 @@
|
||||
arg8 = (GLenum) PyInt_AsLong(obj7);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj8 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.GL__init___.0101.inc
|
||||
+++ src/interface/GL.GL__init___.0101.inc
|
||||
@@ -6779,7 +6779,7 @@
|
||||
arg3 = (GLenum) PyInt_AsLong(obj2);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj3 == Py_None)
|
||||
{
|
||||
@@ -6926,7 +6926,7 @@
|
||||
arg4 = (GLenum) PyInt_AsLong(obj3);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj4 == Py_None)
|
||||
{
|
||||
@@ -10050,7 +10050,7 @@
|
||||
|
||||
if(!PyArg_ParseTuple(args,(char *)"O:glPolygonStipple",&obj0)) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj0 == Py_None)
|
||||
{
|
||||
@@ -12082,7 +12082,7 @@
|
||||
arg7 = (GLenum) PyInt_AsLong(obj6);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj7 == Py_None)
|
||||
{
|
||||
@@ -12429,7 +12429,7 @@
|
||||
arg8 = (GLenum) PyInt_AsLong(obj7);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj8 == Py_None)
|
||||
{
|
||||
@@ -12930,7 +12930,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
@@ -13270,7 +13270,7 @@
|
||||
arg8 = (GLenum) PyInt_AsLong(obj7);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj8 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.SGI.color_table.0120.inc
|
||||
+++ src/interface/GL.SGI.color_table.0120.inc
|
||||
@@ -1037,7 +1037,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
--- src/interface/GL.SGIS.texture4D.0119.inc
|
||||
+++ src/interface/GL.SGIS.texture4D.0119.inc
|
||||
@@ -1014,7 +1014,7 @@
|
||||
arg10 = (GLenum) PyInt_AsLong(obj9);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj10 == Py_None)
|
||||
{
|
||||
@@ -1491,7 +1491,7 @@
|
||||
arg12 = (GLenum) PyInt_AsLong(obj11);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj12 == Py_None)
|
||||
{
|
||||
--- src/interface/GLU.GLU__init___.0100.inc
|
||||
+++ src/interface/GLU.GLU__init___.0100.inc
|
||||
@@ -2572,7 +2572,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
@@ -2927,7 +2927,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
--- src/interface/GLU.GLU__init___.0101.inc
|
||||
+++ src/interface/GLU.GLU__init___.0101.inc
|
||||
@@ -2600,7 +2600,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
@@ -2955,7 +2955,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
--- src/interface/GLU.GLU__init___.0102.inc
|
||||
+++ src/interface/GLU.GLU__init___.0102.inc
|
||||
@@ -2626,7 +2626,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
@@ -2981,7 +2981,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
--- src/interface/GLU.GLU__init___.0103.inc
|
||||
+++ src/interface/GLU.GLU__init___.0103.inc
|
||||
@@ -2906,7 +2906,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj5 == Py_None)
|
||||
{
|
||||
@@ -3261,7 +3261,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj6 == Py_None)
|
||||
{
|
||||
@@ -3659,7 +3659,7 @@
|
||||
arg7 = (GLenum) PyInt_AsLong(obj6);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj7 == Py_None)
|
||||
{
|
||||
@@ -4100,7 +4100,7 @@
|
||||
arg5 = (GLenum) PyInt_AsLong(obj4);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj8 == Py_None)
|
||||
{
|
||||
@@ -4479,7 +4479,7 @@
|
||||
arg6 = (GLenum) PyInt_AsLong(obj5);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj9 == Py_None)
|
||||
{
|
||||
@@ -4901,7 +4901,7 @@
|
||||
arg7 = (GLenum) PyInt_AsLong(obj6);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
PyObject* str;
|
||||
if (obj10 == Py_None)
|
||||
{
|
||||
--- src/interface_util/interface_util.c
|
||||
+++ src/interface_util/interface_util.c
|
||||
@@ -5,10 +5,10 @@
|
||||
#endif
|
||||
|
||||
#define _PyTuple_From(NAME, BASE, PY_OBJECT)\
|
||||
-PyObject* _PyTuple_From##NAME(int len, BASE* data)\
|
||||
+PyObject* _PyTuple_From##NAME(Py_ssize_t len, BASE* data)\
|
||||
{\
|
||||
PyObject* result;\
|
||||
- int i;\
|
||||
+ Py_ssize_t i;\
|
||||
\
|
||||
switch (len)\
|
||||
{\
|
||||
@@ -44,10 +44,10 @@
|
||||
|
||||
|
||||
#define STRING_PyObject_From(PREFIX, NAME, BASE)\
|
||||
-PyObject* __PyObject_From##NAME(int nd, int* dims, BASE* data)\
|
||||
+PyObject* __PyObject_From##NAME(Py_ssize_t nd, int* dims, BASE* data)\
|
||||
{\
|
||||
PyObject *result;\
|
||||
- int i, l;\
|
||||
+ Py_ssize_t i, l;\
|
||||
\
|
||||
if (nd > 1)\
|
||||
{\
|
||||
@@ -60,7 +60,7 @@
|
||||
return result;\
|
||||
}\
|
||||
\
|
||||
-PyObject* PREFIX##PyObject_From##NAME(int nd, int* dims, BASE* data, int own)\
|
||||
+PyObject* PREFIX##PyObject_From##NAME(Py_ssize_t nd, int* dims, BASE* data, int own)\
|
||||
{\
|
||||
PyObject* result = __PyObject_From##NAME(nd, dims, data);\
|
||||
if (own) PyMem_Del(data);\
|
||||
@@ -69,10 +69,10 @@
|
||||
|
||||
|
||||
#define _PyObject_From(PREFIX, NAME, BASE, PY_OBJECT)\
|
||||
-PyObject* __PyObject_From##NAME(int nd, int* dims, BASE* data)\
|
||||
+PyObject* __PyObject_From##NAME(Py_ssize_t nd, int* dims, BASE* data)\
|
||||
{\
|
||||
PyObject *result;\
|
||||
- int i, l;\
|
||||
+ Py_ssize_t i, l;\
|
||||
\
|
||||
if (nd)\
|
||||
{\
|
||||
@@ -87,7 +87,7 @@
|
||||
return result;\
|
||||
}\
|
||||
\
|
||||
-PyObject* PREFIX##PyObject_From##NAME(int nd, int* dims, BASE* data, int own)\
|
||||
+PyObject* PREFIX##PyObject_From##NAME(Py_ssize_t nd, int* dims, BASE* data, int own)\
|
||||
{\
|
||||
PyObject* result = __PyObject_From##NAME(nd, dims, data);\
|
||||
if (own) PyMem_Del(data);\
|
||||
@@ -95,12 +95,12 @@
|
||||
}
|
||||
|
||||
#define NUMERIC_PyObject_From(NAME, BASE, TYPECODE)\
|
||||
-PyObject* _PyObject_From##NAME(int nd, int* dims, BASE* data, int own)\
|
||||
+PyObject* _PyObject_From##NAME(Py_ssize_t nd, int* dims, BASE* data, int own)\
|
||||
{\
|
||||
if (PyArray_API)\
|
||||
{\
|
||||
BASE* my;\
|
||||
- int i, l;\
|
||||
+ Py_ssize_t i, l;\
|
||||
PyObject * result;\
|
||||
result = PyArray_FromDims(nd, dims, TYPECODE);\
|
||||
/* get total length */\
|
||||
@@ -552,9 +552,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
-int __PyObject_AsArray_Size(PyObject* x)
|
||||
+Py_ssize_t __PyObject_AsArray_Size(PyObject* x)
|
||||
{
|
||||
- int i, l, n, p;
|
||||
+ Py_ssize_t i, l, n, p;
|
||||
PyObject* item;
|
||||
|
||||
if (PyString_Check(x))
|
||||
@@ -592,7 +592,7 @@
|
||||
#define __PyObject_As(NAME, BASE, PY_NUMBER_CAST, NUMBER_CAST)\
|
||||
int __PyObject_As##NAME(BASE* dest, PyObject* src)\
|
||||
{\
|
||||
- int i, n, l, p;\
|
||||
+ Py_ssize_t i, n, l, p;\
|
||||
char* b;\
|
||||
PyObject* item;\
|
||||
\
|
||||
@@ -735,7 +735,7 @@
|
||||
|
||||
void* _PyObject_AsPointer(PyObject* x)
|
||||
{
|
||||
- int len;
|
||||
+ Py_ssize_t len;
|
||||
char *buffer, *bufferCopy;
|
||||
|
||||
PyString_AsStringAndSize(x = PyObject_Str(x), &buffer, &len);
|
||||
@@ -746,7 +746,7 @@
|
||||
return (void*)bufferCopy;
|
||||
}
|
||||
|
||||
-int __PyObject_Dimension(PyObject* x, int rank)
|
||||
+Py_ssize_t __PyObject_Dimension(PyObject* x, int rank)
|
||||
{
|
||||
PyObject *item;
|
||||
int n;
|
||||
@@ -777,9 +777,9 @@
|
||||
|
||||
|
||||
#if PY_VERSION_HEX < 0x02000000
|
||||
-int PyString_AsStringAndSize(PyObject *obj, char **s, int *len)
|
||||
+Py_ssize_t PyString_AsStringAndSize(PyObject *obj, char **s, Py_ssize_t *len)
|
||||
{
|
||||
- int l = PyString_Size(obj);
|
||||
+ Py_ssize_t l = PyString_Size(obj);
|
||||
|
||||
if (s) *s = PyString_AsString(obj);
|
||||
if (len) *len = l;
|
||||
27
python-opengl-nodisplay.patch
Normal file
27
python-opengl-nodisplay.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
--- setup/togl_setup.py
|
||||
+++ setup/togl_setup.py
|
||||
@@ -20,11 +20,22 @@
|
||||
import distutils.command.build_ext
|
||||
from distutils.dep_util import newer_group
|
||||
|
||||
+##### fake Tkinter object
|
||||
+class FakeTk:
|
||||
+ def __init__ (self):
|
||||
+ import _tkinter
|
||||
+ self.tk = _tkinter
|
||||
+
|
||||
+ def getvar (self,name):
|
||||
+ if name == 'tk_version': return self.tk.TK_VERSION
|
||||
+ if name == 'tcl_version': return self.tk.TCL_VERSION
|
||||
+ if name == 'tk_library': return '/usr/share/tcl/tk'+self.tk.TK_VERSION
|
||||
+ if name == 'tcl_library': return '/usr/share/tcl/tcl'+self.tk.TCL_VERSION
|
||||
+
|
||||
# this is also a simple test if we need to build Togl
|
||||
# without Tkinter it is not neccessary
|
||||
try:
|
||||
- import Tkinter
|
||||
- tk = Tkinter.Tk()
|
||||
+ tk = FakeTk()
|
||||
if tk.getvar('tk_version') < '8.1' or tk.getvar('tcl_version') < '8.1':
|
||||
Togl = 'Togl-1.5'
|
||||
togl_version_decimal = '1.5.0'
|
||||
87
python-opengl.changes
Normal file
87
python-opengl.changes
Normal file
@@ -0,0 +1,87 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 21 13:09:23 CET 2006 - prusnak@suse.cz
|
||||
|
||||
- changes according to PEP353 (pep353.diff)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 19:50:00 CEST 2006 - jmatejek@suse.cz
|
||||
|
||||
- replaced a mistyped unicode nonbreakspace with a
|
||||
regular space, thus fixing build with python2.5
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 28 16:46:03 CET 2006 - jmatejek@suse.cz
|
||||
|
||||
- updated to reflect python changes due to #149809
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:40:50 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 23 16:47:21 CET 2006 - jmatejek@suse.cz
|
||||
|
||||
- added build dependency on tk-devel
|
||||
- fixed build not to require X server
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 16:10:57 CEST 2005 - ltinkl@suse.cz
|
||||
|
||||
- added freeglut* packages to fix dependencies (#80605), plus
|
||||
optional (but recommended) dependency on python-imaging (pil)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 23 16:25:43 CET 2004 - mcihar@suse.cz
|
||||
|
||||
- update to 2.0.1.09
|
||||
- simplified filelist generating
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 04 16:09:55 CEST 2004 - mcihar@suse.cz
|
||||
|
||||
- update to 2.0.1.08
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 21 12:22:58 CEST 2004 - mcihar@suse.cz
|
||||
|
||||
- fix gcc warning
|
||||
- fixed python requires
|
||||
- use sed instead of patch for lib64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 10 22:36:23 CET 2004 - adrian@suse.de
|
||||
|
||||
- build as user
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 16 16:49:02 CEST 2003 - mcihar@suse.cz
|
||||
|
||||
- added some magic to generate correct filelist
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 09 16:43:38 CEST 2003 - mcihar@suse.cz
|
||||
|
||||
- documentation isn't executable
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 05 09:58:00 CEST 2003 - mcihar@suse.cz
|
||||
|
||||
- rather move documentation than symlink, as otherwise upgrade
|
||||
doesn't work correctly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 27 19:55:53 CEST 2003 - mcihar@suse.cz
|
||||
|
||||
- install documentation only once
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 10 11:29:54 CET 2003 - mcihar@suse.cz
|
||||
|
||||
- fixed build for lib64 arches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 06 12:02:31 CET 2003 - mcihar@suse.cz
|
||||
|
||||
- initial package version
|
||||
|
||||
105
python-opengl.spec
Normal file
105
python-opengl.spec
Normal file
@@ -0,0 +1,105 @@
|
||||
#
|
||||
# spec file for package python-opengl (Version 2.0.1.09)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
Name: python-opengl
|
||||
BuildRequires: freeglut-devel gle libdrm-devel python-devel python-imaging python-numeric swig tk-devel xorg-x11
|
||||
%define tarname PyOpenGL
|
||||
Summary: OpenGL bindings for Python
|
||||
Version: 2.0.1.09
|
||||
Release: 47
|
||||
Source0: %{tarname}-%{version}.tar.bz2
|
||||
Patch0: %{name}-nodisplay.patch
|
||||
Patch1: %{name}-%{version}-pep353.patch
|
||||
License: BSD License and BSD-like
|
||||
Group: Development/Libraries/Python
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Prefix: %{_prefix}
|
||||
%{py_requires}
|
||||
Requires: tk >= 8.1
|
||||
URL: http://pyopengl.sourceforge.net
|
||||
|
||||
%description
|
||||
OpenGL bindings for Python including support for GL extensions, GLU,
|
||||
WGL, GLUT, GLE, and Tk.
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{tarname}-%{version}
|
||||
%patch0
|
||||
%patch1
|
||||
sed -i '/^library_dirs/ s@/lib@/%{_lib}@g' config/linux.cfg
|
||||
find . -name .cvsignore -type f -print0 | xargs -0 rm -f
|
||||
find . -name CVS -type d -print0 | xargs -0 rm -rf
|
||||
|
||||
%build
|
||||
CFLAGS="$RPM_OPT_FLAGS -DGLX_GLXEXT_LEGACY" python setup.py build
|
||||
|
||||
%install
|
||||
python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES
|
||||
#
|
||||
# we don't wan doc here ...
|
||||
grep -v 'OpenGL/doc' < INSTALLED_FILES > INSTALLED_FILES-nodoc
|
||||
#
|
||||
# move documentation
|
||||
install -d -m755 $RPM_BUILD_ROOT/%{_docdir}/%{name}
|
||||
mv -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/OpenGL/doc/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/
|
||||
chmod 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}/*.* $RPM_BUILD_ROOT/%{_docdir}/%{name}/xhtml/*
|
||||
rmdir $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/OpenGL/doc
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f INSTALLED_FILES-nodoc
|
||||
%defattr(-,root,root)
|
||||
%doc %{_docdir}/%{name}
|
||||
|
||||
%changelog -n python-opengl
|
||||
* Tue Nov 21 2006 - prusnak@suse.cz
|
||||
- changes according to PEP353 (pep353.diff)
|
||||
* Mon Sep 11 2006 - jmatejek@suse.cz
|
||||
- replaced a mistyped unicode nonbreakspace with a
|
||||
regular space, thus fixing build with python2.5
|
||||
* Tue Feb 28 2006 - jmatejek@suse.cz
|
||||
- updated to reflect python changes due to #149809
|
||||
* Wed Jan 25 2006 - mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Mon Jan 23 2006 - jmatejek@suse.cz
|
||||
- added build dependency on tk-devel
|
||||
- fixed build not to require X server
|
||||
* Mon Jun 20 2005 - ltinkl@suse.cz
|
||||
- added freeglut* packages to fix dependencies (#80605), plus
|
||||
optional (but recommended) dependency on python-imaging (pil)
|
||||
* Tue Nov 23 2004 - mcihar@suse.cz
|
||||
- update to 2.0.1.09
|
||||
- simplified filelist generating
|
||||
* Wed Aug 04 2004 - mcihar@suse.cz
|
||||
- update to 2.0.1.08
|
||||
* Wed Apr 21 2004 - mcihar@suse.cz
|
||||
- fix gcc warning
|
||||
- fixed python requires
|
||||
- use sed instead of patch for lib64
|
||||
* Sat Jan 10 2004 - adrian@suse.de
|
||||
- build as user
|
||||
* Mon Jun 16 2003 - mcihar@suse.cz
|
||||
- added some magic to generate correct filelist
|
||||
* Mon Jun 09 2003 - mcihar@suse.cz
|
||||
- documentation isn't executable
|
||||
* Thu Jun 05 2003 - mcihar@suse.cz
|
||||
- rather move documentation than symlink, as otherwise upgrade
|
||||
doesn't work correctly
|
||||
* Tue May 27 2003 - mcihar@suse.cz
|
||||
- install documentation only once
|
||||
* Fri Jan 10 2003 - mcihar@suse.cz
|
||||
- fixed build for lib64 arches
|
||||
* Mon Jan 06 2003 - mcihar@suse.cz
|
||||
- initial package version
|
||||
Reference in New Issue
Block a user