[Mesa-dev] [PATCH] docs: minor updates to license.html file

[Jose Fonseca]

On 01/04/16 16:35, Brian Paul wrote:
> Mesa demos are no longer part of the main Mesa tree/tarball.
> Add Gallium and GLX code to list of major components.
> ---
>   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>
>

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