summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-05-30 20:04:57 -0700
committerChad Versace <chad.versace@linux.intel.com>2012-05-30 21:05:19 -0700
commit367378863bcc6801f5ae5ad786c09d39e0890370 (patch)
tree91254415754a6fb83f0a381082f62a9ed3a3c7bc /examples
parent4b3d533616e9856ff498fb5b0ddd39982cb46250 (diff)
license: Convert from Apache 2.0 to BSD
Jordan Justen brought to my attention that, according to the Apache and GNU websites, Apache 2.0 is incompatible with GPLv2 because GPLv2 lacks a patent indemnification clause. (It is compatible with GPLv3, however). See [1] [2] [3]. By the same logic, a lawyer could argue that Apache 2.0 is also incompatible, in one direction only, with minimal gift licenses such as BSD and MIT. I do not want license incompatibility to prevent any project from using Waffle's code, so I'm converting the project to use the most liberal license possible, BSD 2-clause [4]. [1] http://www.apache.org/licenses/GPL-compatibility.html [2] http://www.gnu.org/licenses/license-list.html#apache2 [3] http://en.wikipedia.org/wiki/Apache_License#GPL_compatibility [4] http://www.opensource.org/licenses/bsd-license.php CC: Jordan Justen <jljusten@gmail.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/gl_basic.c29
1 files changed, 20 insertions, 9 deletions
diff --git a/examples/gl_basic.c b/examples/gl_basic.c
index f92d491..b300e4e 100644
--- a/examples/gl_basic.c
+++ b/examples/gl_basic.c
@@ -1,16 +1,27 @@
// Copyright 2012 Intel Corporation
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// All rights reserved.
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// - Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/// @file gl_basic.c
/// @brief Do some basic GL rendering using Waffle.