ports/multimedia/libva-vdpau-driver/files/patch-src-utils_glx.h
Niclas Zeising 5a4c543c2b The FreeBSD graphics/x11 team proudly presents
a kwm, zeising production:

MESA 9.1.6

Starring:
Mesa 9.1.6, including libGL, libGLU and dri (new xorg only)
Addition of libEGL and libglesv2
KMS support for ATI graphics cards in 10-current (new xorg only)
Improved sparc64 support for new xorg. [1]
pixman 0.30.2, including shlib bump and portrevision bumps
libX11 1.6.2
Make absolute pointing devices work with x11-drivers/xf86-input-mouse
x11-drivers/xf86-video-ati 7.2.0 for 10-current (KMS aware ati driver)

Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
When updating MESA related ports (libGL, dri) you need to remove old versions
first.  See UPDATING for details.

PR:		ports/181962 [2]
Submitted by:	marius [1]
		zeising [2]
Exp-run by:	bdrewery
Approved by:	portmgr (bdrewery)

Thanks to all who helped testing!
2013-09-29 17:01:41 +00:00

22 lines
937 B
C

--- src/utils_glx.h.orig 2013-09-29 15:55:16.128603213 +0200
+++ src/utils_glx.h 2013-09-29 15:55:18.537925849 +0200
@@ -42,6 +42,19 @@
typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
#endif
+#if GL_GLEXT_VERSION >= 85
+/*
+ * The following typedef is hidden in at least Mesa 9.1.x, because:
+ * o GL/glext.h was updated to version 85, moving the typedef inside
+ * an #ifndef GL_VERSION_1_3 block.
+ * (Mesa Git: 68060cfb2bbf890a3932c8d25382261a83f393af)
+ * o GL/gl.h defines GL_VERSION_1_3 to 1.
+ *
+ * See: https://gitorious.org/vaapi/gstreamer-vaapi/commit/5db2e93d3c930fd8470cfdcd26f514d1cebc59a0/diffs
+ */
+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 *);