Convert to Apache 2.0 license.

LICENSE.md

@@ -1,28 +1,20 @@
-License                       {#license}
-=======
+License and Attribution Notices           {#license}
+=======================
 
-LibKTX contains code
-
-* © 2010 & © 2013 The Khronos Group Inc.
-* © 2008 and © 2010 HI Corporation
-* © 2005 Ericsson AB
-* © 2003-2010, Troy D. Hanson
-* © 2015-2018 Mark Callow
-* © 2016 Oculus VR, LLC.
+-----------------
 
-The KTX load tests contain code
+This file has two names: LICENSE.md and NOTICE.md. The former to tell GiHub users this
+is the license. The latter to tell creators of derived works that they need to distribute this
+with or make it available in a display generated by any Derivative Works, except for any
+parts that do not pertain to the Derivative Work, in accordance with clause 4d of the
+Apache 2.0 license, i.e. this is the "NOTICE" file.
 
-* © 2013 The Khronos Group Inc.
-* © 2008 and © 2010 HI Corporation
-* © 1997-2014 Sam Lantinga
-* © 2016 Sascha Willems
-* © 2015-2018 Mark Callow
+-----------------
 
-Default License
----------------
+## Default License
 
 With the exception of the files listed explicitly below, the source
-files are made available the Apache License, Version 2.0 (the "License");
+is made available under the Apache License, Version 2.0 (the "License");
 you may not use these files except in compliance with the License.
 You may obtain a copy of the License at
 
@@ -34,14 +26,35 @@ 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.
 
+libKTX is the work of Mark Callow based on work by Georg Kolling, Jacob
+Ström, Troy Hanson and Johannes van Waveren. The source contains
+code
+
+    © 2010 & © 2013 The Khronos Group Inc.
+    © 2008 and © 2010 HI Corporation
+    © 2005 Ericsson AB
+    © 2003-2010, Troy D. Hanson
+    © 2015-2018 Mark Callow
+    © 2016 Oculus VR, LLC.
+
+The KTX load tests are the work of Mark Callow with a few small portions taken from
+Sascha Willems' Vulkan examples and use Sam Lantinga's libSDL for portability. The
+source contains code
+
+    © 2013 The Khronos Group Inc.
+    © 2008 and © 2010 HI Corporation
+    © 1997-2018 Sam Lantinga
+    © 2016 Sascha Willems
+    © 2015-2018 Mark Callow
+
 -----------------
 
 **IMPORTANT:** Due to GitHub Markdown limitations license text has
 been copied into this file from the files named below. In the event
 of a discrepancy, the licenses in the files shall be deemed correct.
 
-etcdec.cxx
-----------
+## libktx Exceptions
+### etcdec.cxx
 
 etcdec.cxx is made available under the terms and conditions of the following
 License Agreement.
@@ -154,18 +167,7 @@ dispute, controversy or claim arising out of or in connection with
 this SLA, or the breach, termination or invalidity thereof, shall be
 submitted to the exclusive jurisdiction of the Swedish Courts.
 
-
-hi_mark{,_sq}.ktx
------------------
-
-The HI logo textures are © & ™ HI Corporation and are
-provided for use only in testing the KTX loader. Any other use requires
-specific prior written permission from HI. Furthermore the name HI may
-not be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-uthash.h
---------
+### uthash.h
 
 uthash.h is made available under the following revised BSD license.
 
@@ -190,22 +192,37 @@ 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.
 
-include/SDL2/*
---------------
+## Load Tests Exceptions
+
+### icons/{ios/CommonIcons*,mac,win}/ktx_{app,document}.*
+
+These KTX application and document icons are © & ™ The Khronos Group, Inc.
+and may not be used without specific prior written permission from The Khronos Group,
+except that the ktx_app icon may be distributed in a Derived Work as the icon for
+the `glloadtests` and `vkloadtests` applications.
+
+### other_include/SDL2/*
 
 These files are part of the SDL2 source distributed by the [SDL project]
 (http://libsdl.org) under the terms of the [zlib license]
 (http://www.zlib.net/zlib_license.html).
 
-{VulkanMeshLoader,vulkantextoverlay}.hpp, vulkandebug.*
--------------------------------------------------------
+### other_include/glm
+
+OpenGL Mathematics is licensed under the [Happy Bunny (Modified MIT) License](https://github.com/g-truc/glm/blob/master/manual.md#section0)
+
+### testimages/hi_mark{,_sq}.ktx
+
+The HI logo textures are © & ™ HI Corporation and are
+provided for use only in testing the KTX loader. Any other use requires
+specific prior written permission from HI. Furthermore the name HI may
+not be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+### {VulkanMeshLoader,vulkantextoverlay}.hpp, vulkandebug.*
 
 Copyright © 2016 Sascha Willems - www.saschawillems.de
 
 {VulkanMeshLoader,vulkantextoverlay}.hpp and vulkandebug.* are licensed
 under the [MIT license](http://opensource.org/licenses/MIT)
 
-OpenGL Mathematics (GLM)
------------------------------------
-
-OpenGL Mathematics is licensed under the [Happy Bunny (Modified MIT) License](https://github.com/g-truc/glm/blob/master/manual.md#section0)

NOTICE.md

@@ -0,0 +1 @@
+LICENSE.md

include/ktxvulkan.h

@@ -4,6 +4,22 @@
 #ifndef KTX_H_C54B42AEE39611E68E1E4FF8C51D1C66
 #define KTX_H_C54B42AEE39611E68E1E4FF8C51D1C66
 
+/*
+ * ©2017 Mark Callow.
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
 /**
  * @internal
  * @file

lib/checkheader.c

@@ -3,6 +3,22 @@
 
 /* $Id$ */
 
+/*
+ * ©2010-2018 The khronos Group, Inc.
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
 /**
  * @internal
  * @file checkheader.c
@@ -13,35 +29,6 @@
  * @author Mark Callow, HI Corporation
  */
 
-/*
-Copyright (c) 2010 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-unaltered in all copies or substantial portions of the Materials.
-Any additions, deletions, or changes to the original source files
-must be clearly indicated in accompanying documentation.
-
-If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the
-work of the Khronos Group."
-
-THE MATERIALS ARE 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 THE AUTHORS OR COPYRIGHT HOLDERS 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
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
 /*
  * Author: Georg Kolling, Imagination Technology with modifications
  * by Mark Callow, HI Corporation.

lib/errstr.c

@@ -3,6 +3,22 @@
 
 /* $Id$ */
 
+/*
+ * ©2010-2018 The khronos Group, Inc.
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
 /**
  * @file errstr.c
  * @~English
@@ -12,35 +28,6 @@
  * @author Mark Callow, HI Corporation
  */
 
-/*
-Copyright (c) 2010 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-unaltered in all copies or substantial portions of the Materials.
-Any additions, deletions, or changes to the original source files
-must be clearly indicated in accompanying documentation.
-
-If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the
-work of the Khronos Group."
-
-THE MATERIALS ARE 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 THE AUTHORS OR COPYRIGHT HOLDERS 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
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
 #include "ktx.h"
 
 static const char* const errorStrings[] = {

lib/etcunpack.cxx

@@ -3,6 +3,22 @@
 
 /* $Id$ */
 
+/*
+ * ©2010 The khronos Group, Inc.
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
 /* @internal
  * @~English
  * @file
@@ -12,35 +28,6 @@
  * @author Mark Callow, HI Corporation.
  */
 
-/*
-Copyright (c) 2010 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-unaltered in all copies or substantial portions of the Materials.
-Any additions, deletions, or changes to the original source files
-must be clearly indicated in accompanying documentation.
-
-If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the
-work of the Khronos Group."
-
-THE MATERIALS ARE 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 THE AUTHORS OR COPYRIGHT HOLDERS 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
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
 #include <assert.h>
 #include <stdlib.h>