From 51c38d091b6c1b7ee7c71d35ada118b6c6b94764 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Tue, 31 Oct 2023 10:37:37 -0400 Subject: [PATCH] external/glad: update licensing Co-authored-by: Jakob Bornecrantz Part-of: --- .reuse/dep5 | 41 ++++++++-------------------- src/external/glad/include/glad/egl.h | 2 +- src/external/glad/include/glad/gl.h | 2 +- src/external/glad/include/glad/glx.h | 2 +- src/external/glad/include/glad/wgl.h | 2 +- src/external/glad/src/egl.c | 2 +- src/external/glad/src/gl.c | 2 +- src/external/glad/src/glx.c | 2 +- src/external/glad/src/wgl.c | 2 +- 9 files changed, 19 insertions(+), 38 deletions(-) diff --git a/.reuse/dep5 b/.reuse/dep5 index 0b500a84c..69d0d9fc5 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -95,8 +95,8 @@ License: MIT OR Unlicense Comment: SPDX-License-Identifier missing. Files: src/external/glad/include/EGL/eglplatform.h -Copyright: 2007-2016, The Khronos Group Inc. -License: LicenseRef-Khronos-Free-Use-License-for-Software-and-Documentation +Copyright: 2007-2020, The Khronos Group Inc. +License: Apache-2.0 Comment: SPDX-License-Identifier missing. Files: src/external/glad/include/KHR/khrplatform.h @@ -104,36 +104,17 @@ Copyright: 2008-2018, The Khronos Group Inc. License: LicenseRef-Khronos-Free-Use-License-for-Software-and-Documentation Comment: SPDX-License-Identifier missing. -Files: src/external/glad/include/glad/egl.h -Copyright: 2013-2020, The Khronos Group, Inc. -License: Apache-2.0 -Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: - https://github.com/KhronosGroup/EGL-Registry/blob/main/api/egl.xml - Specification copyright statement last updated 2020 though file itself updated more recently. - -Files: src/external/glad/include/glad/gl.h -Copyright: 2013-2022, The Khronos Group, Inc. -License: Apache-2.0 -Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: - https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/main/xml/gl.xml - Specification copyright statement last updated 2020 though file itself updated more recently. - -Files: src/external/glad/include/glad/glx.h -Copyright: 2013-2022, The Khronos Group, Inc. -License: Apache-2.0 -Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: - https://github.com/KhronosGroup/OpenGL-Registry/blob/main/xml/glx.xml - -Files: src/external/glad/include/glad/wgl.h -Copyright: 2013-2022, The Khronos Group, Inc. -License: Apache-2.0 -Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: - https://github.com/KhronosGroup/OpenGL-Registry/blob/main/xml/wgl.xml +Files: src/external/glad/include/glad/* +Copyright: 2013-2023, David Herberth +License: CC0-1.0 and Apache-2.0 +Comment: This is generated from Khronos's XML (https://github.com/KhronosGroup/EGL-Registry/blob/main/api/egl.xml) + which is under the Apache-2.0 license. Files: src/external/glad/src/* -Copyright: 2013-2022, David Herberth -License: MIT -Comment: SPDX-License-Identifier missing. +Copyright: 2013-2023, David Herberth +License: CC0-1.0 and Apache-2.0 +Comment: This is generated from Khronos's XML (https://github.com/KhronosGroup/EGL-Registry/blob/main/api/egl.xml) + which is under the Apache-2.0 license. Files: src/external/nanopb/* Copyright: 2011-2022, Petteri Aimonen diff --git a/src/external/glad/include/glad/egl.h b/src/external/glad/include/glad/egl.h index 61f65a276..1027281ac 100644 --- a/src/external/glad/include/glad/egl.h +++ b/src/external/glad/include/glad/egl.h @@ -1,7 +1,7 @@ /** * Loader generated by glad 2.0.6 on Fri Jun 28 15:34:22 2024 * - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 * * Generator: C/C++ * Specification: egl diff --git a/src/external/glad/include/glad/gl.h b/src/external/glad/include/glad/gl.h index dd10419ce..7f8a6ff80 100644 --- a/src/external/glad/include/glad/gl.h +++ b/src/external/glad/include/glad/gl.h @@ -1,7 +1,7 @@ /** * Loader generated by glad 2.0.6 on Fri Jun 28 15:34:22 2024 * - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 * * Generator: C/C++ * Specification: gl diff --git a/src/external/glad/include/glad/glx.h b/src/external/glad/include/glad/glx.h index 43dcd0167..da351b436 100644 --- a/src/external/glad/include/glad/glx.h +++ b/src/external/glad/include/glad/glx.h @@ -1,7 +1,7 @@ /** * Loader generated by glad 2.0.6 on Fri Jun 28 15:34:22 2024 * - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 * * Generator: C/C++ * Specification: glx diff --git a/src/external/glad/include/glad/wgl.h b/src/external/glad/include/glad/wgl.h index 686ca72c3..9cd1fb680 100644 --- a/src/external/glad/include/glad/wgl.h +++ b/src/external/glad/include/glad/wgl.h @@ -1,7 +1,7 @@ /** * Loader generated by glad 2.0.6 on Fri Jun 28 15:34:22 2024 * - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 * * Generator: C/C++ * Specification: wgl diff --git a/src/external/glad/src/egl.c b/src/external/glad/src/egl.c index 3f4c2e859..0a1b85a31 100644 --- a/src/external/glad/src/egl.c +++ b/src/external/glad/src/egl.c @@ -1,5 +1,5 @@ /** - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 */ #include #include diff --git a/src/external/glad/src/gl.c b/src/external/glad/src/gl.c index cd60591ae..890b0789e 100644 --- a/src/external/glad/src/gl.c +++ b/src/external/glad/src/gl.c @@ -1,5 +1,5 @@ /** - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 */ #include #include diff --git a/src/external/glad/src/glx.c b/src/external/glad/src/glx.c index 0be8a3ab2..00911d109 100644 --- a/src/external/glad/src/glx.c +++ b/src/external/glad/src/glx.c @@ -1,5 +1,5 @@ /** - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 */ #include #include diff --git a/src/external/glad/src/wgl.c b/src/external/glad/src/wgl.c index 5e1ae3231..a33c4e02d 100644 --- a/src/external/glad/src/wgl.c +++ b/src/external/glad/src/wgl.c @@ -1,5 +1,5 @@ /** - * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 + * SPDX-License-Identifier: CC0-1.0 AND Apache-2.0 */ #include #include