aboutsummaryrefslogtreecommitdiff
path: root/mesalib
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-01 09:35:49 +0100
committermarha <marha@users.sourceforge.net>2013-02-01 09:35:49 +0100
commitd78d8436d799f19f61642849e31e9ed6af3e6ae2 (patch)
tree436d3d26ae0fe678e3751a9dba65162ac54b2597 /mesalib
parent49c196c1056aaed97ff5cf43beff5c436d783b99 (diff)
parenta6d5f8de1394c338d01b65be7dba3520bf8bdf4b (diff)
downloadvcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.gz
vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.bz2
vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xkeyboard-config fontconfig mesa git update 1 feb 2013
Diffstat (limited to 'mesalib')
-rw-r--r--mesalib/Makefile.am2
-rw-r--r--mesalib/configure.ac2
-rwxr-xr-xmesalib/src/mapi/glapi/gen/gl_gentable.py2
-rw-r--r--mesalib/src/mesa/main/version.h4
4 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am
index 0e61a55d5..0ce94557e 100644
--- a/mesalib/Makefile.am
+++ b/mesalib/Makefile.am
@@ -36,7 +36,7 @@ check-local:
# Rules for making release tarballs
-PACKAGE_VERSION=9.1-devel
+PACKAGE_VERSION=9.2-devel
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 564ca3ccf..cfd52bfcf 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -6,7 +6,7 @@ dnl Tell the user about autoconf.html in the --help output
m4_divert_once([HELP_END], [
See docs/autoconf.html for more details on the options for Mesa.])
-AC_INIT([Mesa], [9.1.0],
+AC_INIT([Mesa], [9.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
AC_CONFIG_AUX_DIR([bin])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index c0495c09a..98dc1884d 100755
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -42,7 +42,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i
#endif
#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__))
+ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__))
#define USE_BACKTRACE
#endif
diff --git a/mesalib/src/mesa/main/version.h b/mesalib/src/mesa/main/version.h
index 1aab37d69..8167ed051 100644
--- a/mesalib/src/mesa/main/version.h
+++ b/mesalib/src/mesa/main/version.h
@@ -33,9 +33,9 @@ struct gl_context;
/* Mesa version */
#define MESA_MAJOR 9
-#define MESA_MINOR 1
+#define MESA_MINOR 2
#define MESA_PATCH 0
-#define MESA_VERSION_STRING "9.1-devel"
+#define MESA_VERSION_STRING "9.2-devel"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))