From 58aaef72e0a58a0c989ecda512ce918188c396f5 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Mon, 29 Mar 2010 17:22:08 +0000 Subject: [PATCH] * Added license files for GLU & GLUT * Updated AboutSystem to reference new licenses * information based on http://www.mesa3d.org/license.html git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35996 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/system/data/licenses/GLUT (Mark Kilgard) | 5 ++++ data/system/data/licenses/SGI Free B | 29 +++++++++++++++++++ src/apps/aboutsystem/AboutSystem.cpp | 10 ++++--- 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 data/system/data/licenses/GLUT (Mark Kilgard) create mode 100644 data/system/data/licenses/SGI Free B diff --git a/data/system/data/licenses/GLUT (Mark Kilgard) b/data/system/data/licenses/GLUT (Mark Kilgard) new file mode 100644 index 0000000000..f8a501370a --- /dev/null +++ b/data/system/data/licenses/GLUT (Mark Kilgard) @@ -0,0 +1,5 @@ +/* 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. */ diff --git a/data/system/data/licenses/SGI Free B b/data/system/data/licenses/SGI Free B new file mode 100644 index 0000000000..6318b78cb4 --- /dev/null +++ b/data/system/data/licenses/SGI Free B @@ -0,0 +1,29 @@ +/* + * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) + * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice including the dates of first publication and + * either this permission notice or a reference to + * http://oss.sgi.com/projects/FreeB/ + * shall be included in all copies or substantial portions of the Software. + * + * 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. + */ diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index d4df8c793b..3fbb8630b0 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -1178,8 +1178,9 @@ AboutView::_CreateCreditsView() _AddPackageCredit(PackageCredit("GLU") .SetCopyright(COPYRIGHT_STRING "1991-2000 Silicon Graphics, Inc. " - "SGI's Software FreeB license. All rights reserved.")); - // TODO: License! + "SGI's Software FreeB license. All rights reserved.") + .SetLicense("SGI Free B") + .SetURL("http://www.sgi.com/products/software/opengl")); // GLUT implementation copyrights _AddPackageCredit(PackageCredit("GLUT") @@ -1187,8 +1188,9 @@ AboutView::_CreateCreditsView() "All rights reserved.", COPYRIGHT_STRING "1997 Be Inc.", COPYRIGHT_STRING "1999 Jake Hamby.", - NULL)); - // TODO: License! + NULL) + .SetLicense("GLUT (Mark Kilgard)") + .SetURL("http://www.opengl.org/resources/libraries/glut")); // OpenGroup & DEC (BRegion backend) copyright _AddPackageCredit(PackageCredit("BRegion backend (XFree86)")