From add916a7658b519defff1de5fb2cd5f93da4124f Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 20 Dec 2017 19:35:55 -0500
Subject: [PATCH] Restore the "GPL licensing not permitted" in GLUT license
 headers.

It was originally there but was removed erroneously. The emails in which
we received permission to relicense stated this restriction explicitly.
---
 headers/libs/glut/GL/glut.h    | 2 ++
 src/libs/glut/glut_bitmap.c    | 2 ++
 src/libs/glut/glut_bwidth.c    | 2 ++
 src/libs/glut/glut_ext.c       | 2 ++
 src/libs/glut/glut_shapes.c    | 2 ++
 src/libs/glut/glut_stroke.c    | 2 ++
 src/libs/glut/glut_swidth.c    | 2 ++
 src/libs/glut/glut_teapot.c    | 2 ++
 src/libs/glut/glut_util.c      | 2 ++
 src/libs/glut/glut_vidresize.c | 2 ++
 src/libs/glut/glutbitmap.h     | 2 ++
 src/libs/glut/glutint.h        | 2 ++
 src/libs/glut/glutstroke.h     | 2 ++
 13 files changed, 26 insertions(+)

diff --git a/headers/libs/glut/GL/glut.h b/headers/libs/glut/GL/glut.h
index e131205e70..be38791bf6 100644
--- a/headers/libs/glut/GL/glut.h
+++ b/headers/libs/glut/GL/glut.h
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_bitmap.c b/src/libs/glut/glut_bitmap.c
index a17e8d07f3..e136f2d8f6 100644
--- a/src/libs/glut/glut_bitmap.c
+++ b/src/libs/glut/glut_bitmap.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *	Mark Kilgard
  */
diff --git a/src/libs/glut/glut_bwidth.c b/src/libs/glut/glut_bwidth.c
index a72c33eab8..804ee5cebe 100644
--- a/src/libs/glut/glut_bwidth.c
+++ b/src/libs/glut/glut_bwidth.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_ext.c b/src/libs/glut/glut_ext.c
index 83704ca0ae..9a70deff47 100644
--- a/src/libs/glut/glut_ext.c
+++ b/src/libs/glut/glut_ext.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_shapes.c b/src/libs/glut/glut_shapes.c
index 5912f525d1..66d6979d03 100644
--- a/src/libs/glut/glut_shapes.c
+++ b/src/libs/glut/glut_shapes.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_stroke.c b/src/libs/glut/glut_stroke.c
index 689ccd2e2b..348f6ee61c 100644
--- a/src/libs/glut/glut_stroke.c
+++ b/src/libs/glut/glut_stroke.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_swidth.c b/src/libs/glut/glut_swidth.c
index 547aae0710..e979d7109a 100644
--- a/src/libs/glut/glut_swidth.c
+++ b/src/libs/glut/glut_swidth.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_teapot.c b/src/libs/glut/glut_teapot.c
index 366bef7be1..fd1bb691b5 100644
--- a/src/libs/glut/glut_teapot.c
+++ b/src/libs/glut/glut_teapot.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_util.c b/src/libs/glut/glut_util.c
index 1461fa845b..88e531f025 100644
--- a/src/libs/glut/glut_util.c
+++ b/src/libs/glut/glut_util.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glut_vidresize.c b/src/libs/glut/glut_vidresize.c
index afda7bfa23..25f4cc3ea0 100644
--- a/src/libs/glut/glut_vidresize.c
+++ b/src/libs/glut/glut_vidresize.c
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glutbitmap.h b/src/libs/glut/glutbitmap.h
index 830046f40b..f2cd07e711 100644
--- a/src/libs/glut/glutbitmap.h
+++ b/src/libs/glut/glutbitmap.h
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glutint.h b/src/libs/glut/glutint.h
index 6f3d7241ef..66e5ab5dce 100644
--- a/src/libs/glut/glutint.h
+++ b/src/libs/glut/glutint.h
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
diff --git a/src/libs/glut/glutstroke.h b/src/libs/glut/glutstroke.h
index 12d3235f5a..370b53593a 100644
--- a/src/libs/glut/glutstroke.h
+++ b/src/libs/glut/glutstroke.h
@@ -2,6 +2,8 @@
  * Copyright 1994-1997 Mark Kilgard, All rights reserved.
  * Distributed under the terms of the MIT License.
  *
+ * GPL licensing not permitted.
+ *
  * Authors:
  *      Mark Kilgard
  */
-- 
2.11.4.GIT