From e2128f47112ed4b0fd6b096f67748ecccbe40978 Mon Sep 17 00:00:00 2001 From: KhronosWebservices Date: Mon, 8 Jun 2026 14:04:32 -0400 Subject: [PATCH 1/5] chore: Add CONTRIBUTING.adoc [skip ci] --- CONTRIBUTING.adoc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 CONTRIBUTING.adoc diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc new file mode 100644 index 0000000..ec60c41 --- /dev/null +++ b/CONTRIBUTING.adoc @@ -0,0 +1,23 @@ +// Copyright 2026 The Khronos Group Inc. +// SPDX-License-Identifier: CC-BY-4.0 + += Contributing + +Contributions to the GLSL repository are welcome. + +== Contributor License Agreement (CLA) + +When you propose a pull request on this repository you must execute a +Contributor License Agreement, to confirm you own your work and are granting +Khronos the necessary permissions to redistribute it under our licenses. + +== AI-Assisted Contributions + +By submitting a Contribution to this repository, you additionally represent +that, to the extent any of Your Contributions were developed with the +assistance of artificial intelligence tools or AI-generated code, You have +exercised sufficient review, judgment, and creative direction over such tools +and resulting material to reasonably consider it Your original creation, and +You are not aware of any third-party license, intellectual property claim, or +other restriction arising from such use that is associated with any part of +Your Contribution or use thereof. \ No newline at end of file From 4c71425ce28cb6748836522b4bb1419d2ca0bb0d Mon Sep 17 00:00:00 2001 From: KhronosWebservices Date: Mon, 8 Jun 2026 14:19:07 -0400 Subject: [PATCH 2/5] chore: Upgrade REUSE --- .reuse/dep5 | 27 --------------------------- REUSE.toml | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index d6f2717..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,27 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: GLSL -Source: https://github.com/KhronosGroup/GLSL - -Files: images/*.svg images/*.odg config/*/docinfo-header.html -Copyright: 2008-2024 The Khronos Group Inc. -License: CC-BY-4.0 - -Files: katex/* -Copyright: 2013-2019 Khan Academy and other contributors -License: MIT - -Files: config/khronos.css -Copyright: 2013 Dan Allen -License: MIT - -Files: config/fonts/* -Copyright: 2019 M+ Fonts Project -License: LicenseRef-MPLUS - -Files: config/copyright-spec.adoc -Copyright: 2014-2024 The Khronos Group Inc -License: LicenseRef-KhronosSpecCopyright - -Files: extensions/*/*.txt extensions/extension_headers/*.glsl -Copyright: Various dates, various Khronos Members -License: LicenseRef-Proprietary diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..cda084a --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,39 @@ +version = 1 +SPDX-PackageName = "GLSL" +SPDX-PackageDownloadLocation = "https://github.com/KhronosGroup/GLSL" + +[[annotations]] +path = ["images/**.svg", "images/**.odg", "config/**/docinfo-header.html", ".gitignore"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2008-2024 The Khronos Group Inc." +SPDX-License-Identifier = "CC-BY-4.0" + +[[annotations]] +path = "katex/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2013-2019 Khan Academy and other contributors" +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "config/khronos.css" +precedence = "aggregate" +SPDX-FileCopyrightText = "2013 Dan Allen" +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "config/fonts/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2019 M+ Fonts Project" +SPDX-License-Identifier = "LicenseRef-mplus" + +[[annotations]] +path = "config/copyright-spec.adoc" +precedence = "aggregate" +SPDX-FileCopyrightText = "2014-2024 The Khronos Group Inc" +SPDX-License-Identifier = "LicenseRef-KhronosSpecCopyright" + +[[annotations]] +path = ["extensions/**/**.txt", "extensions/extension_headers/**.glsl"] +precedence = "aggregate" +SPDX-FileCopyrightText = "Various dates, various Khronos Members" +SPDX-License-Identifier = "LicenseRef-Proprietary" From 059312e06835d76ce4a666df6b93a57112011113 Mon Sep 17 00:00:00 2001 From: KhronosWebservices Date: Mon, 8 Jun 2026 14:19:41 -0400 Subject: [PATCH 3/5] chore: Add reuse action to GitHub workflow --- .github/workflows/reuse-compliance.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/reuse-compliance.yml diff --git a/.github/workflows/reuse-compliance.yml b/.github/workflows/reuse-compliance.yml new file mode 100644 index 0000000..ba0d160 --- /dev/null +++ b/.github/workflows/reuse-compliance.yml @@ -0,0 +1,15 @@ +# SPDX-FileCopyrightText: 2026 The Khronos Group Inc. +# SPDX-License-Identifier: Apache-2.0 +--- +name: REUSE Compliance Check +on: [push, pull_request] +permissions: + contents: read +jobs: + reuse-compliance-check: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v6 From b58fb70dc8d0067a8e0e7f48922f4e2eb2a0a522 Mon Sep 17 00:00:00 2001 From: KhronosWebservices Date: Mon, 8 Jun 2026 14:20:13 -0400 Subject: [PATCH 4/5] chore: Add LicenseRef-mplus.txt to satisfy REUSE --- LICENSES/LicenseRef-mplus.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 LICENSES/LicenseRef-mplus.txt diff --git a/LICENSES/LicenseRef-mplus.txt b/LICENSES/LicenseRef-mplus.txt new file mode 100644 index 0000000..b53b622 --- /dev/null +++ b/LICENSES/LicenseRef-mplus.txt @@ -0,0 +1,3 @@ +These fonts are free software. Unlimited permission is granted to use, copy, and +distribute them, with or without modification, either commercially or +noncommercially. THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY. \ No newline at end of file From 12af0388d82ca7079946c8053e367bf112723e65 Mon Sep 17 00:00:00 2001 From: KhronosWebservices Date: Mon, 8 Jun 2026 14:23:02 -0400 Subject: [PATCH 5/5] chore: Upgrade actions/checkout to v5 --- .github/workflows/reuse-compliance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reuse-compliance.yml b/.github/workflows/reuse-compliance.yml index ba0d160..36e778f 100644 --- a/.github/workflows/reuse-compliance.yml +++ b/.github/workflows/reuse-compliance.yml @@ -10,6 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: REUSE Compliance Check uses: fsfe/reuse-action@v6