[117985] trunk/dports/python/py-opengl-accelerate

mmoll at macports.org mmoll at macports.org
Tue Mar 18 06:53:55 PDT 2014


Revision: 117985
          https://trac.macports.org/changeset/117985
Author:   mmoll at macports.org
Date:     2014-03-18 06:53:55 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
py-opengl-accelerate: patch for python3.x, closes #39196. added py34 subport.

Modified Paths:
--------------
    trunk/dports/python/py-opengl-accelerate/Portfile

Added Paths:
-----------
    trunk/dports/python/py-opengl-accelerate/files/
    trunk/dports/python/py-opengl-accelerate/files/patch-py3-import.diff

Modified: trunk/dports/python/py-opengl-accelerate/Portfile
===================================================================
--- trunk/dports/python/py-opengl-accelerate/Portfile	2014-03-18 13:43:54 UTC (rev 117984)
+++ trunk/dports/python/py-opengl-accelerate/Portfile	2014-03-18 13:53:55 UTC (rev 117985)
@@ -5,7 +5,7 @@
 
 name                py-opengl-accelerate
 version             3.0.2
-revision            1
+revision            2
 categories-append   graphics
 platforms           darwin
 license             BSD
@@ -23,9 +23,14 @@
                     rmd160 71ea34666911dd768860e5546e66cac206109d14 \
                     sha256 850f32dbc92040058aa25f9a7c5f3bf1f55e06a5f1d63e36134b2b7b203223b7
 
-python.versions     26 27 32 33
+python.versions     26 27 32 33 34
 
 if {${name} ne ${subport}} {
+    if {${python.version} > 31} {
+        # this patch can most likely be removed with the next release;
+        # see http://sourceforge.net/p/pyopengl/bugs/259/
+        patchfiles patch-py3-import.diff
+    }
     depends_lib     port:py${python.version}-numpy
 }
 livecheck.type  none

Added: trunk/dports/python/py-opengl-accelerate/files/patch-py3-import.diff
===================================================================
--- trunk/dports/python/py-opengl-accelerate/files/patch-py3-import.diff	                        (rev 0)
+++ trunk/dports/python/py-opengl-accelerate/files/patch-py3-import.diff	2014-03-18 13:53:55 UTC (rev 117985)
@@ -0,0 +1,253 @@
+diff -rubw ./src/arraydatatype.c ./src/arraydatatype.c
+--- ./src/arraydatatype.c	2012-09-14 23:27:23.000000000 -0500
++++ ./src/arraydatatype.c	2013-05-22 14:35:41.000000000 -0500
+@@ -5796,7 +5796,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_8), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_8), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -6279,7 +6279,7 @@
+     __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+     PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+     __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_8), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 374; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_8), ((PyObject *)__pyx_t_2), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 374; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+     __Pyx_GOTREF(__pyx_t_3);
+     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+     __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 374; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -6936,7 +6936,7 @@
+     __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+     PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+     __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_8), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_8), ((PyObject *)__pyx_t_2), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+     __Pyx_GOTREF(__pyx_t_3);
+     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+     __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -9382,7 +9382,7 @@
+  * import OpenGL
+  * from OpenGL import constants, plugins
+  */
+-  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), 0, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_1);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__ctypes, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+@@ -9394,7 +9394,7 @@
+  * from OpenGL import constants, plugins
+  * from OpenGL import logs
+  */
+-  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), 0, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_1);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__OpenGL, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+@@ -9414,7 +9414,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__plugins));
+   PyList_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_n_s__plugins));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__plugins));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__constants); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -9439,7 +9439,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__logs));
+   PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__logs));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__logs));
+-  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_2), 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_1);
+   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+   __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__logs); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+diff -rubw ./src/errorchecker.c ./src/errorchecker.c
+--- ./src/errorchecker.c	2012-09-14 23:27:23.000000000 -0500
++++ ./src/errorchecker.c	2013-05-22 14:29:55.000000000 -0500
+@@ -782,7 +782,7 @@
+       __Pyx_INCREF(((PyObject *)__pyx_n_s__GLError));
+       PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__GLError));
+       __Pyx_GIVEREF(((PyObject *)__pyx_n_s__GLError));
+-      __pyx_t_5 = __Pyx_Import(((PyObject *)__pyx_n_s_3), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++      __pyx_t_5 = __Pyx_Import(((PyObject *)__pyx_n_s_3), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+       __Pyx_GOTREF(__pyx_t_5);
+       __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+       __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__GLError); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+diff -rubw ./src/formathandler.c ./src/formathandler.c
+--- ./src/formathandler.c	2012-09-14 23:27:23.000000000 -0500
++++ ./src/formathandler.c	2013-05-22 14:33:44.000000000 -0500
+@@ -607,7 +607,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -695,7 +695,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+diff -rubw ./src/numpy_formathandler.c ./src/numpy_formathandler.c
+--- ./src/numpy_formathandler.c	2012-09-14 23:27:23.000000000 -0500
++++ ./src/numpy_formathandler.c	2013-05-22 14:35:45.000000000 -0500
+@@ -1189,7 +1189,7 @@
+     __Pyx_INCREF(((PyObject *)__pyx_n_s___configflags));
+     PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s___configflags));
+     __Pyx_GIVEREF(((PyObject *)__pyx_n_s___configflags));
+-    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_2), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+     __Pyx_GOTREF(__pyx_t_3);
+     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+     __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s___configflags); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -1237,7 +1237,7 @@
+     __Pyx_INCREF(((PyObject *)__pyx_n_s_2));
+     PyList_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_n_s_2));
+     __Pyx_GIVEREF(((PyObject *)__pyx_n_s_2));
+-    __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_3), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++    __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_3), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+     __Pyx_GOTREF(__pyx_t_2);
+     __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+     __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -1283,7 +1283,7 @@
+     __Pyx_INCREF(((PyObject *)__pyx_n_s_3));
+     PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s_3));
+     __Pyx_GIVEREF(((PyObject *)__pyx_n_s_3));
+-    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_2), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+     __Pyx_GOTREF(__pyx_t_3);
+     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+     __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -5269,7 +5269,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__c_void_p));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__c_void_p));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__c_void_p));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__c_void_p); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -5285,7 +5285,7 @@
+  * cimport numpy as np
+  * from OpenGL_accelerate.formathandler cimport FormatHandler
+  */
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__numpy), 0, -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__numpy), 0, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__np, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+@@ -5297,11 +5297,11 @@
+  * from OpenGL.error import CopyError
+  * 
+  */
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__traceback), 0, -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__traceback), 0, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__traceback, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__weakref), 0, -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__weakref), 0, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__weakref, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+@@ -5318,7 +5318,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__CopyError));
+   PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__CopyError));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__CopyError));
+-  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s_22), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s_22), ((PyObject *)__pyx_t_2), 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_1);
+   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+   __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__CopyError); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+diff -rubw ./src/vbo.c ./src/vbo.c
+--- ./src/vbo.c	2012-09-14 23:27:23.000000000 -0500
++++ ./src/vbo.c	2013-05-22 14:33:07.000000000 -0500
+@@ -992,7 +992,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -1247,7 +1247,7 @@
+     __Pyx_INCREF(((PyObject *)__pyx_n_s__get_implementation));
+     PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__get_implementation));
+     __Pyx_GIVEREF(((PyObject *)__pyx_n_s__get_implementation));
+-    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_2), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++    __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_2), ((PyObject *)__pyx_t_2), 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+     __Pyx_GOTREF(__pyx_t_3);
+     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+     __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__get_implementation); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -5059,7 +5059,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -5578,7 +5578,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__ArrayDatatype));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__ArrayDatatype));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s_1), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ArrayDatatype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+@@ -7598,11 +7598,11 @@
+  * from OpenGL_accelerate.formathandler cimport FormatHandler
+  * from OpenGL import error
+  */
+-  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), 0, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_1);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__ctypes, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+-  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__weakref), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__weakref), 0, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_1);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__weakref, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+@@ -7619,7 +7619,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__error));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__error));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__error));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__error); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+diff -rubw ./src/wrapper.c ./src/wrapper.c
+--- ./src/wrapper.c	2012-09-14 23:27:23.000000000 -0500
++++ ./src/wrapper.c	2013-05-22 14:29:51.000000000 -0500
+@@ -10789,7 +10789,7 @@
+  * from OpenGL import error
+  * 
+  */
+-  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__ctypes), 0, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_1);
+   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__ctypes, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+@@ -10806,7 +10806,7 @@
+   __Pyx_INCREF(((PyObject *)__pyx_n_s__error));
+   PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__error));
+   __Pyx_GIVEREF(((PyObject *)__pyx_n_s__error));
+-  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_1), -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
++  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__OpenGL), ((PyObject *)__pyx_t_1), 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+   __Pyx_GOTREF(__pyx_t_2);
+   __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+   __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__error); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140318/e2665f42/attachment-0001.html>


More information about the macports-changes mailing list