diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-06 06:03:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-06 06:03:05 +0000 |
| commit | 151019725213fc50a8aa4db8c4524387fea8f476 (patch) | |
| tree | 779a396c0c19adedb807e86566bea9e9045a3e7e | |
| parent | d40f0a49c88fc7b5162a9d8f7b64b571094e8593 (diff) | |
| download | vcxsrv-151019725213fc50a8aa4db8c4524387fea8f476.tar.gz vcxsrv-151019725213fc50a8aa4db8c4524387fea8f476.tar.bz2 vcxsrv-151019725213fc50a8aa4db8c4524387fea8f476.zip | |
glproto mesa git update 6 May 2011
| -rw-r--r-- | gl/glxproto.h | 4 | ||||
| -rw-r--r-- | mesalib/bin/extract_git_sha1 | 30 | ||||
| -rw-r--r-- | mesalib/configure.ac | 4 |
3 files changed, 24 insertions, 14 deletions
diff --git a/gl/glxproto.h b/gl/glxproto.h index dfa0647c9..0ff44e362 100644 --- a/gl/glxproto.h +++ b/gl/glxproto.h @@ -1375,13 +1375,13 @@ typedef struct { BYTE pad; CARD16 sequenceNumber B16; CARD16 event_type B16; - CARD16 pad2; CARD32 drawable; CARD32 ust_hi B32; CARD32 ust_lo B32; CARD32 msc_hi B32; CARD32 msc_lo B32; - CARD32 sbc B32; + CARD32 sbc_hi B32; + CARD32 sbc_lo B32; } xGLXBufferSwapComplete; /************************************************************************/ diff --git a/mesalib/bin/extract_git_sha1 b/mesalib/bin/extract_git_sha1 index cf3006f8f..828387016 100644 --- a/mesalib/bin/extract_git_sha1 +++ b/mesalib/bin/extract_git_sha1 @@ -1,10 +1,20 @@ -#!/bin/sh
-touch src/mesa/main/git_sha1.h
-if which git > /dev/null; then
- # Extract the 7-digit "short" SHA1 for the current HEAD, convert
- # it to a string, and wrap it in a #define. This is used in
- # src/mesa/main/version.c to put the GIT SHA1 in the GL_VERSION string.
- git log -n 1 --oneline |\
- sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
- > src/mesa/main/git_sha1.h
-fi
+#!/bin/sh +if [ ! -f src/mesa/main/git_sha1.h ]; then + touch src/mesa/main/git_sha1.h +fi + +if [ ! -d .git ]; then + exit +fi + +if which git > /dev/null; then + # Extract the 7-digit "short" SHA1 for the current HEAD, convert + # it to a string, and wrap it in a #define. This is used in + # src/mesa/main/version.c to put the GIT SHA1 in the GL_VERSION string. + git log -n 1 --oneline |\ + sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \ + > src/mesa/main/git_sha1.h.tmp + if ! cmp -s src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h; then + mv src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h + fi +fi diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 7bd1f2e21..54d9c2968 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -21,8 +21,8 @@ dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.24 LIBDRM_RADEON_REQUIRED=2.4.24 LIBDRM_INTEL_REQUIRED=2.4.24 -DRI2PROTO_REQUIRED=2.4 -GLPROTO_REQUIRED=1.4.13 +DRI2PROTO_REQUIRED=2.1 +GLPROTO_REQUIRED=1.4.11 LIBDRM_XORG_REQUIRED=2.4.24 LIBKMS_XORG_REQUIRED=1.0.0 |