Mesa (master): docs: minor updates to license.html file

Brian Paul brianp at kemper.freedesktop.org
Fri Apr 1 16:06:35 UTC 2016


Module: Mesa
Branch: master
Commit: 58557b345c1382aeeef747060ba14d9edc6362de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58557b345c1382aeeef747060ba14d9edc6362de

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Mar 31 10:30:07 2016 -0600

docs: minor updates to license.html file

Mesa demos are no longer part of the main Mesa tree/tarball.
Add Gallium and GLX code to list of major components.

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 docs/license.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/license.html b/docs/license.html
index d56823f..2848832 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -46,10 +46,10 @@ library</em>. <br>
 
 <p>
 The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, 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 main components and the license
-for each.
+and licenses apply to different components.
+For example, the GLX client code uses the SGI Free Software License B, and
+some of the Mesa device drivers are copyrighted by their authors.
+See below for a list of Mesa's main components and the license for each.
 </p>
 <p>
 The core Mesa library is licensed according to the terms of the MIT license.
@@ -97,13 +97,17 @@ and their respective licenses.
 <pre>
 Component         Location               License
 ------------------------------------------------------------------
-Main Mesa code    src/mesa/              Mesa (MIT)
+Main Mesa code    src/mesa/              MIT
 
 Device drivers    src/mesa/drivers/*     MIT, generally
 
+Gallium code      src/gallium/           MIT
+
 Ext headers       include/GL/glext.h     Khronos
                   include/GL/glxext.h
 
+GLX client code   src/glx/               SGI Free Software License B
+
 C11 thread        include/c11/threads*.h Boost (permissive)
 emulation
 </pre>




More information about the mesa-commit mailing list