mesa: Changes to 'debian-experimental'
debian/changelog | 7
debian/patches/01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff | 92 ++++++++++
debian/patches/series | 1
3 files changed, 100 insertions(+)
New commits:
commit 47b8a9a9ad730086fc09610dba092030f81b90c2
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri May 30 23:56:05 2014 +0200
Add 01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff
Should fix FTBFS on non-i386 and non-amd64.
diff --git a/debian/changelog b/debian/changelog
index 8c6807d..f8e7c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.2.0~rc4-2) UNRELEASED; urgency=medium
+
+ * Add 01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff,
+ should fix FTBFS on non-i386 and non-amd64.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 30 May 2014 23:50:44 +0200
+
mesa (10.2.0~rc4-1) experimental; urgency=medium
[ Fabio Pedretti ]
diff --git a/debian/patches/01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff b/debian/patches/01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff
new file mode 100644
index 0000000..19c5946
--- /dev/null
+++ b/debian/patches/01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff
@@ -0,0 +1,92 @@
+From 5cca160e06e1e90cad615cf1e6a73781267530c0 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Fri, 30 May 2014 13:57:32 -0700
+Subject: [PATCH] glapi: Duplicate GLES1 prototypes in glapi_dispatch.c
+
+These prototypes are necessary because GLES1 library builds will create
+dispatch functions for them. We can't directly include GLES/gl.h
+because it would conflict the previously-included GL/gl.h. Since GLES1
+ABI is not expected to every add more functions, the path of least
+resistance is to just duplicate the prototypes for the functions that
+aren't already in desktop OpenGL.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79294
+Cc: Andreas Boll <andreas.boll.dev@gmail.com>
+Cc: "10.2" <mesa-stable@lists.freedesktop.org>
+Acked-by: Matt Turner <mattst88@gmail.com>
+---
+ src/mapi/glapi/glapi_dispatch.c | 57 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 57 insertions(+)
+
+diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c
+index b4c8c77..d2dd965 100644
+--- a/src/mapi/glapi/glapi_dispatch.c
++++ b/src/mapi/glapi/glapi_dispatch.c
+@@ -87,6 +87,63 @@
+ /* those link to libglapi.a should provide the entry points */
+ #define _GLAPI_SKIP_PROTO_ENTRY_POINTS
+ #endif
++
++/* These prototypes are necessary because GLES1 library builds will create
++ * dispatch functions for them. We can't directly include GLES/gl.h because
++ * it would conflict the previously-included GL/gl.h. Since GLES1 ABI is not
++ * expected to every add more functions, the path of least resistance is to
++ * just duplicate the prototypes for the functions that aren't already in
++ * desktop OpenGL.
++ */
++#include <GLES/glplatform.h>
++
++GL_API void GL_APIENTRY glClearDepthf (GLclampf depth);
++GL_API void GL_APIENTRY glClipPlanef (GLenum plane, const GLfloat *equation);
++GL_API void GL_APIENTRY glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
++GL_API void GL_APIENTRY glGetClipPlanef (GLenum pname, GLfloat eqn[4]);
++GL_API void GL_APIENTRY glOrthof (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
++
++GL_API void GL_APIENTRY glAlphaFuncx (GLenum func, GLclampx ref);
++GL_API void GL_APIENTRY glClearColorx (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
++GL_API void GL_APIENTRY glClearDepthx (GLclampx depth);
++GL_API void GL_APIENTRY glClipPlanex (GLenum plane, const GLfixed *equation);
++GL_API void GL_APIENTRY glColor4x (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
++GL_API void GL_APIENTRY glDepthRangex (GLclampx zNear, GLclampx zFar);
++GL_API void GL_APIENTRY glFogx (GLenum pname, GLfixed param);
++GL_API void GL_APIENTRY glFogxv (GLenum pname, const GLfixed *params);
++GL_API void GL_APIENTRY glFrustumx (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
++GL_API void GL_APIENTRY glGetClipPlanex (GLenum pname, GLfixed eqn[4]);
++GL_API void GL_APIENTRY glGetFixedv (GLenum pname, GLfixed *params);
++GL_API void GL_APIENTRY glGetLightxv (GLenum light, GLenum pname, GLfixed *params);
++GL_API void GL_APIENTRY glGetMaterialxv (GLenum face, GLenum pname, GLfixed *params);
++GL_API void GL_APIENTRY glGetTexEnvxv (GLenum env, GLenum pname, GLfixed *params);
++GL_API void GL_APIENTRY glGetTexParameterxv (GLenum target, GLenum pname, GLfixed *params);
++GL_API void GL_APIENTRY glLightModelx (GLenum pname, GLfixed param);
++GL_API void GL_APIENTRY glLightModelxv (GLenum pname, const GLfixed *params);
++GL_API void GL_APIENTRY glLightx (GLenum light, GLenum pname, GLfixed param);
++GL_API void GL_APIENTRY glLightxv (GLenum light, GLenum pname, const GLfixed *params);
++GL_API void GL_APIENTRY glLineWidthx (GLfixed width);
++GL_API void GL_APIENTRY glLoadMatrixx (const GLfixed *m);
++GL_API void GL_APIENTRY glMaterialx (GLenum face, GLenum pname, GLfixed param);
++GL_API void GL_APIENTRY glMaterialxv (GLenum face, GLenum pname, const GLfixed *params);
++GL_API void GL_APIENTRY glMultMatrixx (const GLfixed *m);
++GL_API void GL_APIENTRY glMultiTexCoord4x (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
++GL_API void GL_APIENTRY glNormal3x (GLfixed nx, GLfixed ny, GLfixed nz);
++GL_API void GL_APIENTRY glOrthox (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
++GL_API void GL_APIENTRY glPointParameterx (GLenum pname, GLfixed param);
++GL_API void GL_APIENTRY glPointParameterxv (GLenum pname, const GLfixed *params);
++GL_API void GL_APIENTRY glPointSizex (GLfixed size);
++GL_API void GL_APIENTRY glPolygonOffsetx (GLfixed factor, GLfixed units);
++GL_API void GL_APIENTRY glRotatex (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
++GL_API void GL_APIENTRY glSampleCoveragex (GLclampx value, GLboolean invert);
++GL_API void GL_APIENTRY glScalex (GLfixed x, GLfixed y, GLfixed z);
++GL_API void GL_APIENTRY glTexEnvx (GLenum target, GLenum pname, GLfixed param);
++GL_API void GL_APIENTRY glTexEnvxv (GLenum target, GLenum pname, const GLfixed *params);
++GL_API void GL_APIENTRY glTexParameterx (GLenum target, GLenum pname, GLfixed param);
++GL_API void GL_APIENTRY glTexParameterxv (GLenum target, GLenum pname, const GLfixed *params);
++GL_API void GL_APIENTRY glTranslatex (GLfixed x, GLfixed y, GLfixed z);
++GL_API void GL_APIENTRY glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid *pointer);
++
+ #include "glapi/glapitemp.h"
+
+ #endif /* USE_X86_ASM */
+--
+2.0.0.rc2
+
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..f389033 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff
07_gallium-fix-build-failure-on-powerpcspe.diff
Reply to: