From c3eddfc0682b99f28ddbe33a14dadc40dc5b5f71 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 15 Nov 2012 17:31:39 -0600 Subject: [PATCH] GLUT: Relicense Mark Kilgard's GLUT components * 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. --- headers/os/opengl/GL/glut.h | 16 +++++++++---- src/libs/glut/LICENSE.txt | 42 ++++++++++++++++++++++++++++++++++ src/libs/glut/glut_bitmap.c | 15 ++++++++---- src/libs/glut/glut_bwidth.c | 15 ++++++++---- src/libs/glut/glut_ext.c | 15 ++++++++---- src/libs/glut/glut_shapes.c | 11 +++++++-- src/libs/glut/glut_stroke.c | 15 ++++++++---- src/libs/glut/glut_swidth.c | 15 ++++++++---- src/libs/glut/glut_teapot.c | 13 +++++++++-- src/libs/glut/glut_util.c | 15 ++++++++---- src/libs/glut/glut_vidresize.c | 15 ++++++++---- src/libs/glut/glutbitmap.h | 16 +++++++++---- src/libs/glut/glutint.h | 14 ++++++++---- src/libs/glut/glutstroke.h | 14 ++++++++---- 14 files changed, 172 insertions(+), 59 deletions(-) create mode 100644 src/libs/glut/LICENSE.txt diff --git a/headers/os/opengl/GL/glut.h b/headers/os/opengl/GL/glut.h index 137b8efa13..be38791bf6 100644 --- a/headers/os/opengl/GL/glut.h +++ b/headers/os/opengl/GL/glut.h @@ -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 #include + #if defined(__MINGW32__) #include #endif @@ -752,4 +757,5 @@ GLUTAPI int GLUTAPIENTRY glutGameModeGet(GLenum mode); } #endif + #endif /* __glut_h__ */ diff --git a/src/libs/glut/LICENSE.txt b/src/libs/glut/LICENSE.txt new file mode 100644 index 0000000000..4fc3611641 --- /dev/null +++ b/src/libs/glut/LICENSE.txt @@ -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:kallisti5@unixzen.com] +> 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 diff --git a/src/libs/glut/glut_bitmap.c b/src/libs/glut/glut_bitmap.c index f1afdd7a04..e136f2d8f6 100644 --- a/src/libs/glut/glut_bitmap.c +++ b/src/libs/glut/glut_bitmap.c @@ -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) { diff --git a/src/libs/glut/glut_bwidth.c b/src/libs/glut/glut_bwidth.c index bee5e8827e..804ee5cebe 100644 --- a/src/libs/glut/glut_bwidth.c +++ b/src/libs/glut/glut_bwidth.c @@ -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) diff --git a/src/libs/glut/glut_ext.c b/src/libs/glut/glut_ext.c index 147b5b4803..9a70deff47 100644 --- a/src/libs/glut/glut_ext.c +++ b/src/libs/glut/glut_ext.c @@ -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 #include #include "glutint.h" + /* CENTRY */ int GLUTAPIENTRY glutExtensionSupported(const char *extension) diff --git a/src/libs/glut/glut_shapes.c b/src/libs/glut/glut_shapes.c index ce5bebb2be..0e062ead93 100644 --- a/src/libs/glut/glut_shapes.c +++ b/src/libs/glut/glut_shapes.c @@ -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. diff --git a/src/libs/glut/glut_stroke.c b/src/libs/glut/glut_stroke.c index 2fe408be1a..348f6ee61c 100644 --- a/src/libs/glut/glut_stroke.c +++ b/src/libs/glut/glut_stroke.c @@ -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) { diff --git a/src/libs/glut/glut_swidth.c b/src/libs/glut/glut_swidth.c index e1b7374575..e979d7109a 100644 --- a/src/libs/glut/glut_swidth.c +++ b/src/libs/glut/glut_swidth.c @@ -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) diff --git a/src/libs/glut/glut_teapot.c b/src/libs/glut/glut_teapot.c index 3c9bdc1ab7..fd1bb691b5 100644 --- a/src/libs/glut/glut_teapot.c +++ b/src/libs/glut/glut_teapot.c @@ -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. */ diff --git a/src/libs/glut/glut_util.c b/src/libs/glut/glut_util.c index 6acd938d20..88e531f025 100644 --- a/src/libs/glut/glut_util.c +++ b/src/libs/glut/glut_util.c @@ -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 #include @@ -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 diff --git a/src/libs/glut/glut_vidresize.c b/src/libs/glut/glut_vidresize.c index f2617c3b99..25f4cc3ea0 100644 --- a/src/libs/glut/glut_vidresize.c +++ b/src/libs/glut/glut_vidresize.c @@ -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 + #if !defined(_WIN32) && !(defined(__BEOS__) || defined(__HAIKU__)) #include #endif diff --git a/src/libs/glut/glutbitmap.h b/src/libs/glut/glutbitmap.h index 32bf53c097..f2cd07e711 100644 --- a/src/libs/glut/glutbitmap.h +++ b/src/libs/glut/glutbitmap.h @@ -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 + typedef struct { const GLsizei width; const GLsizei height; @@ -27,4 +32,5 @@ typedef struct { typedef void *GLUTbitmapFont; + #endif /* __glutbitmap_h__ */ diff --git a/src/libs/glut/glutint.h b/src/libs/glut/glutint.h index c618ccd328..66e5ab5dce 100644 --- a/src/libs/glut/glutint.h +++ b/src/libs/glut/glutint.h @@ -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 diff --git a/src/libs/glut/glutstroke.h b/src/libs/glut/glutstroke.h index cbc9e156fe..370b53593a 100644 --- a/src/libs/glut/glutstroke.h +++ b/src/libs/glut/glutstroke.h @@ -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 */