Hello all,
Over on the glx list, we've been seeing reports from users confused about
mesa versions. We're currently tracking 3.2 cvs, and no doubt all this
will go away when 3.2 is actually released. However, aside from those who
don't read our documentation, two things seem to be confusing people:
The mesa_3_2_dev branch still thinks it's 3.1, and our configure script
reports it as such.
The documentation in 3.2 and 3.3 in general hasn't been updated with the
new version numbers.
Neither of these reassure the less-clueful that they've got the right
version. :)
Attached are two patches against the 3.2 and 3.3 branches that attempt to
help with this. The one against 3.2 changes the version declaration, and
both contain misc. documentation updates. I didn't do the os-specific
READMEs, but tried to update the main files otherwise. I also made a
wording change from "copyright" to "license" in the copyright sections,
which I think is more accurate.
This is all quite sloppy, and shouldn't be considered a complete fix. I
just wanted to do a quick partial cleanup.
Cheers,
-ralph
Index: Make-config
===================================================================
RCS file: /cvs/mesa3d/Mesa/Make-config,v
retrieving revision 1.10
diff -u -r1.10 Make-config
--- Make-config 1999/11/02 10:11:44 1.10
+++ Make-config 1999/11/24 20:14:39
@@ -1,7 +1,7 @@
# $Id: Make-config,v 1.10 1999/11/02 10:11:44 brianp Exp $
MESA_MAJOR=3
-MESA_MINOR=1
+MESA_MINOR=2
MESA_TINY=0
VERSION=$(MESA_MAJOR).$(MESA_MINOR)
Index: Makefile.X11
===================================================================
RCS file: /cvs/mesa3d/Mesa/Makefile.X11,v
retrieving revision 1.12
diff -u -r1.12 Makefile.X11
--- Makefile.X11 1999/11/04 03:57:28 1.12
+++ Makefile.X11 1999/11/24 20:14:39
@@ -1,7 +1,7 @@
# $Id: Makefile.X11,v 1.12 1999/11/04 03:57:28 gareth Exp $
# Mesa 3-D graphics library
-# Version: 3.1
+# Version: 3.2
#
# Copyright (C) 1999 Brian Paul All Rights Reserved.
#
@@ -314,9 +314,9 @@
-DIRECTORY = Mesa-3.1
-LIB_NAME = MesaLib-3.1beta3
-DEMO_NAME = MesaDemos-3.1beta3
+DIRECTORY = Mesa-3.2
+LIB_NAME = MesaLib-3.2
+DEMO_NAME = MesaDemos-3.2
LIB_FILES = \
Index: configure.in
===================================================================
RCS file: /cvs/mesa3d/Mesa/configure.in,v
retrieving revision 1.11.2.2
diff -u -r1.11.2.2 configure.in
--- configure.in 1999/11/23 16:48:03 1.11.2.2
+++ configure.in 1999/11/24 20:14:39
@@ -4,7 +4,7 @@
AC_INIT(include/GL/gl.h)
dnl ------------------------------------------
-AM_INIT_AUTOMAKE(Mesa, 3.1b3)
+AM_INIT_AUTOMAKE(Mesa, 3.2)
# CURRENT:REVISION:AGE
LIBGL_VERSION=3:0:2
LIBGLU_VERSION=3:0:2
Index: docs/COPYRIGHT
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/COPYRIGHT,v
retrieving revision 1.2
diff -u -r1.2 COPYRIGHT
--- docs/COPYRIGHT 1999/07/07 00:44:36 1.2
+++ docs/COPYRIGHT 1999/11/24 20:14:40
@@ -9,8 +9,8 @@
Through version 3.0, the core Mesa library has been distributed under the
GNU Library General Public License.
-From Mesa 3.1 onward, the core library will instead be released under an
-XFree86-style copyright. The new Mesa copyright is below.
+From Mesa 3.1 onward the core library has instead been distributed under
+an XFree86-style license. The new Mesa copyright is below.
Index: docs/DEVINFO
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/DEVINFO,v
retrieving revision 1.7
diff -u -r1.7 DEVINFO
--- docs/DEVINFO 1999/09/19 20:09:00 1.7
+++ docs/DEVINFO 1999/11/24 20:14:40
@@ -90,7 +90,7 @@
Edit the GNU configure stuff to change versions numbers as needed:
Update the version string (second argument) in the line
-"AM_INIT_AUTOMAKE(Mesa, 3.1b3)".
+"AM_INIT_AUTOMAKE(Mesa, 3.2)".
Remove the leading `dnl' from the line "dnl AM_MAINTAINER_MODE".
For both LIBGL_VERSION and LIBGLU_VERSION (libGL and libGLU version) do:
* If the library source code has changed at all since the last
@@ -118,7 +118,7 @@
still work. ./configure will overwrite it if that's what the user runs.
Make a symbolic link from $(DIRECTORY) to Mesa. For example,
-ln -s Mesa Mesa-3.1 This is needed in order to make a correct
+ln -s Mesa Mesa-3.2 This is needed in order to make a correct
tar file in the next step.
Make the distribution files. From inside the Mesa directory:
Index: docs/IAFA-PACKAGE
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/IAFA-PACKAGE,v
retrieving revision 1.1
diff -u -r1.1 IAFA-PACKAGE
--- docs/IAFA-PACKAGE 1999/02/23 03:44:15 1.1
+++ docs/IAFA-PACKAGE 1999/11/24 20:14:40
@@ -1,5 +1,5 @@
Title: The Mesa 3-D graphics library
-Version: 3.1
+Version: 3.2
Description: A 3-D graphics library which uses the OpenGL API.
Author: Brian Paul [EMAIL PROTECTED]
Maintained-by: Brian Paul [EMAIL PROTECTED]
Index: docs/INSTALL
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/INSTALL,v
retrieving revision 1.5
diff -u -r1.5 INSTALL
--- docs/INSTALL 1999/10/20 18:53:46 1.5
+++ docs/INSTALL 1999/11/24 20:14:40
@@ -2,7 +2,7 @@
Mesa compilation and installation instructions
-Mesa 3.1 now uses GNU autoconfig for compilation and installation.
+Mesa now uses GNU autoconfig for compilation and installation.
Previously, traditional Makefiles were used to compile Mesa.
You now have the choice of how you want to build Mesa:
Index: docs/README
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/README,v
retrieving revision 3.23
diff -u -r3.23 README
--- docs/README 1999/10/17 18:23:22 3.23
+++ docs/README 1999/11/24 20:14:40
@@ -1,5 +1,5 @@
- Mesa 3.1
+ Mesa 3.2
Copyright (C) 1995-1999 Brian Paul
@@ -48,8 +48,8 @@
Through version 3.0, the core Mesa library has been distributed under the
GNU Library General Public License.
-In Mesa 3.1 the core library will instead be released under an XFree86-
-style copyright. The copyright is being changed so that Mesa can be
+In Mesa 3.1 and later the core library is instead distributed under an
+XFree86-style license. The license has been changed so that Mesa can be
integrated into the XFree86 X server in order to support 3D hardware
acceleration. Mesa will still be a stand-alone library too.
@@ -115,26 +115,26 @@
1. GNU zip/tar
- Download MesaLib-3.1.tar.gz and optionally MesaDemos-3.1.tar.gz
+ Download MesaLib-3.2.tar.gz and optionally MesaDemos-3.2.tar.gz
Unpack with:
- gzcat MesaLib-3.1.tar.gz | tar xf -
- gzcat MesaDemos-3.1.tar.gz | tar xf -
+ gzcat MesaLib-3.2.tar.gz | tar xf -
+ gzcat MesaDemos-3.2.tar.gz | tar xf -
If you don't have gzcat try zcat instead.
2. Unix compressed/tar
- Download MesaLib-3.1.tar.Z and optionally MesaDemos-3.1.tar.Z
+ Download MesaLib-3.2.tar.Z and optionally MesaDemos-3.2.tar.Z
Unpack with:
- zcat MesaLib-3.1.tar.Z | tar xf -
- zcat MesaDemos-3.1.tar.Z | tar xf -
+ zcat MesaLib-3.2.tar.Z | tar xf -
+ zcat MesaDemos-3.2.tar.Z | tar xf -
3. ZIP format
- Download MesaLib-3.1.zip and optionally MesaDemos-3.1.zip
+ Download MesaLib-3.2.zip and optionally MesaDemos-3.2.zip
Unpack with:
- unzip MesaLib-3.1.zip
- unzip MesaDemos-3.1.zip
+ unzip MesaLib-3.2.zip
+ unzip MesaDemos-3.2.zip
After unpacking you'll have these files (and more):
Index: docs/RELNOTES
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/RELNOTES,v
retrieving revision 1.10
diff -u -r1.10 RELNOTES
--- docs/RELNOTES 1999/10/17 18:24:53 1.10
+++ docs/RELNOTES 1999/11/24 20:14:40
@@ -1,5 +1,5 @@
- Mesa 3.1 release notes
+ Mesa 3.2 release notes
PLEASE READ!!!!
@@ -9,7 +9,7 @@
New copyright
-------------
-Mesa 3.1 will be distributed under an XFree86-style copyright instead
+Mesa 3.2 is distributed under an XFree86-style copyright instead
of the GNU LGPL.
Index: docs/COPYRIGHT
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/COPYRIGHT,v
retrieving revision 1.2
diff -u -r1.2 COPYRIGHT
--- docs/COPYRIGHT 1999/07/07 00:44:36 1.2
+++ docs/COPYRIGHT 1999/11/24 19:48:58
@@ -9,8 +9,8 @@
Through version 3.0, the core Mesa library has been distributed under the
GNU Library General Public License.
-From Mesa 3.1 onward, the core library will instead be released under an
-XFree86-style copyright. The new Mesa copyright is below.
+From Mesa 3.1 onward, the core library has instead been distributed under
+an XFree86-style license. The new Mesa copyright is below.
Index: docs/DEVINFO
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/DEVINFO,v
retrieving revision 1.7
diff -u -r1.7 DEVINFO
--- docs/DEVINFO 1999/09/19 20:09:00 1.7
+++ docs/DEVINFO 1999/11/24 19:48:58
@@ -90,7 +90,7 @@
Edit the GNU configure stuff to change versions numbers as needed:
Update the version string (second argument) in the line
-"AM_INIT_AUTOMAKE(Mesa, 3.1b3)".
+"AM_INIT_AUTOMAKE(Mesa, 3.3)".
Remove the leading `dnl' from the line "dnl AM_MAINTAINER_MODE".
For both LIBGL_VERSION and LIBGLU_VERSION (libGL and libGLU version) do:
* If the library source code has changed at all since the last
@@ -118,7 +118,7 @@
still work. ./configure will overwrite it if that's what the user runs.
Make a symbolic link from $(DIRECTORY) to Mesa. For example,
-ln -s Mesa Mesa-3.1 This is needed in order to make a correct
+ln -s Mesa Mesa-3.3 This is needed in order to make a correct
tar file in the next step.
Make the distribution files. From inside the Mesa directory:
Index: docs/IAFA-PACKAGE
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/IAFA-PACKAGE,v
retrieving revision 1.1
diff -u -r1.1 IAFA-PACKAGE
--- docs/IAFA-PACKAGE 1999/02/23 03:44:15 1.1
+++ docs/IAFA-PACKAGE 1999/11/24 19:48:58
@@ -1,5 +1,5 @@
Title: The Mesa 3-D graphics library
-Version: 3.1
+Version: 3.3
Description: A 3-D graphics library which uses the OpenGL API.
Author: Brian Paul [EMAIL PROTECTED]
Maintained-by: Brian Paul [EMAIL PROTECTED]
Index: docs/INSTALL
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/INSTALL,v
retrieving revision 1.5
diff -u -r1.5 INSTALL
--- docs/INSTALL 1999/10/20 18:53:46 1.5
+++ docs/INSTALL 1999/11/24 19:48:58
@@ -2,8 +2,9 @@
Mesa compilation and installation instructions
-Mesa 3.1 now uses GNU autoconfig for compilation and installation.
-Previously, traditional Makefiles were used to compile Mesa.
+Mesa now uses GNU autoconfig for compilation and installation.
+Previously (before version 3.1) traditional Makefiles were used to
+compile Mesa.
You now have the choice of how you want to build Mesa:
Index: docs/README
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/README,v
retrieving revision 3.23
diff -u -r3.23 README
--- docs/README 1999/10/17 18:23:22 3.23
+++ docs/README 1999/11/24 19:48:59
@@ -1,5 +1,5 @@
- Mesa 3.1
+ Mesa 3.3
Copyright (C) 1995-1999 Brian Paul
@@ -48,7 +48,7 @@
Through version 3.0, the core Mesa library has been distributed under the
GNU Library General Public License.
-In Mesa 3.1 the core library will instead be released under an XFree86-
+In Mesa 3.1 the core library was instead be released under an XFree86-
style copyright. The copyright is being changed so that Mesa can be
integrated into the XFree86 X server in order to support 3D hardware
acceleration. Mesa will still be a stand-alone library too.
@@ -115,26 +115,26 @@
1. GNU zip/tar
- Download MesaLib-3.1.tar.gz and optionally MesaDemos-3.1.tar.gz
+ Download MesaLib-3.3.tar.gz and optionally MesaDemos-3.3.tar.gz
Unpack with:
- gzcat MesaLib-3.1.tar.gz | tar xf -
- gzcat MesaDemos-3.1.tar.gz | tar xf -
+ gzcat MesaLib-3.3.tar.gz | tar xf -
+ gzcat MesaDemos-3.3.tar.gz | tar xf -
If you don't have gzcat try zcat instead.
2. Unix compressed/tar
- Download MesaLib-3.1.tar.Z and optionally MesaDemos-3.1.tar.Z
+ Download MesaLib-3.3.tar.Z and optionally MesaDemos-3.3.tar.Z
Unpack with:
- zcat MesaLib-3.1.tar.Z | tar xf -
- zcat MesaDemos-3.1.tar.Z | tar xf -
+ zcat MesaLib-3.3.tar.Z | tar xf -
+ zcat MesaDemos-3.3.tar.Z | tar xf -
3. ZIP format
- Download MesaLib-3.1.zip and optionally MesaDemos-3.1.zip
+ Download MesaLib-3.3.zip and optionally MesaDemos-3.1.zip
Unpack with:
- unzip MesaLib-3.1.zip
- unzip MesaDemos-3.1.zip
+ unzip MesaLib-3.3.zip
+ unzip MesaDemos-3.3.zip
After unpacking you'll have these files (and more):
Index: docs/README.THREADS
===================================================================
RCS file: /cvs/mesa3d/Mesa/docs/README.THREADS,v
retrieving revision 1.1
diff -u -r1.1 README.THREADS
--- docs/README.THREADS 1999/04/10 12:25:26 1.1
+++ docs/README.THREADS 1999/11/24 19:48:59
@@ -1,7 +1,7 @@
-NOTE: this information is obsolete for Mesa 3.1. Due to the big
-changes in the Mesa code, the threads support is out of date.
-Someone will have to review/update it.
+NOTE: this information is obsolete for Mesa 3.1 and later.
+Due to the big changes in the Mesa code, the threads support
+is out of date. Someone will have to review/update it.
Mesa Threads README
