From f2e025b908639b01ffd940673b5d7f1bf00c68df Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Mon, 31 Jul 2023 22:18:56 -0700 Subject: [PATCH] admin: Relicense code under Apache 2.0 (#3938) This is Update 4, the original PR is ongoing and we will continue to update as additional people relicense. Per PR #3905 (https://github.com/OpenImageIO/oiio/pull/3905), update the RELICENSING document with the names of people and companies who have signed on to the relicensing thus far, and update the SPDX license notices on source files whose extant authorship (per 'git blame') comprises only authors who have relicensed. Signed-off-by: Larry Gritz --- RELICENSING.md | 10 +++++++++- src/ico.imageio/icooutput.cpp | 2 +- src/include/OpenImageIO/export.h | 2 +- src/libOpenImageIO/formatspec.cpp | 2 +- src/libOpenImageIO/imagebufalgo_test.cpp | 2 +- src/libOpenImageIO/imageinput.cpp | 2 +- src/libOpenImageIO/imageioplugin.cpp | 2 +- src/libOpenImageIO/imageoutput.cpp | 2 +- src/libtexture/texture_pvt.h | 2 +- src/libtexture/texturesys.cpp | 2 +- src/libutil/filesystem_test.cpp | 2 +- src/libutil/thread.cpp | 2 +- src/oiiotool/imagerec.cpp | 2 +- src/testtex/testtex.cpp | 2 +- testsuite/runtest.py | 2 +- testsuite/texture-wrapfill/run.py | 2 +- 16 files changed, 24 insertions(+), 16 deletions(-) diff --git a/RELICENSING.md b/RELICENSING.md index d388af5921..c4f92416ec 100644 --- a/RELICENSING.md +++ b/RELICENSING.md @@ -23,7 +23,7 @@ the Developer Certificate of Origin, version 1.1: - Nathan Rusch (nrusch) - Ismael Cortes (leamsi) - AdamMainsTL -- Sony Pictures Imageworks (cstein, olegul, fpsunflower, brianhall77, jeremyselan, drg, richardssam, lecocqp) +- Sony Pictures Imageworks (cmstein, olegul, fpsunflower, brianhall77, jeremyselan, drg, richardssam, lecocqp) - Richard Shaw (hobbes1069) - Robert Matusewicz - Mariusz Szczepańczyk (mszczepanczyk) @@ -111,6 +111,14 @@ the Developer Certificate of Origin, version 1.1: - Wētā - Kimball Thurston (kdt3rd) - Anders Langlands (anderslanglands) +- Алексей (Alexpux) +- Fabien Castan (fabiencastan) +- Grégoire De Lillo (gregoire-dl) +- Edgar Velázquez-Armendáriz (edgarv) +- Malcolm Humphreys (malcolmhumphreys) +- johnfea +- Max Liani (maxliani) +- Michael Görner (v4hn) **Prior authors, please submit a PR against this file that adds your name above. If, at the time of your prior contributions, you were employed by a diff --git a/src/ico.imageio/icooutput.cpp b/src/ico.imageio/icooutput.cpp index c07a700d98..7cf6ee507c 100644 --- a/src/ico.imageio/icooutput.cpp +++ b/src/ico.imageio/icooutput.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio #include diff --git a/src/include/OpenImageIO/export.h b/src/include/OpenImageIO/export.h index b2cdd7ffbc..d314350035 100644 --- a/src/include/OpenImageIO/export.h +++ b/src/include/OpenImageIO/export.h @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio diff --git a/src/libOpenImageIO/formatspec.cpp b/src/libOpenImageIO/formatspec.cpp index 51b4d68917..a28b2d8f7b 100644 --- a/src/libOpenImageIO/formatspec.cpp +++ b/src/libOpenImageIO/formatspec.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio #include diff --git a/src/libOpenImageIO/imagebufalgo_test.cpp b/src/libOpenImageIO/imagebufalgo_test.cpp index 1f3318cd0b..bdf8ca04a5 100644 --- a/src/libOpenImageIO/imagebufalgo_test.cpp +++ b/src/libOpenImageIO/imagebufalgo_test.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio diff --git a/src/libOpenImageIO/imageinput.cpp b/src/libOpenImageIO/imageinput.cpp index 003ca4f57d..c56428c971 100644 --- a/src/libOpenImageIO/imageinput.cpp +++ b/src/libOpenImageIO/imageinput.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio #include diff --git a/src/libOpenImageIO/imageioplugin.cpp b/src/libOpenImageIO/imageioplugin.cpp index 5172576f53..804ea6eee7 100644 --- a/src/libOpenImageIO/imageioplugin.cpp +++ b/src/libOpenImageIO/imageioplugin.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio #include diff --git a/src/libOpenImageIO/imageoutput.cpp b/src/libOpenImageIO/imageoutput.cpp index 5a1b93c55a..a9c00491bb 100644 --- a/src/libOpenImageIO/imageoutput.cpp +++ b/src/libOpenImageIO/imageoutput.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio #include diff --git a/src/libtexture/texture_pvt.h b/src/libtexture/texture_pvt.h index e4140a6844..df6ed58df7 100644 --- a/src/libtexture/texture_pvt.h +++ b/src/libtexture/texture_pvt.h @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio diff --git a/src/libtexture/texturesys.cpp b/src/libtexture/texturesys.cpp index 2f7478ca7e..6eab002ccd 100644 --- a/src/libtexture/texturesys.cpp +++ b/src/libtexture/texturesys.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio diff --git a/src/libutil/filesystem_test.cpp b/src/libutil/filesystem_test.cpp index 59bc077d16..b8372599ce 100644 --- a/src/libutil/filesystem_test.cpp +++ b/src/libutil/filesystem_test.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio #include diff --git a/src/libutil/thread.cpp b/src/libutil/thread.cpp index 1c8fe7bf21..3d2344876d 100644 --- a/src/libutil/thread.cpp +++ b/src/libutil/thread.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio diff --git a/src/oiiotool/imagerec.cpp b/src/oiiotool/imagerec.cpp index c7c49978b5..f7a381b7b3 100644 --- a/src/oiiotool/imagerec.cpp +++ b/src/oiiotool/imagerec.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio diff --git a/src/testtex/testtex.cpp b/src/testtex/testtex.cpp index cb556205be..a42b29faae 100644 --- a/src/testtex/testtex.cpp +++ b/src/testtex/testtex.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/OpenImageIO/oiio diff --git a/testsuite/runtest.py b/testsuite/runtest.py index 055fe5685d..b429edb01b 100755 --- a/testsuite/runtest.py +++ b/testsuite/runtest.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright Contributors to the OpenImageIO project. -# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +# SPDX-License-Identifier: Apache-2.0 # https://github.com/OpenImageIO/oiio from __future__ import print_function diff --git a/testsuite/texture-wrapfill/run.py b/testsuite/texture-wrapfill/run.py index 0051c6ee8e..32cb259350 100755 --- a/testsuite/texture-wrapfill/run.py +++ b/testsuite/texture-wrapfill/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright Contributors to the OpenImageIO project. -# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +# SPDX-License-Identifier: Apache-2.0 # https://github.com/OpenImageIO/oiio # This tests a particular tricky case: the interplay of "black" wrap mode