summaryrefslogtreecommitdiffstats
path: root/docs/license.html
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-08-19 16:57:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-08-19 16:57:50 +0000
commitb7c727e5006e26be3f70396030aab7512498f441 (patch)
tree22fbb9a2c1b9cb7e2b993b0ebe0fb5c589a07fba /docs/license.html
parentd912f6cfe3636e8ceded7871d93a003b0f4b39d7 (diff)
downloadexternal_mesa3d-b7c727e5006e26be3f70396030aab7512498f441.zip
external_mesa3d-b7c727e5006e26be3f70396030aab7512498f441.tar.gz
external_mesa3d-b7c727e5006e26be3f70396030aab7512498f441.tar.bz2
updates for 6.3.2 release, plus other assorted clean-ups
Diffstat (limited to 'docs/license.html')
-rw-r--r--docs/license.html83
1 files changed, 26 insertions, 57 deletions
diff --git a/docs/license.html b/docs/license.html
index 3831425..b61fe44 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -13,17 +13,18 @@ The Mesa distribution consists of several components. Different copyrights
and licenses apply to different components. For example, GLUT is copyrighted
by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
device drivers are copyrighted by their authors. See below for a list of
-Mesa's components and the copyright/license for each.
+Mesa's main components and the license for each.
</p>
<p>
-The core Mesa library is licensed according to the terms of the XFree86
-copyright (an MIT-style license). This allows integration with the
-XFree86/DRI project. Unless otherwise stated, the Mesa source code and
-documentation is licensed as follows:
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+</p>
+<p>
+The default Mesa license is as follows:
</p>
<pre>
-Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
+Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -47,70 +48,38 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
<H1>Attention, Contributors</H1>
<p>
-When contributing to the Mesa project you must agree to relinquish your
-work to the holder of the copyright for the particular component you're
-contributing to. That is, you can't put your own copyright on the code,
-unless it's a modular piece that can be omitted from Mesa (like a new
-device driver). If for example, you contribute a bug fix to Mesa's
-texture mapping code, your code will become a part of the body of work
-which is copyrighted by Brian Paul and licensed by the above terms.
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary comonents of the Mesa distribution
+and their respective licenses.
</p>
-<pre>
-Mesa Component Licenses:
-
-Component Files Primary Author License
-----------------------------------------------------------------------------
-core Mesa code src/*.[ch] Brian Paul Mesa
- include/GL/gl.h
-
-GLX driver src/X/* Brian Paul Mesa
- include/GL/glx.h
- include/GL/xmesa.h
-
-OS/Mesa driver src/OSmesa/* Brian Paul Mesa
- include/GL/osmesa.h
-3Dfx driver src/FX/* David Bucciarelli Mesa
- include/GL/fxmesa.h
+<H1>Mesa Component Licenses</H1>
-BeOS R4 driver src/BeOS/* Brian Paul Mesa
-
-MGL driver src/MGL/* SciTech, Inc SciTech copyright
- include/GL/mglmesa.h
-
-Windows driver src/Windows/* Li Wei copyright by Li Wei
- include/GL/wmesa.h
-
-SVGA driver src/SVGA/* Brian Paul GNU-LGPL
- include/GL/svgamesa.h
-
-DOS driver src/DOS/* Charlie Wallace GNU-LGPL
- include/GL/dosmesa.h
-
-GGI driver src/GGI/* Uwe Maurer GNU-LGPL
- include/GL/ggimesa.h
+<pre>
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
-S3 driver src/S3/* S3, Inc. S3 copyright
+Device drivers src/mesa/drivers/* See drivers See drivers
-GLUT src-glut/* Mark Kilgard Mark's copyright
- include/GL/*glut*.h
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
-GLU library src-glu/* Brian Paul GNU-LGPL
+GLUT src/glut/ Mark Kilgard Mark's copyright
-SI GLU library si-glu/* SGI SGI Free B
- include/GL/glu.h
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
-Ext registry include/GL/glext.h SGI SGI Free B
- include/GL/glxext.h
+SGI GLU library src/glu/sgi/ SGI SGI Free B
-demo programs demos/* various see source files
+demo programs progs/demos/ various see source files
-X demos xdemos/* Brian Paul see source files
+X demos progs/xdemos/ Brian Paul see source files
-SGI demos samples/* SGI SGI copyright
+SGI demos progs/samples/ SGI SGI copyright
-RedBook demos book/* SGI SGI copyright
+RedBook demos progs/redbook/ SGI SGI copyright
</pre>
</body>