Hi,
pls port gst-vaapi commit 5db2e93d3c930fd8470cfdcd26f514d1cebc59a0 to vdpau-driver to make it build
with recent mesa.
Thanks, regards,
Holger
commit be7f1383b41a6f567c24cc4a07f674ce1dc8280e
Author: Holger Kaelberer <[email protected]>
Date: Wed Mar 27 12:01:00 2013 +0100
utils_glx: fix build with <GL/glext.h> version >= 85
This was ported from gst-vaapi commit
5db2e93d3c930fd8470cfdcd26f514d1cebc59a0:
Mesa recently updated the <GL/glext.h> header version to Khronos
version 85. This caused the PFNGLMULTITEXCOORD2FPROC definition to be
moved out of the GL_VERSION_1_3_DEPRECATED block. However, since
<GL/gl.h> also defines GL_VERSION_1_3 to 1, the definitions in
<GL/glext.h> are then not enabled, thus leaving
PFNGLMULTITEXCOORD2FPROC undefined as well.
Provide a PFNGLMULTITEXCOORD2FPROC replacement as an interim solution
for newer versions of the <GL/glext.h> header.
diff --git a/src/utils_glx.h b/src/utils_glx.h
index 19d03e4..f270fba 100644
--- a/src/utils_glx.h
+++ b/src/utils_glx.h
@@ -42,6 +42,13 @@ typedef void (*PFNGLVDPAUMAPSURFACESNVPROC)(GLsizei numSurfaces, const GLvdpauSu
typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
#endif
+#if GL_GLEXT_VERSION >= 85
+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
+ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
+ Redefine the type here as an interim solution */
+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+#endif
+
/* GLX_EXT_texture_from_pixmap */
#if GLX_GLXEXT_VERSION < 18
typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *);
_______________________________________________
Libva mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libva
