summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-11-14 16:14:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-11-14 16:14:50 +0000
commit69e3c8b323d5bbbc0b9a228f7dd0bffa3c5df6c8 (patch)
treec8a7a4e14e996936aa5a4eec45346d071c2c2c42
parent22a47c5251ee7b91dc8f7f4f7dbeb3ad5a117b70 (diff)
bump version to 5.1
-rw-r--r--Make-config4
-rw-r--r--Makefile.X1117
-rw-r--r--docs/VERSIONS12
-rw-r--r--src/mesa/drivers/x11/fakeglx.c6
-rw-r--r--src/mesa/main/get.c10
5 files changed, 28 insertions, 21 deletions
diff --git a/Make-config b/Make-config
index ff7c765c1c..7948dfa606 100644
--- a/Make-config
+++ b/Make-config
@@ -1,7 +1,7 @@
-# $Id: Make-config,v 1.67 2002/11/12 02:49:14 brianp Exp $
+# $Id: Make-config,v 1.68 2002/11/14 16:14:52 brianp Exp $
MESA_MAJOR=5
-MESA_MINOR=0
+MESA_MINOR=1
MESA_TINY=0
VERSION=$(MESA_MAJOR).$(MESA_MINOR)
diff --git a/Makefile.X11 b/Makefile.X11
index b28d506f06..b69f6424c5 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.69 2002/11/13 15:33:51 brianp Exp $
+# $Id: Makefile.X11,v 1.70 2002/11/14 16:14:50 brianp Exp $
# Mesa 3-D graphics library
-# Version: 5.0
+# Version: 5.1
#
# Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
#
@@ -69,7 +69,6 @@ default:
@echo " make linux for Linux systems, make shared .so libs"
@echo " make linux-static for Linux systems, make static .a libs"
- @echo " make linux-trace for Linux systems, with API trace extension"
@echo " make linux-x86 for Linux on Intel, make shared .so libs"
@echo " make linux-x86-static for Linux on Intel, make static .a libs"
@echo " make linux-ggi for Linux systems with libggi"
@@ -330,10 +329,10 @@ realclean: clean
cd samples && $(MAKE) -f Makefile.X11 realclean || true
-DIRECTORY = Mesa-5.0
-LIB_NAME = MesaLib-5.0
-DEMO_NAME = MesaDemos-5.0
-GLU_NAME = MesaGLU-5.0
+DIRECTORY = Mesa-5.1
+LIB_NAME = MesaLib-5.1
+DEMO_NAME = MesaDemos-5.1
+GLU_NAME = MesaGLU-5.1
GLUT_NAME = GLUT-3.7
@@ -354,6 +353,7 @@ LIB_FILES = \
$(DIRECTORY)/missing \
$(DIRECTORY)/mkinstalldirs \
$(DIRECTORY)/stamp-h.in \
+ $(DIRECTORY)/docs/index.html \
$(DIRECTORY)/docs/CONFORM \
$(DIRECTORY)/docs/COPYING \
$(DIRECTORY)/docs/COPYRIGHT \
@@ -470,9 +470,6 @@ LIB_FILES = \
$(DIRECTORY)/src/SVGA/Makefile.am \
$(DIRECTORY)/src/SVGA/Makefile.in \
$(DIRECTORY)/src/SVGA/*.[ch] \
- $(DIRECTORY)/src/Trace/*.[ch] \
- $(DIRECTORY)/src/Trace/Makefile.am \
- $(DIRECTORY)/src/Trace/Makefile.in \
$(DIRECTORY)/src/Windows/*.[ch] \
$(DIRECTORY)/src/Windows/*.def \
$(DIRECTORY)/src/X/Makefile.am \
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 4f635a82b7..fbff377725 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1,4 +1,4 @@
-$Id: VERSIONS,v 1.118 2002/11/13 15:33:50 brianp Exp $
+$Id: VERSIONS,v 1.119 2002/11/14 16:14:54 brianp Exp $
Mesa Version History
@@ -1080,3 +1080,13 @@ Mesa Version History
- fixed one-bit error in point/line fragment Z calculation
- fixed potential segfault in fakeglx code
- fixed color overflow problem in DOT3 texture env mode
+
+
+5.1 Month day, 2003
+ New:
+ -
+ Bug fixes:
+ -
+ Changes:
+ - dropped API trace feature (src/Trace/)
+
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index f807f84081..5a830dc0cc 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,8 +1,8 @@
-/* $Id: fakeglx.c,v 1.75 2002/11/10 17:07:06 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.76 2002/11/14 16:14:56 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 5.0
+ * Version: 5.1
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
@@ -66,7 +66,7 @@
#define SERVER_MINOR_VERSION 4
/* This is appended onto the glXGetClient/ServerString version strings. */
-#define MESA_GLX_VERSION "Mesa 5.0"
+#define MESA_GLX_VERSION "Mesa 5.1"
/* Who implemented this GLX? */
#define VENDOR "Brian Paul"
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 1fc4d85cf4..074972dffc 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,8 +1,8 @@
-/* $Id: get.c,v 1.99 2002/11/08 15:39:58 brianp Exp $ */
+/* $Id: get.c,v 1.100 2002/11/14 16:14:55 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 5.0
+ * Version: 5.1
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
@@ -5628,9 +5628,9 @@ _mesa_GetString( GLenum name )
GET_CURRENT_CONTEXT(ctx);
static const char *vendor = "Brian Paul";
static const char *renderer = "Mesa";
- static const char *version_1_2 = "1.2 Mesa 4.1";
- static const char *version_1_3 = "1.3 Mesa 4.1";
- static const char *version_1_4 = "1.4 Mesa 5.0";
+ static const char *version_1_2 = "1.2 Mesa 5.1";
+ static const char *version_1_3 = "1.3 Mesa 5.1";
+ static const char *version_1_4 = "1.4 Mesa 5.1";
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);