diff --git a/.gitattributes b/.gitattributes index ca85b46..41eae37 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,11 @@ +# ~~~ +# Copyright 2018-2023 The Khronos Group Inc. +# Copyright 2018-2023 Valve Corporation +# Copyright 2018-2023 LunarG, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# ~~~ + # See https://git-scm.com/docs/gitattributes # See https://help.github.com/articles/dealing-with-line-endings/ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a15e439..38fc0b7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,16 +1,6 @@ -# Copyright (c) 2022-2023 LunarG, 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 +# Copyright 2022-2023 LunarG, Inc. # -# 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. +# SPDX-License-Identifier: Apache-2.0 name: Linux @@ -74,3 +64,10 @@ jobs: run: cmake -S tests/add_subdirectory -B tests/add_subdirectory/build - name: Build run: cmake --build tests/add_subdirectory/build + + reuse: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v1 diff --git a/.gitignore b/.gitignore index 61df001..7f6900b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +# ~~~ +# Copyright 2018-2023 The Khronos Group Inc. +# Copyright 2018-2023 Valve Corporation +# Copyright 2018-2023 LunarG, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# ~~~ + # Python cache __pycache__ *.pyc diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..c17fc8d --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,19 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Vulkan-Headers +Source: https://github.com/KhronosGroup/Vulkan-Headers + +Files: registry/profiles/VP_KHR_roadmap_2022.json +Copyright: 2022-2023 The Khronos Group Inc. +License: Apache-2.0 + +Files: registry/validusage.json +Copyright: 2018-2023 The Khronos Group Inc. +License: Apache-2.0 + +Files: .github/ISSUE_TEMPLATE/bug_report.md .github/pull_request_template.md +Copyright: 2022-2023 The Khronos Group Inc. +License: Apache-2.0 + +Files: BUILD.md CODE_OF_CONDUCT.md CONTRIBUTING.md INTEGRATION.md README.md +Copyright: 2018-2023 The Khronos Group Inc. +License: Apache-2.0 diff --git a/BUILD.gn b/BUILD.gn index 2203257..8a05777 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1,17 +1,7 @@ -# Copyright (C) 2018-2023 The ANGLE Project Authors. -# Copyright (C) 2019-2023 LunarG, Inc. +# Copyright 2018-2023 The ANGLE Project Authors. +# Copyright 2019-2023 LunarG, 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 -# -# https://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. +# SPDX-License-Identifier: Apache-2.0 import("//build_overrides/vulkan_headers.gni") diff --git a/CMakeLists.txt b/CMakeLists.txt index b3db540..5d9317f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,9 @@ # ~~~ -# Copyright (c) 2018-2023 Valve Corporation -# Copyright (c) 2018-2023 LunarG, Inc. +# Copyright 2018-2023 The Khronos Group Inc. +# Copyright 2018-2023 Valve Corporation +# Copyright 2018-2023 LunarG, 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. +# SPDX-License-Identifier: Apache-2.0 # ~~~ cmake_minimum_required(VERSION 3.15...3.25) diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..d6a0648 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,18 @@ +Copyright 2015-2023 The Khronos Group Inc. + +Files in this repository fall under one of these licenses: + +- `Apache-2.0` +- `MIT` + +Note: With the exception of `parse_dependency.py` the files using `MIT` license +also fall under `Apache-2.0`. Example: + +``` +SPDX-License-Identifier: Apache-2.0 OR MIT +``` + +Full license text of these licenses is available at: + + * Apache-2.0: https://opensource.org/licenses/Apache-2.0 + * MIT: https://opensource.org/licenses/MIT diff --git a/LICENSE.txt b/LICENSES/Apache-2.0.txt similarity index 100% rename from LICENSE.txt rename to LICENSES/Apache-2.0.txt diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 0000000..8495fe9 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2015-2023 The Khronos Group Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/include/vulkan/vk_icd.h b/include/vulkan/vk_icd.h index 2cd6c3d..59204a3 100644 --- a/include/vulkan/vk_icd.h +++ b/include/vulkan/vk_icd.h @@ -1,23 +1,9 @@ -// -// File: vk_icd.h -// /* - * Copyright (c) 2015-2023 LunarG, Inc. - * Copyright (c) 2015-2023 The Khronos Group Inc. - * Copyright (c) 2015-2023 Valve 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 - * - * 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. + * Copyright 2015-2023 The Khronos Group Inc. + * Copyright 2015-2023 Valve Corporation + * Copyright 2015-2023 LunarG, Inc. * + * SPDX-License-Identifier: Apache-2.0 */ #pragma once diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h index 7954f71..19d88fc 100644 --- a/include/vulkan/vk_layer.h +++ b/include/vulkan/vk_layer.h @@ -1,23 +1,9 @@ -// -// File: vk_layer.h -// /* - * Copyright (c) 2015-2023 LunarG, Inc. - * Copyright (c) 2015-2023 The Khronos Group Inc. - * Copyright (c) 2015-2023 Valve 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 - * - * 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. + * Copyright 2015-2023 The Khronos Group Inc. + * Copyright 2015-2023 Valve Corporation + * Copyright 2015-2023 LunarG, Inc. * + * SPDX-License-Identifier: Apache-2.0 */ #pragma once diff --git a/registry/spec_tools/util.py b/registry/spec_tools/util.py index bf25845..a607dd2 100644 --- a/registry/spec_tools/util.py +++ b/registry/spec_tools/util.py @@ -1,5 +1,5 @@ """Utility functions not closely tied to other spec_tools types.""" -# Copyright (c) 2018-2019 Collabora, Ltd. +# Copyright 2018-2019 Collabora, Ltd. # Copyright 2013-2023 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e24f3d2..85afe76 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,17 +1,9 @@ # ~~~ -# Copyright (c) 2022-2023 LunarG, Inc. +# Copyright 2022-2023 The Khronos Group Inc. +# Copyright 2022-2023 Valve Corporation +# Copyright 2022-2023 LunarG, 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. +# SPDX-License-Identifier: Apache-2.0 # ~~~ # Test the non-API headers provided by this repo diff --git a/tests/add_subdirectory/CMakeLists.txt b/tests/add_subdirectory/CMakeLists.txt index cb8fdcc..286c36e 100644 --- a/tests/add_subdirectory/CMakeLists.txt +++ b/tests/add_subdirectory/CMakeLists.txt @@ -1,3 +1,10 @@ +# ~~~ +# Copyright 2022-2023 The Khronos Group Inc. +# Copyright 2022-2023 Valve Corporation +# Copyright 2022-2023 LunarG, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# ~~~ cmake_minimum_required(VERSION 3.14.2) project(TEST_VULKAN_HEADERS_ADD_SUBDIRECTORY_SUPPORT LANGUAGES C) diff --git a/tests/find_package/CMakeLists.txt b/tests/find_package/CMakeLists.txt index f45fc6c..c1a9900 100644 --- a/tests/find_package/CMakeLists.txt +++ b/tests/find_package/CMakeLists.txt @@ -1,3 +1,10 @@ +# ~~~ +# Copyright 2022-2023 The Khronos Group Inc. +# Copyright 2022-2023 Valve Corporation +# Copyright 2022-2023 LunarG, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# ~~~ cmake_minimum_required(VERSION 3.14.2) project(TEST_VULKAN_HEADERS_FIND_PACKAGE_SUPPORT LANGUAGES C) diff --git a/tests/vk_icd.c b/tests/vk_icd.c index 23766e5..de29d36 100644 --- a/tests/vk_icd.c +++ b/tests/vk_icd.c @@ -1,3 +1,11 @@ +/* + * Copyright 2022-2023 The Khronos Group Inc. + * Copyright 2022-2023 Valve Corporation + * Copyright 2022-2023 LunarG, Inc. + * + * SPDX-License-Identifier: Apache-2.0 + */ + #include "vulkan/vk_icd.h" int main() diff --git a/tests/vk_layer.c b/tests/vk_layer.c index df2bc09..490beb3 100644 --- a/tests/vk_layer.c +++ b/tests/vk_layer.c @@ -1,3 +1,11 @@ +/* + * Copyright 2022-2023 The Khronos Group Inc. + * Copyright 2022-2023 Valve Corporation + * Copyright 2022-2023 LunarG, Inc. + * + * SPDX-License-Identifier: Apache-2.0 + */ + #include "vulkan/vk_layer.h" int foobar()