randrproto fontconfig libfontenc libxcb mesalib xserver pixman xkeyboard-config git update 15 May 2015

xserver          commit bf6344e1913a5d24c2d68eaca999ea3d71e1b707
libxcb           commit cb621341a62e6d2233db3e337611f6fdd4f675a6
libxcb/xcb-proto commit 4c550465934164aab2449a125f75f4ca07816233
xkeyboard-config commit 5da6d510b460cad1b31288618cc364e586576826
libX11           commit d3415d1f052530760b4617db45affcb984cfe35c
libXdmcp         commit b10f382e3aa2e86cd5a2bc27d6758da55f0ab1f6
libXext          commit efdcbb7634501e1117d422636a0a75d7ea84b16b
libfontenc       commit 42f3a39c3085afd9ef904ae39102fd49bbc2e4a5
libXinerama      commit edd95182b26eb5d576d4878c559e0f17dddaa909
libXau           commit 1e4635be11154dd8262f37b379511bd627defa2a
xkbcomp          commit 1ae525b3d236b59e6437b2b5433d460e18370973
pixman           commit 82f9b4faaf1aa63ec26b0dfd227f1a8e5e139ae2
xextproto        commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
randrproto       commit 895ee5264524c7c239ee4ef5e39c4e295323fb51
glproto          commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0
mkfontscale      commit 87d628f8eec170ec13bb9feefb1ce05aed07d1d6
xwininfo         commit 0c49f8f2bd56b1e77721e81030ea948386dcdf4e
libXft           commit e8a83226bc10afb587f6f34daac44d2ef809c85e
libXmu           commit 4459e6940fe3fdf26a8d5d4c71989498bc400a62
libxtrans        commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
fontconfig       commit 55ff8419274fd5ce59675f220b85035a3986d6cf
mesa             commit 3687d752e51829b4723c9abb07ae56d2bbcda570

1 files changed, 15 insertions, 10 deletions

diff --git a/mesalib/docs/specs/MESA_image_dma_buf_export.txt b/mesalib/docs/specs/MESA_image_dma_buf_export.txt
index c3794ee36..cc9497e43 100644
--- a/mesalib/docs/specs/MESA_image_dma_buf_export.txt
+++ b/mesalib/docs/specs/MESA_image_dma_buf_export.txt
@@ -16,19 +16,19 @@ Contact
 
 Status
 
-    Proposal
+    Complete, shipping.
 
 Version
 
-    Version 2, Mar 30, 2015
+    Version 3, May 5, 2015
 
 Number
 
-    EGL Extension #not assigned
+    EGL Extension #87
 
 Dependencies
 
-    Reguires EGL 1.4 or later.  This extension is written against the
+    Requires EGL 1.4 or later.  This extension is written against the
     wording of the EGL 1.4 specification.
 
     EGL_KHR_base_image is required.
@@ -43,7 +43,8 @@ Overview
     file descriptor or multiple file descriptors, in the case of multi-plane
     YUV image, from an EGLImage.
 
-    It is designed to provide the complementary functionality to EGL_EXT_image_dma_buf_import.
+    It is designed to provide the complementary functionality to
+    EGL_EXT_image_dma_buf_import.
 
 IP Status
 
@@ -51,10 +52,12 @@ IP Status
 
 New Types
 
-    This is a 64 bit unsigned integer.
-
-    typedef khronos_uint64_t EGLuint64MESA;
+    This extension uses the 64-bit unsigned integer type EGLuint64KHR
+    first introduced by the EGL_KHR_stream extension, but does not
+    depend on that extension. The typedef may be reproduced separately
+    for this extension, if not already present in eglext.h.
 
+    typedef khronos_uint64_t EGLuint64KHR;
 
 New Procedures and Functions
 
@@ -62,7 +65,7 @@ New Procedures and Functions
                                   EGLImageKHR image,
 				  int *fourcc,
 				  int *num_planes,
-				  EGLuint64MESA *modifiers);
+				  EGLuint64KHR *modifiers);
 
     EGLBoolean eglExportDMABUFImageMESA(EGLDisplay dpy,
                                         EGLImageKHR image,
@@ -89,7 +92,7 @@ Additions to the EGL 1.4 Specification:
                                   EGLImageKHR image,
 				  int *fourcc,
 				  int *num_planes,
-				  EGLuint64MESA *modifiers);
+				  EGLuint64KHR *modifiers);
 
     is used to retrieve the pixel format of the buffer, as specified by
     drm_fourcc.h, the number of planes in the image and the Linux
@@ -135,6 +138,8 @@ to dup the fd extra times to make the interface sane.
 
 Revision History
 
+    Version 3, May, 2015
+        Just use the KHR 64-bit type.
     Version 2, March, 2015
         Add a query interface (Dave Airlie)
     Version 1, June 3, 2014