Skip to content

Commit

Permalink
admin: Relicense code under Apache 2.0 (#3905)
Browse files Browse the repository at this point in the history
Some more updates to the relicensing. At this point, less than 0.15% of the codebase remains under the original BSD-3-clause license.
  • Loading branch information
lgritz authored Aug 10, 2024
1 parent d249036 commit 64f829f
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 40 deletions.
27 changes: 0 additions & 27 deletions LICENSE-BSD.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ For original code, we use the [Apache-2.0 license](LICENSE.md), and for
documentation, the [Creative Commons Attribution 4.0 Unported
License](http://creativecommons.org/licenses/by/4.0/). In 2023 we asked
historical users to [relicense](RELICENSING.md) from the original BSD-3-clause
license to Apache-2.0, and over 99.75% of lines of code have been relicensed
license to Apache-2.0, and over 99.86% of lines of code have been relicensed
to Apache-2.0. A small amount of code incorporated into this repository from
other projects are covered by compatible [third-party open source
licenses](THIRD-PARTY.md).
Expand Down
14 changes: 11 additions & 3 deletions RELICENSING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ New code entering the OpenImageIO repository from July 1 2023 onward is
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.
3-clause license](https://opensource.org/license/bsd-3-clause), unless
relicensed below.

Stragglers who haven't relicensed yet, it's never too late, just sign onto the
PR: https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/3905

The following copyright holders agree that all of their contributions
originally submitted to this project under the 3-Clause BSD License are hereby
Expand Down Expand Up @@ -137,9 +141,13 @@ the Developer Certificate of Origin, version 1.1:
- Damien Courtois (ix-dcourtois)
- Carl Rand (crand)
- Gregor Mückl (gmueckl)
- Jep Hill (jephill)
- John Haddon (johnhaddon)
...

**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
**Prior authors, please follow the directions for adding your name to
[this PR](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/3905).
If, at the time of your prior contributions, you were employed by a
company who would have owned your IP output, then please have someone from
that company who is authorized to do so submit a PR to add their company’s
name to the list under the statement in this file.**
Expand Down
8 changes: 4 additions & 4 deletions THIRD-PARTY.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ In no particular order:

-------------------------------------------------------------------------

BSD 3-Clause License
BSD 3-Clause License (https://opensource.org/license/bsd-3-clause)
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).
yet been [relicensed](RELICENSING.md), was contributed under the BSD
3-clause license. Currently, less than 0.15% of the codebase (by lines of
code) remains under this license.

* Gelato, Copyright (c) 2004 by NVIDIA Corp.

Expand Down
2 changes: 1 addition & 1 deletion src/iconvert/iconvert.cpp
Original file line number Diff line number Diff line change
@@ -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/AcademySoftwareFoundation/OpenImageIO


Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/platform.h
Original file line number Diff line number Diff line change
@@ -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/AcademySoftwareFoundation/OpenImageIO


Expand Down
2 changes: 1 addition & 1 deletion src/libtexture/imagecache.cpp
Original file line number Diff line number Diff line change
@@ -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/AcademySoftwareFoundation/OpenImageIO


Expand Down
2 changes: 1 addition & 1 deletion src/oiiotool/oiiotool.h
Original file line number Diff line number Diff line change
@@ -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/AcademySoftwareFoundation/OpenImageIO


Expand Down
2 changes: 1 addition & 1 deletion src/python/py_imagebufalgo.cpp
Original file line number Diff line number Diff line change
@@ -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/AcademySoftwareFoundation/OpenImageIO

#include "py_oiio.h"
Expand Down

0 comments on commit 64f829f

Please sign in to comment.