frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade GLX Public License 1.0 to FreeB 2.0. 

According to the press release:

    Previous SGI contributions to the free and open source community
    are now available under the new license. These contributions
    include the SGI® OpenGL® Sample Implementation, the GLX™ API and
    other GLX extensions.

    [...]

    "SGI has been one of the most ardent commercial supporters of free
    and open source software, so it was important to us that we continue
    to support the free software development community by releasing our
    earlier OpenGL-related contributions under this new license," said
    Steve Neuner, director of Linux, SGI. "This license ensures that all
    existing user communities will benefit, and their work can proceed
    unimpeded. Both Mesa and the X.org Project can continue to utilize
    this code in free software distributions of GNU/Linux. Now more than
    ever, software previously released by SGI under earlier GLX and SGI
    Free Software License B is free."

"The GLX API" is here read to include the original GLX source release
from:

http://www.sgi.com/products/software/opensource/glx/download.html
ftp://ftp.sgi.com/sgi/opengl/glx/glx1_2.1.tgz

which includes glxext.c as included in XFree86, from which our copies
in glx/ and hw/dmx/glxProxy/ are derived.
This commit is contained in:
Adam Jackson 2008-09-22 11:26:49 -04:00
parent 722c51960d
commit ad14239a35
2 changed files with 56 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
glx/glxext.c
View File

@ -1,22 +1,32 @@
/* /*
** The contents of this file are subject to the GLX Public License Version 1.0 * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
** (the "License"). You may not use this file except in compliance with the * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
** License. You may obtain a copy of the License at Silicon Graphics, Inc., *
** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 * Permission is hereby granted, free of charge, to any person obtaining a
** or at http://www.sgi.com/software/opensource/glx/license.html. * copy of this software and associated documentation files (the "Software"),
** * to deal in the Software without restriction, including without limitation
** Software distributed under the License is distributed on an "AS IS" * the rights to use, copy, modify, merge, publish, distribute, sublicense,
** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY * and/or sell copies of the Software, and to permit persons to whom the
** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR * Software is furnished to do so, subject to the following conditions:
** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific *
** language governing rights and limitations under the License. * The above copyright notice including the dates of first publication and
** * either this permission notice or a reference to
** The Original Software is GLX version 1.2 source code, released February, * http://oss.sgi.com/projects/FreeB/
** 1999. The developer of the Original Software is Silicon Graphics, Inc. * shall be included in all copies or substantial portions of the Software.
** Those portions of the Subject Software created by Silicon Graphics, Inc. *
** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
** * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
*/ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* Except as contained in this notice, the name of Silicon Graphics, Inc.
* shall not be used in advertising or otherwise to promote the sale, use or
* other dealings in this Software without prior written authorization from
* Silicon Graphics, Inc.
*/
#define NEED_REPLIES #define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H

46
hw/dmx/glxProxy/glxext.c
View File

@ -1,22 +1,32 @@
/* /*
** The contents of this file are subject to the GLX Public License Version 1.0 * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
** (the "License"). You may not use this file except in compliance with the * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
** License. You may obtain a copy of the License at Silicon Graphics, Inc., *
** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 * Permission is hereby granted, free of charge, to any person obtaining a
** or at http://www.sgi.com/software/opensource/glx/license.html. * copy of this software and associated documentation files (the "Software"),
** * to deal in the Software without restriction, including without limitation
** Software distributed under the License is distributed on an "AS IS" * the rights to use, copy, modify, merge, publish, distribute, sublicense,
** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY * and/or sell copies of the Software, and to permit persons to whom the
** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR * Software is furnished to do so, subject to the following conditions:
** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific *
** language governing rights and limitations under the License. * The above copyright notice including the dates of first publication and
** * either this permission notice or a reference to
** The Original Software is GLX version 1.2 source code, released February, * http://oss.sgi.com/projects/FreeB/
** 1999. The developer of the Original Software is Silicon Graphics, Inc. * shall be included in all copies or substantial portions of the Software.
** Those portions of the Subject Software created by Silicon Graphics, Inc. *
** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
** * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
*/ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* Except as contained in this notice, the name of Silicon Graphics, Inc.
* shall not be used in advertising or otherwise to promote the sale, use or
* other dealings in this Software without prior written authorization from
* Silicon Graphics, Inc.
*/
#ifdef HAVE_DMX_CONFIG_H #ifdef HAVE_DMX_CONFIG_H
#include <dmx-config.h> #include <dmx-config.h>