Skip to content

Commit 3c1fa2a

Browse files
oddhackMarkCallow
andauthored
Bring repository into REUSE compliance (KhronosGroup#291)
* Make repository compliant with REUSE license checker This is complex due to the many imported files and projects. Information about those licenses is being captured in .reuse/dep5 to keep the contents of imported files unchanged. In some cases educated guesswork has been required. * Work around reuse RTF parsing problem by adding a parallel License.rtf.license file. Co-authored-by: Mark Callow <[email protected]>
1 parent 0062e17 commit 3c1fa2a

File tree

301 files changed

+1769
-2262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+1769
-2262
lines changed

.appveyor.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright 2015-2020 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
version: "{build}"
25

36
image:
@@ -75,7 +78,7 @@ init:
7578
install:
7679
- cinst doxygen.install
7780
#- ps: |
78-
#run mkversion
81+
#run mkversion
7982
#Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"
8083
- cmd: |
8184
REM Download PowerVR OpenGL ES Emulator libraries (latest version).
@@ -168,4 +171,4 @@ deploy:
168171
prerelease: true
169172
on:
170173
APPVEYOR_REPO_TAG: true # deploy on tag push only
171-
174+

.codedocs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright 2015-2020 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
# CodeDocs configuration file
25

36
# Use the project's doxygen config file.

.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
# Copyright 2015-2020 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
# Set default behaviour, in case users don't have core.autocrlf set.
25
# N.B. This only causes normalization of files to LF on commit. It says nothing
36
# about working directory line endings.
47
* text=auto
58

6-
# Explicitly declare text files we want to always be normalized and converted
9+
# Explicitly declare text files we want to always be normalized and converted
710
# to native line endings on checkout.
811
*.cpp text
912
*.cxx text

.gitconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright 2016-2020 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
# Filters used by KTX repo
25
[filter "keyworder"]
36
smudge = bash expand_kw %f

.gitignore

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1+
# Copyright 2015-2020 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
# vi
25
.*.swp
36
*~
47
*.bak
58

6-
/build/
7-
/build-ios/
8-
/build-linux/
9-
/build-macos/
10-
/build-web*/
11-
/build-win*/
9+
/build*/
1210

1311
# /include/
1412
/include/imdebug.h

.reuse/dep5

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name: KTX-Software
3+
Source: https://github.com/KhronosGroup/KTX-Software
4+
5+
## Binary image licenses
6+
7+
# http://www.schaik.com/pngsuite/PngSuite.LICENSE
8+
Files: tests/srcimages/ccwn2c08.png tests/srcimages/g03n2c08.png
9+
Copyright: 1996, 2011 Willem van Schaik
10+
License: LicenseRef-PngSuite
11+
12+
# http://r0k.us/graphics/kodak/
13+
Files: tests/srcimages/kodim17.png
14+
Copyright: Eastman Kodak Company
15+
License: LicenseRef-Kodak
16+
17+
# Unknown source, "someone in the 3dformats group" - Mark Callow is checking
18+
# For now, treat it as Apache-2.0.
19+
Files: tests/srcimages/color_grid.png
20+
Copyright: Unknown
21+
License: Apache-2.0
22+
23+
# https://github.com/KhronosGroup/glTF-Sample-Models - public domain
24+
Files: tests/srcimages/camera_camera_BaseColor_16bit.png
25+
Copyright: UX3D
26+
License: CC0-1.0
27+
28+
Files: tests/srcimages/FlightHelmet_baseColor.png
29+
Copyright: Microsoft
30+
License: CC0-1.0
31+
32+
Files: tests/srcimages/CesiumLogoFlat_palette.png
33+
Copyright: Analytical Graphics
34+
License: CC-BY-4.0 WITH LicenseRef-Cesium-Trademark-Terms
35+
36+
Files: tests/testimages/himark.ktx tests/testimages/himark.ktx
37+
Copyright: HI Corporation
38+
License: LicenseRef-HI-Trademark
39+
40+
# Remaining images & icons fall under the Khronos license
41+
Files: */*.png */*.ktx */*.ico */*.icns */*.jpg */*.pam */*.pgm */*.ppm */*.ktx */*.ktx2 */*.basis */*.pspimage
42+
Copyright: 2015-2020 The Khronos Group Inc.
43+
License: Apache-2.0
44+
45+
Files: tests/srcimages/Iron_Bars/*
46+
Copyright: Katsuagi https://3dtextures.me
47+
License: CC0-1.0
48+
49+
Files: tests/srcimages/GoldenGateBridge3/* tests/srcimages/Yokohama3/*
50+
Copyright: Emil Persson http://www.humus.name
51+
License: CC-BY-3.0
52+
53+
## Licenses of binary files and files from other projects we don't want to
54+
## modify
55+
56+
# REUSE seems to use the *last* matching entry in this file, so the most
57+
# general wildcards go first.
58+
59+
# The JSON format does not support comments for imbedded copyrights
60+
Files: */*.json
61+
Copyright: 2017-2020 Mark Callow
62+
License: Apache-2.0
63+
64+
# We have asked Binomial about REUSE compliance for their repo, see https://github.com/BinomialLLC/basis_universal/issues/165
65+
Files: lib/basisu/*
66+
Copyright: 2019-2020 Binomial LLC
67+
License: Apache-2.0
68+
69+
Files: lib/basisu/apg_bmp.* lib/basisu/CMakeLists.txt lib/basisu/webgl/transcoder/CMakeLists.txt
70+
Copyright: 2019 Anton Gerdelan
71+
License: Apache-2.0
72+
73+
Files: lib/basisu/basisu_astc_decomp.*
74+
Copyright: 2016 The Android Open Source Project
75+
License: Apache-2.0
76+
77+
Files: lib/basisu/lodepng.*
78+
Copyright: 2005-2019 Lode Vandevenne
79+
License: Zlib
80+
81+
Files: lib/dfdutils/vulkan/*
82+
Copyright: 2015-2020 The Khronos Group Inc.
83+
License: Apache-2.0
84+
85+
Files: lib/dfdutils/.gitrepo
86+
Copyright: 2019-2020 The Khronos Group Inc
87+
License: Apache-2.0
88+
89+
Files: cmake/modules/NSIS.InstallOptions.ini.in cmake/*.rtf
90+
Copyright: 2017-2020 Andreas Atteneder
91+
License: Apache-2.0
92+
93+
Files: other_lib/*/*SDL* other_include/SDL2/*
94+
Copyright: 1997-2020 Sam Lantinga <[email protected]>
95+
License: Zlib
96+
97+
Files: other_lib/*/*/*zstd* other_include/zstd*
98+
Copyright: 2016-present Facebook, Inc.
99+
License: BSD-3-Clause
100+
101+
Files: other_lib/mac/Release/libminizip.a
102+
Copyright: 1995-2017 Jean-loup Gailly and Mark Adler
103+
License: Zlib
104+
105+
Files: other_include/assimp/* other_lib/*/*/*assimp* other_lib/mac/Release/libIrrXML.a
106+
Copyright: 2006-2019, assimp team
107+
License: BSD-3-Clause
108+
109+
Files: other_include/GL/glew.h other_include/GL/glxew.h other_include/GL/wglew.h other_lib/win/Release-x65/glew32.*
110+
Copyright: 2008-2015, Nigel Stewart <nigels[]users sourceforge net>
111+
Copyright: 2002-2008, Milan Ikits <milan ikits[]ieee org>
112+
Copyright: 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
113+
Copyright: 2002, Lev Povalahev
114+
License: BSD-3-Clause
115+
116+
Files: other_include/EGL/*.h other_include/GL*/*.h other_include/KHR/khrplatform.h
117+
Copyright: 2007-2020 The Khronos Group Inc.
118+
License: MIT
119+
120+
Files: other_lib/win/*
121+
Copyright: 2020 Andreas Atteneder
122+
License: Apache-2.0
123+
124+
Files: pkgdoc/*
125+
Copyright: 2018-2020 The Khronos Group Inc.
126+
License: Apache-2.0
127+
128+
Files: tests/webgl/libktx-gltf/*
129+
Copyright: 2020 Don McCurdy, Austin Eng, Shrek Shao, and Mark Callow
130+
License: Apache-2.0
131+
132+
Files: tests/webgl/libktx-webgl/*
133+
Copyright: 2020 Mark Callow
134+
License: Apache-2.0
135+
136+
Files: tests/webgl/llt-three/*
137+
Copyright: 2020 Mark Callow
138+
License: Apache-2.0
139+
140+
Files: tests/gtest/*
141+
Copyright: 2008, Google Inc.
142+
License: BSD-3-Clause
143+
144+
Files: tools/package/mac/summary.rtfd/TXT.rtf
145+
Copyright: 2019 Mark Callow
146+
License: Apache-2.0
147+
148+
Files: other_include/glm/*
149+
Copyright: 2005 G-Truc Creation
150+
License: MIT
151+
152+
Files: lib/etcdec.cxx
153+
Copyright: 2013 Ericsson AB 2013. All Rights Reserved.
154+
License: LicenseRef-ETCSLA
155+
156+
# This has an SPDX identifier, but REUSE doesn't recognize it
157+
Files: tests/loadtests/vkloadtests/resources/ios/LaunchScreen.storyboard
158+
Copyright: 2017-2020 The Khronos Group Inc.
159+
License: Apache-2.0
160+
161+
Files: tests/*/*loadtests.rc
162+
Copyright: 2020 The Khronos Group Inc.
163+
License: Apache-2.0
164+
165+
# From the nothings/stb project on Github
166+
Files: other_include/stb/*
167+
Copyright: 2017 Sean Barrett
168+
License: MIT

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright 2015-2020 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
# CI build script for Travis.
25
# See https://docs.travis-ci.com/user/multi-os/ for more info.
36

@@ -21,6 +24,8 @@ matrix:
2124
# NB: This must not have the fourth component of the version number.
2225
- VULKAN_SDK_VER="1.2.141"
2326
compiler: gcc # clang is tested by macOS build
27+
language: python
28+
python: '3.7'
2429
services:
2530
- docker
2631
sudo: required
@@ -94,7 +99,7 @@ script:
9499
after_script:
95100
- sleep 10
96101

97-
# Errors in something run in after_success: don't cause the build to fail so don't use.
102+
# Errors in something run in after_success: don't cause the build to fail so don't use.
98103

99104
before_deploy:
100105
- |

BUILDING.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
<!-- Copyright 2013-2020 Mark Callow -->
2+
<!-- SPDX-License-Identifier: Apache-2.0 -->
3+
14
Building KTX
25
============
36

4-
KTX uses the the [CMake](https://cmake.org) build system. Depending on your
5-
platform and how you configure it, it will create project/build files (e.g. an Xcode project, a Visual Studio solution or Make files) that allow you to
7+
KTX uses the the [CMake](https://cmake.org) build system. Depending on your
8+
platform and how you configure it, it will create project/build files (e.g. an Xcode project, a Visual Studio solution or Make files) that allow you to
69
build the software and more (See [CMake generators](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html)).
710

811
KTX consist of the following parts
@@ -169,7 +172,7 @@ The KTX loader tests use libSDL 2.0.12+. You do not need SDL if you only wish to
169172

170173
The KTX vulkan loader tests require a [Vulkan SDK](#vulkan-sdk)
171174
and the Open Asset Import Library [`libassimp`](#libassimp). You must
172-
install the former. The KTX Git repo has binaries of the latter for iOS and
175+
install the former. The KTX Git repo has binaries of the latter for iOS and
173176
Windows but you must install it on GNU/Linux and macOS.
174177

175178
#### OpenGL ES Emulator for Windows
@@ -184,7 +187,7 @@ emulator is recommended. Any of the other major emulators listed below could als
184187
* [ARM Mali](http://malideveloper.arm.com/resources/tools/opengl-es-emulator/)
185188

186189
If you want to run the `es1loadtests` you will need to use
187-
Imagination Technologies' PowerVR emulator as that alone supports OpenGL ES
190+
Imagination Technologies' PowerVR emulator as that alone supports OpenGL ES
188191
1.1. You must set the CMake configuration variable `OPENGL_ES_EMULATOR` to the directory containing the .lib files of your chosen emulator.
189192

190193
<sup>*</sup>You will need to build ANGLE yourself and copy the libs

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright 2015-2020 The Khronos Group Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
cmake_minimum_required(VERSION 3.13)
25

36
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/")

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
Copyright 2013-2020 Mark Callow
2+
SPDX-License-Identifier: Apache-2.0
3+
14
A reminder that this issue tracker is managed by the Khronos Group. Interactions here should follow the Khronos Code of Conduct (https://www.khronos.org/developers/code-of-conduct), which prohibits aggressive or derogatory language. Please keep the discussion friendly and civil.

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
<!-- Copyright 2013-2020 Mark Callow -->
2+
<!-- SPDX-License-Identifier: Apache-2.0 -->
3+
14
## How to contribute to the KTX library and tools.
25

36
1. Make sure you have a GitHub account.

GNUmakefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#
1+
# Copyright 2015-2020 Mark Callow
2+
# SPDX-License-Identifier: Apache-2.0
3+
24
# run GYP to generate various project files.
35
#
46
# Use this because GYP does not have a way to set its options within
57
# the GYP file.
68
#
7-
# © 2015 Mark Callow.
8-
#
99
# TODO: Clean up this makefile and try using gypi files with things like
1010
# {
1111
# 'GYP_DEFINES:' 'OS=ios',

0 commit comments

Comments
 (0)