diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-06 06:13:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-06 06:13:52 +0000 |
| commit | c721bc9b176ec37d8b80a92c89840658f8f6c458 (patch) | |
| tree | dc287f9829cd40b0a7e6643c120315224572b0fd | |
| parent | 4ac3e6a0be77b6fd4642a3c4df67590cb645ee7e (diff) | |
| parent | 151019725213fc50a8aa4db8c4524387fea8f476 (diff) | |
| download | vcxsrv-c721bc9b176ec37d8b80a92c89840658f8f6c458.tar.gz vcxsrv-c721bc9b176ec37d8b80a92c89840658f8f6c458.tar.bz2 vcxsrv-c721bc9b176ec37d8b80a92c89840658f8f6c458.zip | |
svn merge ^/branches/released .
| -rw-r--r-- | gl/glxproto.h | 4 | ||||
| -rw-r--r-- | mesalib/bin/extract_git_sha1 | 14 | ||||
| -rw-r--r-- | mesalib/configure.ac | 4 |
3 files changed, 16 insertions, 6 deletions
diff --git a/gl/glxproto.h b/gl/glxproto.h index 06678c335..ee8f2c258 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..c2994ff09 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 [ ! -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
+ > 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 9a4a9ad20..bfde4e870 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
|