i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GLUT: Relicense Mark Kilgard's GLUT components

Browse Source 
* A copy of the email approving this change is
  in the LICENSE.txt file
* This clears up several concerns
* We now have permission to clean / update GLUT
  code and redistrubute its binaries.
* We have to ensure all of Mark's work is *not*
  GPL licensed as per his wishes.
This commit is contained in:
Alexander von Gluck IV
2012-11-15 17:31:39 -06:00
parent caddc641c1
commit c3eddfc068
14 changed files with 172 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/opengl/GL/glut.h
+11 -5
View File
@@ -1,15 +1,20 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
#ifndef __glut_h__
#define __glut_h__
/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */
/* This program is freely distributable without licensing fees and is
provided without guarantee or warrantee expressed or implied. This
program is -not- in the public domain. */
#include <GL/gl.h>
#include <GL/glu.h>
#if defined(__MINGW32__)
#include <GL/mesa_wgl.h>
#endif
@@ -752,4 +757,5 @@ GLUTAPI int GLUTAPIENTRY glutGameModeGet(GLenum mode);
}
#endif
#endif /* __glut_h__ */
src/libs/glut/LICENSE.txt
+42
View File
@@ -0,0 +1,42 @@
On 2012-11-15 4:04 pm, Mark Kilgard wrote:
Alex,
> Ideally, if you gave permission to license the GLUT code MIT it would make my life easier... but that of course is your decision. :)
Please feel free to use the GLUT code any way you please for
commercial or non-commercial use. Put whatever license you want other
than a GPL. There's no warrantee for the code of course.
Good luck with your project.
- Mark
> -----Original Message-----
> From: Alexander von Gluck IV [mailto:[email protected]]
> Sent: Thursday, November 15, 2012 1:45 PM
> To: Mark Kilgard
> Subject: BeOS GLUT
>
> Good afternoon!
>
> I'm one of the developers of the Haiku project. (Open Source MIT
> licensed re-implementation of BeOS)
>
> At the moment, we have the unmodified GLUT source code in our tree to
> ensure binary compatibility with BeOS (GLUT was present in libGL.so on
> BeOS R5). However, our developers feel anxious distributing any
> modified sources or binaries of GLUT given the licensing terms present
> when the last public version was released.
>
> I would like to know if you would be willing to give Haiku permission
> to modify GLUT and distribute it to ensure the best GL compatibility.
> The license notated in the code was a little unclear and I wanted to
> make 100% sure we were following your wishes.
>
> Ideally, if you gave permission to license the GLUT code MIT it would
> make my life easier... but that of course is your decision. :)
>
> http://cgit.haiku-os.org/haiku/tree/src/libs/glut
>
> Thanks for your time.
> -- Alexander von Gluck IV
src/libs/glut/glut_bitmap.c
+10 -5
View File
@@ -1,13 +1,18 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/* Copyright (c) Mark J. Kilgard, 1994. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include "glutint.h"
#include "glutbitmap.h"
void APIENTRY
glutBitmapCharacter(GLUTbitmapFont font, int c)
{
src/libs/glut/glut_bwidth.c
+10 -5
View File
@@ -1,13 +1,18 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/* Copyright (c) Mark J. Kilgard, 1994. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include "glutint.h"
#include "glutbitmap.h"
/* CENTRY */
int APIENTRY
glutBitmapWidth(GLUTbitmapFont font, int c)
src/libs/glut/glut_ext.c
+10 -5
View File
@@ -1,15 +1,20 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include <stdlib.h>
#include <string.h>
#include "glutint.h"
/* CENTRY */
int GLUTAPIENTRY
glutExtensionSupported(const char *extension)
src/libs/glut/glut_shapes.c
+9 -2
View File
@@ -1,5 +1,12 @@
/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/**
(c) Copyright 1993, Silicon Graphics, Inc.
src/libs/glut/glut_stroke.c
+10 -5
View File
@@ -1,13 +1,18 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/* Copyright (c) Mark J. Kilgard, 1994. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include "glutint.h"
#include "glutstroke.h"
void APIENTRY
glutStrokeCharacter(GLUTstrokeFont font, int c)
{
src/libs/glut/glut_swidth.c
+10 -5
View File
@@ -1,13 +1,18 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/* Copyright (c) Mark J. Kilgard, 1995. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include "glutint.h"
#include "glutstroke.h"
/* CENTRY */
int APIENTRY
glutStrokeWidth(GLUTstrokeFont font, int c)
src/libs/glut/glut_teapot.c
+11 -2
View File
@@ -1,5 +1,12 @@
/* Copyright (c) Mark J. Kilgard, 1994. */
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/**
(c) Copyright 1993, Silicon Graphics, Inc.
@@ -44,8 +51,10 @@ Graphics, Inc., 2011 N. Shoreline Blvd., Mountain View, CA
OpenGL(TM) is a trademark of Silicon Graphics, Inc.
*/
#include "glutint.h"
/* Rim, body, lid, and bottom data must be reflected in x and
y; handle and spout data across the y axis only. */
src/libs/glut/glut_util.c
+10 -5
View File
@@ -1,9 +1,13 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/* Copyright (c) Mark J. Kilgard, 1994. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include <stdlib.h>
#include <stdarg.h>
@@ -12,6 +16,7 @@
#include "glutint.h"
/* strdup is actually not a standard ANSI C or POSIX routine
so implement a private one for GLUT. OpenVMS does not have a
strdup; Linux's standard libc doesn't declare strdup by default
src/libs/glut/glut_vidresize.c
+10 -5
View File
@@ -1,12 +1,17 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
/* Copyright (c) Mark J. Kilgard, 1996. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include <stdlib.h>
#if !defined(_WIN32) && !(defined(__BEOS__) || defined(__HAIKU__))
#include <GL/glx.h>
#endif
src/libs/glut/glutbitmap.h
+11 -5
View File
@@ -1,14 +1,19 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
#ifndef __glutbitmap_h__
#define __glutbitmap_h__
/* Copyright (c) Mark J. Kilgard, 1994. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#include <GL/glut.h>
typedef struct {
const GLsizei width;
const GLsizei height;
@@ -27,4 +32,5 @@ typedef struct {
typedef void *GLUTbitmapFont;
#endif /* __glutbitmap_h__ */
src/libs/glut/glutint.h
+9 -5
View File
@@ -1,11 +1,15 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
#ifndef __glutint_h__
#define __glutint_h__
/* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#if defined(__CYGWIN32__)
#include <sys/time.h>
src/libs/glut/glutstroke.h
+9 -5
View File
@@ -1,11 +1,15 @@
/*
* Copyright 1994-1997 Mark Kilgard, All rights reserved.
* Distributed under the terms of the MIT License.
*
* GPL licensing not permitted.
*
* Authors:
* Mark Kilgard
*/
#ifndef __glutstroke_h__
#define __glutstroke_h__
/* Copyright (c) Mark J. Kilgard, 1994. */
/* This program is freely distributable without licensing fees
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#if defined(_WIN32)
#pragma warning (disable:4244) /* disable bogus conversion warnings */