r14100 - packages/trunk/titanion/debian/patches
Peter De Wachter
pdewacht-guest at alioth.debian.org
Mon May 20 16:46:27 UTC 2013
Author: pdewacht-guest
Date: 2013-05-20 16:46:27 +0000 (Mon, 20 May 2013)
New Revision: 14100
Modified:
packages/trunk/titanion/debian/patches/dlang_v2.patch
Log:
titanion: include corrected openglu.d
Modified: packages/trunk/titanion/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/titanion/debian/patches/dlang_v2.patch 2013-05-20 16:43:40 UTC (rev 14099)
+++ packages/trunk/titanion/debian/patches/dlang_v2.patch 2013-05-20 16:46:27 UTC (rev 14100)
@@ -497,6 +497,39 @@
//import openglu;
--- a/import/openglu.d
+++ b/import/openglu.d
+@@ -28,7 +28,7 @@
+ GLdouble y,
+ GLdouble width,
+ GLdouble height,
+- GLint[4] viewport);
++ ref GLint[4] viewport);
+
+ void gluLookAt (
+ GLdouble eyex,
+@@ -45,8 +45,8 @@
+ GLdouble objx,
+ GLdouble objy,
+ GLdouble objz,
+- GLdouble[16] modelMatrix,
+- GLdouble[16] projMatrix,
++ ref GLdouble[16] modelMatrix,
++ ref GLdouble[16] projMatrix,
+ GLint[4] viewport,
+ GLdouble *winx,
+ GLdouble *winy,
+@@ -56,9 +56,9 @@
+ GLdouble winx,
+ GLdouble winy,
+ GLdouble winz,
+- GLdouble[16] modelMatrix,
+- GLdouble[16] projMatrix,
+- GLint[4] viewport,
++ ref GLdouble[16] modelMatrix,
++ ref GLdouble[16] projMatrix,
++ ref GLint[4] viewport,
+ GLdouble *objx,
+ GLdouble *objy,
+ GLdouble *objz);
@@ -157,7 +157,7 @@
void gluQuadricCallback (
GLUquadric *qobj,
@@ -506,6 +539,15 @@
GLUtesselator* gluNewTess(
);
+@@ -174,7 +174,7 @@
+
+ void gluTessVertex(
+ GLUtesselator *tess,
+- GLdouble[3] coords,
++ ref GLdouble[3] coords,
+ void *data );
+
+ void gluTessEndContour(
@@ -197,7 +197,7 @@
void gluTessCallback(
GLUtesselator *tess,
@@ -515,6 +557,19 @@
void gluGetTessProperty(
GLUtesselator *tess,
+@@ -260,9 +260,9 @@
+ void
+ gluLoadSamplingMatrices (
+ GLUnurbs *nobj,
+- GLfloat[16] modelMatrix,
+- GLfloat[16] projMatrix,
+- GLint[4] viewport );
++ ref GLfloat[16] modelMatrix,
++ ref GLfloat[16] projMatrix,
++ ref GLint[4] viewport );
+
+ void
+ gluNurbsProperty (
@@ -280,37 +280,37 @@
gluNurbsCallback (
GLUnurbs *nobj,
@@ -536,14 +591,8 @@
-typedef void (* GLUtessEndProc) ();
-typedef void (* GLUtessErrorProc) (GLenum);
-typedef void (* GLUtessCombineProc) (GLdouble[3],
-+typedef void function(GLenum) GLUtessBeginProc;
-+typedef void function(GLboolean) GLUtessEdgeFlagProc;
-+typedef void function(void *) GLUtessVertexProc;
-+typedef void function() GLUtessEndProc;
-+typedef void function(GLenum) GLUtessErrorProc;
-+typedef void function(GLdouble[3],
- void*[4],
- GLfloat[4],
+- void*[4],
+- GLfloat[4],
- void** );
-typedef void (* GLUtessBeginDataProc) (GLenum, void *);
-typedef void (* GLUtessEdgeFlagDataProc) (GLboolean, void *);
@@ -551,15 +600,25 @@
-typedef void (* GLUtessEndDataProc) (void *);
-typedef void (* GLUtessErrorDataProc) (GLenum, void *);
-typedef void (* GLUtessCombineDataProc) (GLdouble[3],
+- void*[4],
+- GLfloat[4],
++typedef void function(GLenum) GLUtessBeginProc;
++typedef void function(GLboolean) GLUtessEdgeFlagProc;
++typedef void function(void *) GLUtessVertexProc;
++typedef void function() GLUtessEndProc;
++typedef void function(GLenum) GLUtessErrorProc;
++typedef void function(ref GLdouble[3],
++ ref void*[4],
++ ref GLfloat[4],
+ void** ) GLUtessCombineProc;
+typedef void function(GLenum, void *) GLUtessBeginDataProc;
+typedef void function(GLboolean, void *) GLUtessEdgeFlagDataProc;
+typedef void function(void *, void *) GLUtessVertexDataProc;
+typedef void function(void *) GLUtessEndDataProc;
+typedef void function(GLenum, void *) GLUtessErrorDataProc;
-+typedef void function(GLdouble[3],
- void*[4],
- GLfloat[4],
++typedef void function(ref GLdouble[3],
++ ref void*[4],
++ ref GLfloat[4],
void**,
- void* );
+ void* ) GLUtessCombineDataProc;
@@ -570,6 +629,32 @@
/**** Generic constants ****/
+@@ -377,9 +377,9 @@
+ const int GLU_TESS_END = 100102; /* void (*)(void) */
+ const int GLU_TESS_ERROR = 100103; /* void (*)(GLenum errno) */
+ const int GLU_TESS_EDGE_FLAG = 100104; /* void (*)(GLboolean boundaryEdge) */
+-const int GLU_TESS_COMBINE = 100105; /* void (*)(GLdouble coords[3],
+- void *data[4],
+- GLfloat weight[4],
++const int GLU_TESS_COMBINE = 100105; /* void (*)(ref GLdouble coords[3],
++ ref void *data[4],
++ ref GLfloat weight[4],
+ void **dataOut) */
+ const int GLU_TESS_BEGIN_DATA = 100106; /* void (*)(GLenum type,
+ void *polygon_data) */
+@@ -390,9 +390,9 @@
+ void *polygon_data) */
+ const int GLU_TESS_EDGE_FLAG_DATA = 100110; /* void (*)(GLboolean boundaryEdge,
+ void *polygon_data) */
+-const int GLU_TESS_COMBINE_DATA = 100111; /* void (*)(GLdouble coords[3],
+- void *data[4],
+- GLfloat weight[4],
++const int GLU_TESS_COMBINE_DATA = 100111; /* void (*)(ref GLdouble coords[3],
++ ref void *data[4],
++ ref GLfloat weight[4],
+ void **dataOut,
+ void *polygon_data) */
+
--- a/src/abagames/ttn/boot.d
+++ b/src/abagames/ttn/boot.d
@@ -6,6 +6,7 @@
More information about the Pkg-games-commits
mailing list