From 6d2b4194e7bc309bae75753b4a50077f93075e78 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Thu, 3 Aug 2023 21:01:32 -0700 Subject: [PATCH] admin: Relicense code under Apache 2.0 (#3938) This is Update 3, 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 | 27 ++++++++++++++++++++- src/build-scripts/build_OpenJPEG.bash | 2 +- src/build-scripts/build_gif.bash | 2 +- src/build-scripts/build_libjpeg-turbo.bash | 2 +- src/build-scripts/build_libpng.bash | 2 +- src/build-scripts/build_libraw.bash | 2 +- src/build-scripts/build_libtiff.bash | 2 +- src/build-scripts/build_pugixml.bash | 2 +- src/build-scripts/build_pybind11.bash | 2 +- src/build-scripts/build_webp.bash | 2 +- src/build-scripts/build_zlib.bash | 2 +- src/cmake/modules/FindOpenCV.cmake | 2 +- src/cmake/pythonutils.cmake | 2 +- src/dpx.imageio/dpxinput.cpp | 2 +- src/gif.imageio/gifinput.cpp | 2 +- src/heif.imageio/heifinput.cpp | 2 +- src/heif.imageio/heifoutput.cpp | 2 +- src/include/OpenImageIO/filesystem.h | 2 +- src/include/OpenImageIO/imagebufalgo_util.h | 2 +- src/include/OpenImageIO/strutil.h | 2 +- src/libOpenImageIO/color_ocio.cpp | 2 +- src/libOpenImageIO/imageinout_test.cpp | 2 +- src/libOpenImageIO/imagespec_test.cpp | 2 +- src/libOpenImageIO/iptc.cpp | 2 +- src/libutil/strutil.cpp | 2 +- src/libutil/strutil_test.cpp | 2 +- src/libutil/ustring.cpp | 2 +- src/maketx/maketx.cpp | 2 +- src/openexr.imageio/exrinput_c.cpp | 2 +- src/ptex.imageio/CMakeLists.txt | 2 +- testsuite/heif/run.py | 2 +- testsuite/maketx/run.py | 2 +- testsuite/oiiotool-maketx/run.py | 2 +- 33 files changed, 58 insertions(+), 33 deletions(-) diff --git a/RELICENSING.md b/RELICENSING.md index 24b50d593b..d388af5921 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) +- Sony Pictures Imageworks (cstein, olegul, fpsunflower, brianhall77, jeremyselan, drg, richardssam, lecocqp) - Richard Shaw (hobbes1069) - Robert Matusewicz - Mariusz Szczepańczyk (mszczepanczyk) @@ -86,6 +86,31 @@ the Developer Certificate of Origin, version 1.1: - Seifeddine Dridi (seifeddinedridi) - Daniel Dresser (danieldresser) - Luc Bournaud (DevilishSpirits) +- Dennis Schridde (devurandom) +- Dieter De Baets (debaetsd) +- Gonzalo Garramuño (ggarra13) +- Alan Jones (@skyphyr) +- pumkinpal +- Christopher Crosetto (ccrosetto) +- Russell Greene (russelltg) +- Sam Richards (richardssam) +- Guillaume Chatelet (gchatelet) +- extrowerk +- Heiko Becker (heirecka) +- Mark Visser (mjmvisser) +- Harry Mallon (hjmallon) +- Henri Fousse (darkhorse64) +- Krzysztof Blicharski (blicharski) +- Hugh Macdonald (HughMacdonald) +- Pascal Lecocq (lecocqp) +- Ramon Montoya Vozmediano (rmv) +- Dan Wexler (danwexler) +- Jérôme Duval (korli) +- Tim Grant (timgrant) +- Shane Ambler (sambler) +- Wētā +- Kimball Thurston (kdt3rd) +- Anders Langlands (anderslanglands) **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/build-scripts/build_OpenJPEG.bash b/src/build-scripts/build_OpenJPEG.bash index ed43fff81f..6f0b162a53 100755 --- a/src/build-scripts/build_OpenJPEG.bash +++ b/src/build-scripts/build_OpenJPEG.bash @@ -3,7 +3,7 @@ # Utility script to download and build OpenJPEG # # 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 # Exit the whole script if any command fails. diff --git a/src/build-scripts/build_gif.bash b/src/build-scripts/build_gif.bash index 330e12c1c9..ee360d7a10 100755 --- a/src/build-scripts/build_gif.bash +++ b/src/build-scripts/build_gif.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # 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 # Utility script to download and build giflib diff --git a/src/build-scripts/build_libjpeg-turbo.bash b/src/build-scripts/build_libjpeg-turbo.bash index 52f5f5138c..ac357b2cc6 100755 --- a/src/build-scripts/build_libjpeg-turbo.bash +++ b/src/build-scripts/build_libjpeg-turbo.bash @@ -3,7 +3,7 @@ # Utility script to download and build libjpeg-turbo # # 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 # Exit the whole script if any command fails. diff --git a/src/build-scripts/build_libpng.bash b/src/build-scripts/build_libpng.bash index a608a594a8..9a38c3d2f9 100755 --- a/src/build-scripts/build_libpng.bash +++ b/src/build-scripts/build_libpng.bash @@ -3,7 +3,7 @@ # Utility script to download and build libpng # # 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 # Exit the whole script if any command fails. diff --git a/src/build-scripts/build_libraw.bash b/src/build-scripts/build_libraw.bash index 71c1887958..403aef4d67 100755 --- a/src/build-scripts/build_libraw.bash +++ b/src/build-scripts/build_libraw.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # 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 # Utility script to download and build LibRaw diff --git a/src/build-scripts/build_libtiff.bash b/src/build-scripts/build_libtiff.bash index 0f6bf90d28..fb4a2a88a6 100755 --- a/src/build-scripts/build_libtiff.bash +++ b/src/build-scripts/build_libtiff.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # 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 # Utility script to download and build libtiff diff --git a/src/build-scripts/build_pugixml.bash b/src/build-scripts/build_pugixml.bash index 0467fb2e76..3f7ad554ab 100755 --- a/src/build-scripts/build_pugixml.bash +++ b/src/build-scripts/build_pugixml.bash @@ -3,7 +3,7 @@ # Utility script to download and build pugixml # # 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 # Exit the whole script if any command fails. diff --git a/src/build-scripts/build_pybind11.bash b/src/build-scripts/build_pybind11.bash index 58d555870f..4b5098e56f 100755 --- a/src/build-scripts/build_pybind11.bash +++ b/src/build-scripts/build_pybind11.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # 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 # Utility script to download and build pybind11 diff --git a/src/build-scripts/build_webp.bash b/src/build-scripts/build_webp.bash index dbb48e0baf..993c46c5c7 100755 --- a/src/build-scripts/build_webp.bash +++ b/src/build-scripts/build_webp.bash @@ -3,7 +3,7 @@ # Utility script to download and build webp # # 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 # Exit the whole script if any command fails. diff --git a/src/build-scripts/build_zlib.bash b/src/build-scripts/build_zlib.bash index e1e29f4753..35d5e5aaa0 100755 --- a/src/build-scripts/build_zlib.bash +++ b/src/build-scripts/build_zlib.bash @@ -3,7 +3,7 @@ # Utility script to download and build zlib # # 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 # Exit the whole script if any command fails. diff --git a/src/cmake/modules/FindOpenCV.cmake b/src/cmake/modules/FindOpenCV.cmake index 5a1e573bdd..6cb1466661 100644 --- a/src/cmake/modules/FindOpenCV.cmake +++ b/src/cmake/modules/FindOpenCV.cmake @@ -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 # - Find OpenCV diff --git a/src/cmake/pythonutils.cmake b/src/cmake/pythonutils.cmake index 7c8a23db61..0a2516f2d1 100644 --- a/src/cmake/pythonutils.cmake +++ b/src/cmake/pythonutils.cmake @@ -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 # Python-related options. diff --git a/src/dpx.imageio/dpxinput.cpp b/src/dpx.imageio/dpxinput.cpp index 8e660e8bf7..377742f07a 100644 --- a/src/dpx.imageio/dpxinput.cpp +++ b/src/dpx.imageio/dpxinput.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/gif.imageio/gifinput.cpp b/src/gif.imageio/gifinput.cpp index 3da97c3878..3530296389 100644 --- a/src/gif.imageio/gifinput.cpp +++ b/src/gif.imageio/gifinput.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/heif.imageio/heifinput.cpp b/src/heif.imageio/heifinput.cpp index 1d6f5c5102..e100a22b65 100644 --- a/src/heif.imageio/heifinput.cpp +++ b/src/heif.imageio/heifinput.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/heif.imageio/heifoutput.cpp b/src/heif.imageio/heifoutput.cpp index a019d22d7b..fe93b34e82 100644 --- a/src/heif.imageio/heifoutput.cpp +++ b/src/heif.imageio/heifoutput.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/include/OpenImageIO/filesystem.h b/src/include/OpenImageIO/filesystem.h index cf7e66c3e6..cea5fb02d9 100644 --- a/src/include/OpenImageIO/filesystem.h +++ b/src/include/OpenImageIO/filesystem.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 // clang-format off diff --git a/src/include/OpenImageIO/imagebufalgo_util.h b/src/include/OpenImageIO/imagebufalgo_util.h index 365dfd6c11..804613daa0 100644 --- a/src/include/OpenImageIO/imagebufalgo_util.h +++ b/src/include/OpenImageIO/imagebufalgo_util.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/include/OpenImageIO/strutil.h b/src/include/OpenImageIO/strutil.h index 400c48bd8d..6de8971698 100644 --- a/src/include/OpenImageIO/strutil.h +++ b/src/include/OpenImageIO/strutil.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 // clang-format off diff --git a/src/libOpenImageIO/color_ocio.cpp b/src/libOpenImageIO/color_ocio.cpp index 269b76aad3..6abc4c71dd 100644 --- a/src/libOpenImageIO/color_ocio.cpp +++ b/src/libOpenImageIO/color_ocio.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/imageinout_test.cpp b/src/libOpenImageIO/imageinout_test.cpp index 1647dbb268..90a96e35f9 100644 --- a/src/libOpenImageIO/imageinout_test.cpp +++ b/src/libOpenImageIO/imageinout_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/imagespec_test.cpp b/src/libOpenImageIO/imagespec_test.cpp index 6fb9f514d8..95ec224a71 100644 --- a/src/libOpenImageIO/imagespec_test.cpp +++ b/src/libOpenImageIO/imagespec_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/iptc.cpp b/src/libOpenImageIO/iptc.cpp index 150bc83448..51882a3044 100644 --- a/src/libOpenImageIO/iptc.cpp +++ b/src/libOpenImageIO/iptc.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/strutil.cpp b/src/libutil/strutil.cpp index a5398ab58a..076ad542eb 100644 --- a/src/libutil/strutil.cpp +++ b/src/libutil/strutil.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/strutil_test.cpp b/src/libutil/strutil_test.cpp index 075940d8b6..6fcfcf2f90 100644 --- a/src/libutil/strutil_test.cpp +++ b/src/libutil/strutil_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 // clang-format off diff --git a/src/libutil/ustring.cpp b/src/libutil/ustring.cpp index ee842ef51b..283ce7ae58 100644 --- a/src/libutil/ustring.cpp +++ b/src/libutil/ustring.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/maketx/maketx.cpp b/src/maketx/maketx.cpp index 10326f405a..f0c0982c28 100644 --- a/src/maketx/maketx.cpp +++ b/src/maketx/maketx.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/openexr.imageio/exrinput_c.cpp b/src/openexr.imageio/exrinput_c.cpp index da13846e08..421ad0ee69 100644 --- a/src/openexr.imageio/exrinput_c.cpp +++ b/src/openexr.imageio/exrinput_c.cpp @@ -1,5 +1,5 @@ // Copyright 2021-present 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/ptex.imageio/CMakeLists.txt b/src/ptex.imageio/CMakeLists.txt index 321532abf8..eac3fb4aff 100644 --- a/src/ptex.imageio/CMakeLists.txt +++ b/src/ptex.imageio/CMakeLists.txt @@ -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 if (Ptex_FOUND) diff --git a/testsuite/heif/run.py b/testsuite/heif/run.py index 64859c219a..94d86e8c86 100755 --- a/testsuite/heif/run.py +++ b/testsuite/heif/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 imagedir = "ref/" diff --git a/testsuite/maketx/run.py b/testsuite/maketx/run.py index 0c5e541a07..24dd41d83d 100755 --- a/testsuite/maketx/run.py +++ b/testsuite/maketx/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 failureok = 1 diff --git a/testsuite/oiiotool-maketx/run.py b/testsuite/oiiotool-maketx/run.py index e0de9d9b6f..5d536ed031 100755 --- a/testsuite/oiiotool-maketx/run.py +++ b/testsuite/oiiotool-maketx/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 # Construct a command that will create a texture, appending console