admin: Relicense code under Apache 2.0 (#3926)

Per PR #3905 (#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. This is part 2, the original PR is ongoing and we will continue to update as additional people relicense. Signed-off-by: Larry Gritz <lg@larrygritz.com> --------- Signed-off-by: Larry Gritz <lg@larrygritz.com>
AcademySoftwareFoundation · Jul 29, 2023 · d65eb65 · d65eb65
1 parent 88c10a9
commit d65eb65
Show file tree

Hide file tree

Showing 56 changed files with 114 additions and 270 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1 @@
+Claire Foster <aka.c42f@gmail.com> <chris42f@gmail.com>
diff --git a/LICENSE-APACHE.md b/LICENSE-APACHE.md
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,13 +1,3 @@
-New code entering the OpenImageIO repository from July 1 2023 onward is
-subject to the [Apache 2.0 license](LICENSE-APACHE.md), reproduced below.
-
-Code that was contributed to OpenImageIO prior to July 1 2023, and has not
-been [relicensed](RELICENSING.md), was contributed under the [BSD 3-clause
-license](LICENSE-BSD.md).
-
-
----
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
   <img src="ASWF/logos/openimageio-horizontal-gradient.png">
 </p>
 
-[![License](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md)
+[![License](https://img.shields.io/badge/license-Apache2.0-blue.svg?style=flat-square)](https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md)
 [![CI](https://github.com/OpenImageIO/oiio/actions/workflows/ci.yml/badge.svg)](https://github.com/OpenImageIO/oiio/actions/workflows/ci.yml)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2694/badge)](https://bestpractices.coreinfrastructure.org/projects/2694)
 [![latest packaged version(s)](https://repology.org/badge/latest-versions/openimageio.svg)](https://repology.org/project/openimageio/versions)
@@ -69,10 +69,13 @@ Licensing
 
 OpenImageIO is (c) Copyright Contributors to the OpenImageIO project.
 
-OpenImageIO is distributed using the [modified BSD license](LICENSE.md)
-(also known as the "new BSD" or "3-clause BSD" license).  The documentation
-is licensed under the [Creative Commons Attribution 3.0 Unported
-License](http://creativecommons.org/licenses/by/3.0/).
+OpenImageIO is distributed using primarily the Apache 2.0 license -- see the
+[LICENSE.md](LICENSE.md) file for details.  The documentation is licensed
+under the [Creative Commons Attribution 4.0 Unported
+License](http://creativecommons.org/licenses/by/4.0/). A small amount of code
+imported from other projects, and also some pre-July-2023 code that has not
+yet been relicensed under Apache-2.0, is covered by other compatible licenses
+-- see [THIRD-PARTY](THIRD-PARTY.md) file for details.
 
 The plain English bottom line is that OpenImageIO is free, as well as
 freely modifiable and redistributable (in both source and binary form).
@@ -129,7 +132,7 @@ security-related issues [security@openimageio.org](security@openimageio.org).
 Contributing
 ------------
 
-OpenImageIO welcomes code contributions, and [nearly 150 people](CREDITS.md)
+OpenImageIO welcomes code contributions, and [nearly 200 people](CREDITS.md)
 have done so over the years. We take code contributions via the usual GitHub
 pull request (PR) mechanism. Please see [CONTRIBUTING](CONTRIBUTING.md) for
 detailed instructions.

diff --git a/RELICENSING.md b/RELICENSING.md
@@ -1,5 +1,5 @@
 New code entering the OpenImageIO repository from July 1 2023 onward is
-subject to the [Apache 2.0 license](LICENSE-Apache-2.0.md).
+subject to the [Apache 2.0 license](LICENSE.md).
 
 Code dating from earlier than July 1 2023 was contributed under the [BSD
 3-clause license](LICENSE-BSD-3-Clause.md), unless relicensed below.
@@ -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)
+- Sony Pictures Imageworks (cstein, olegul, fpsunflower, brianhall77, jeremyselan, drg)
 - Richard Shaw (hobbes1069)
 - Robert Matusewicz
 - Mariusz Szczepańczyk (mszczepanczyk)
@@ -41,6 +41,50 @@ the Developer Certificate of Origin, version 1.1:
 - Autodesk (includes Thiago Ize, Elvic Liang, Wayne Arnold, William Krick, Brecht Van Lommel, Marcos Fajardo)
 - Thiago Ize
 - Nick Black (dankamongmen)
+- Michel Lerenard (micler)
+- Stefan Bruens (StefanBruens)
+- David Gordon
+- Claire Foster (c42f)
+- Konrad Kleine (kwk)
+- Simone Gasparini (simogasp)
+- Radu Arjocu (ra-mt)
+- Dominik Bartkiewicz (fafik23)
+- 360highdynamicrangehdr (?)
+- Leonid Onokhov (sopvop)
+- Nuno Cardoso (npcardoso)
+- Todica Ionut (360highdynamicrangehdr)
+- Till Dechent (ttddee)
+- Tom Knowles (knowlsie)
+- SRHMorris
+- Biswapriyo Nath (Biswa96)
+- Edoardo Dominici (dedoardo)
+- Frédéric Devernay (devernay)
+- Simone Gasparini (simogasp)
+- roelandschoukens
+- Nayden Dochev (nayyden)
+- Yann Lanthony (yann-lty)
+- Benjamin Buch (bebuch)
+- Joris Nijs (joris-nijs)
+- Jan Honsbrok (Latios96)
+- Matteo F. Vescovi (mfvescovi)
+- Patrick Northon (patlefort)
+- Eric Mehl (ericmehl)
+- Xo Wang (GHF)
+- etiam
+- Fabien Servant (servantftechnicolor)
+- Loïc Vital (mugulmd)
+- Thomas Mansencal (Wētā FX)
+- Brent Davis (btdavis)
+- pwm1234-sri
+- toxieainc
+- demoulinv
+- Julien Enche (jenche)
+- Justin Israel
+- xiaoxiaoafeifei
+- Brad Smith (brad0)
+- lmarz
+- Seifeddine Dridi (seifeddinedridi)
+- Daniel Dresser (danieldresser)
 - Luc Bournaud (DevilishSpirits)
 
 **Prior authors, please submit a PR against this file that adds your name

diff --git a/THIRD-PARTY.md b/THIRD-PARTY.md
@@ -1,5 +1,5 @@
 See [LICENSE.md](LICENSE.md) for the main open source license of original
-code written for the OpenImageIO project.
+code written for the OpenImageIO project, which is the Apache-2.0 license.
 
 The remainder of this file reproduces the open source licensing details
 of other projects that have been imported, incorporated into, or derived
@@ -12,6 +12,13 @@ In no particular order:
 BSD 3-Clause License
 SPDX-License-Identifier: BSD-3-Clause
 
+* OpenImageIO prior to July 1, 2023
+
+  Code that was contributed to OpenImageIO prior to July 1 2023, and has not
+  yet been [relicensed](RELICENSING.md), was contributed under the [BSD
+  3-clause license](LICENSE-BSD.md). Currently, this is less than 2% of the
+  codebase (by lines of code).
+
 * Gelato, Copyright (c) 2004 by NVIDIA Corp.
 
   The initial (version 0.1) code found in imageio.h, fmath.h, filter.h,

diff --git a/src/bmp.imageio/bmp_pvt.cpp b/src/bmp.imageio/bmp_pvt.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/bmp.imageio/bmp_pvt.h b/src/bmp.imageio/bmp_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
 
 #pragma once

diff --git a/src/bmp.imageio/bmpinput.cpp b/src/bmp.imageio/bmpinput.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 <cstdio>

diff --git a/src/build-scripts/build_opencolorio.bash b/src/build-scripts/build_opencolorio.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 OpenColorIO

diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
@@ -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
 
 @PACKAGE_INIT@

diff --git a/src/cmake/compiler.cmake b/src/cmake/compiler.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
 
 ###########################################################################

diff --git a/src/dds.imageio/ddsinput.cpp b/src/dds.imageio/ddsinput.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 <cmath>

diff --git a/src/doc/CMakeLists.txt b/src/doc/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
 
 project(documentation)