[med-svn] r12577 - in trunk/packages/mgltools/opengltk/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-11-30 16:41:45 +0000 (Fri, 30 Nov 2012)
New Revision: 12577

Added:
   trunk/packages/mgltools/opengltk/trunk/debian/patches/opengl.patch
Modified:
   trunk/packages/mgltools/opengltk/trunk/debian/changelog
   trunk/packages/mgltools/opengltk/trunk/debian/patches/series
Log:
debian/patches/opengl.patch: Apply patch from Steffen Moeller <steffen_moeller at gmx.de> (Closes: #693653)


Modified: trunk/packages/mgltools/opengltk/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/changelog	2012-11-29 21:36:57 UTC (rev 12576)
+++ trunk/packages/mgltools/opengltk/trunk/debian/changelog	2012-11-30 16:41:45 UTC (rev 12577)
@@ -1,3 +1,11 @@
+mgltools-opengltk (1.5.6~rc3~cvs.20120601-2) UNRELEASED; urgency=low
+
+  * debian/patches/opengl.patch: Apply patch from Steffen Moeller
+    <steffen_moeller at gmx.de>
+    Closes: #693653
+
+ -- Andreas Tille <tille at debian.org>  Fri, 30 Nov 2012 17:39:00 +0100
+
 mgltools-opengltk (1.5.6~rc3~cvs.20120601-1) unstable; urgency=low
 
   * New upstream version.

Added: trunk/packages/mgltools/opengltk/trunk/debian/patches/opengl.patch
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/patches/opengl.patch	                        (rev 0)
+++ trunk/packages/mgltools/opengltk/trunk/debian/patches/opengl.patch	2012-11-30 16:41:45 UTC (rev 12577)
@@ -0,0 +1,86 @@
+Author: Steffen Moeller <steffen_moeller at gmx.de>
+Description: Enable proper usage of OpenGL function
+ It seems like some platform specific size specifications in
+ Swig wrappers have caused some issue. The patch below we
+ have locally tested to solve the issue for us and now we wait
+ for a confirmation by upstream.
+Bugs-Closed: http://bugs.debian.org/693653
+
+--- a/opengltk/extent/dejavu.i
++++ b/opengltk/extent/dejavu.i
+@@ -3222,7 +3222,7 @@ void solidCylinder ( GLdouble radiusBase
+ 
+ %typemap(in) const float *coords
+ {
+-  long buffer_len;
++  Py_ssize_t buffer_len;
+   if (PyObject_AsWriteBuffer( $input, (void**)&$1, &buffer_len))
+     return NULL;
+   if (! $1) return PyErr_Format( PyExc_ValueError,
+--- a/opengltk/extent/glArrayTypemap.i
++++ b/opengltk/extent/glArrayTypemap.i
+@@ -107,7 +107,7 @@ extern int checkArgumentsInCWrapper=1;
+   {
+     if (isContiguosBuffer((PyObject*)$input))
+     { 
+-      int buffer_len;
++      Py_ssize_t buffer_len;
+       array = NULL;
+       if (PyObject_AsReadBuffer( $input, (const void**)&$1, &buffer_len))
+         return NULL;
+@@ -124,7 +124,7 @@ extern int checkArgumentsInCWrapper=1;
+   }
+   else
+   {
+-    int buffer_len;
++    Py_ssize_t buffer_len;
+     array = NULL;
+     if (PyObject_AsReadBuffer( $input, (const void**)&$1, &buffer_len))
+       return NULL;
+@@ -153,7 +153,7 @@ extern int checkArgumentsInCWrapper=1;
+   {
+     if (isContiguosBuffer((PyObject*)$input))
+     { 
+-      int buffer_len;
++      Py_ssize_t buffer_len;
+       array = NULL;
+       if (PyObject_AsReadBuffer( $input, (const void**)&$1, &buffer_len))
+         return NULL;
+@@ -173,7 +173,7 @@ extern int checkArgumentsInCWrapper=1;
+   }
+   else
+   {
+-    int buffer_len;
++    Py_ssize_t buffer_len;
+     array = NULL;
+     if (PyObject_AsReadBuffer( $input, (const void**)&$1, &buffer_len))
+       return NULL;
+@@ -202,7 +202,7 @@ void gluPickMatrix( GLdouble x, GLdouble
+   {
+     if (isContiguosBuffer((PyObject*)$input))
+     { 
+-      int buffer_len;
++      Py_ssize_t buffer_len;
+       array = NULL;
+       if (PyObject_AsReadBuffer( $input, (const void**)&$1, &buffer_len))
+         return NULL;
+@@ -222,7 +222,7 @@ void gluPickMatrix( GLdouble x, GLdouble
+   }
+   else
+   {
+-    int buffer_len;
++    Py_ssize_t buffer_len;
+     array = NULL;
+     if (PyObject_AsReadBuffer( $input, (const void**)&$1, &buffer_len))
+       return NULL;
+--- a/opengltk/extent/gltypemap.i
++++ b/opengltk/extent/gltypemap.i
+@@ -63,7 +63,7 @@
+   GLvoid*,
+   GLint[ANY]
+ {
+-  long buffer_len;
++  Py_ssize_t buffer_len;
+   if (PyObject_AsWriteBuffer( $input, (void**)&$1, &buffer_len))
+     return NULL;
+   if (! $1) return PyErr_Format( PyExc_ValueError,

Modified: trunk/packages/mgltools/opengltk/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/patches/series	2012-11-29 21:36:57 UTC (rev 12576)
+++ trunk/packages/mgltools/opengltk/trunk/debian/patches/series	2012-11-30 16:41:45 UTC (rev 12577)
@@ -1 +1,2 @@
 tcllib.patch
+opengl.patch