Skip to content

Commit 64f829f

Browse files
authored
admin: Relicense code under Apache 2.0 (AcademySoftwareFoundation#3905)
Some more updates to the relicensing. At this point, less than 0.15% of the codebase remains under the original BSD-3-clause license.
1 parent d249036 commit 64f829f

File tree

9 files changed

+21
-40
lines changed

9 files changed

+21
-40
lines changed

LICENSE-BSD.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ For original code, we use the [Apache-2.0 license](LICENSE.md), and for
8080
documentation, the [Creative Commons Attribution 4.0 Unported
8181
License](http://creativecommons.org/licenses/by/4.0/). In 2023 we asked
8282
historical users to [relicense](RELICENSING.md) from the original BSD-3-clause
83-
license to Apache-2.0, and over 99.75% of lines of code have been relicensed
83+
license to Apache-2.0, and over 99.86% of lines of code have been relicensed
8484
to Apache-2.0. A small amount of code incorporated into this repository from
8585
other projects are covered by compatible [third-party open source
8686
licenses](THIRD-PARTY.md).

RELICENSING.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ New code entering the OpenImageIO repository from July 1 2023 onward is
22
subject to the [Apache 2.0 license](LICENSE.md).
33

44
Code dating from earlier than July 1 2023 was contributed under the [BSD
5-
3-clause license](LICENSE-BSD-3-Clause.md), unless relicensed below.
5+
3-clause license](https://opensource.org/license/bsd-3-clause), unless
6+
relicensed below.
7+
8+
Stragglers who haven't relicensed yet, it's never too late, just sign onto the
9+
PR: https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/3905
610

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

141-
**Prior authors, please submit a PR against this file that adds your name
142-
above. If, at the time of your prior contributions, you were employed by a
148+
**Prior authors, please follow the directions for adding your name to
149+
[this PR](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/3905).
150+
If, at the time of your prior contributions, you were employed by a
143151
company who would have owned your IP output, then please have someone from
144152
that company who is authorized to do so submit a PR to add their company’s
145153
name to the list under the statement in this file.**

THIRD-PARTY.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ In no particular order:
99

1010
-------------------------------------------------------------------------
1111

12-
BSD 3-Clause License
12+
BSD 3-Clause License (https://opensource.org/license/bsd-3-clause)
1313
SPDX-License-Identifier: BSD-3-Clause
1414

1515
* OpenImageIO prior to July 1, 2023
1616

1717
Code that was contributed to OpenImageIO prior to July 1 2023, and has not
18-
yet been [relicensed](RELICENSING.md), was contributed under the [BSD
19-
3-clause license](LICENSE-BSD.md). Currently, this is less than 2% of the
20-
codebase (by lines of code).
18+
yet been [relicensed](RELICENSING.md), was contributed under the BSD
19+
3-clause license. Currently, less than 0.15% of the codebase (by lines of
20+
code) remains under this license.
2121

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

src/iconvert/iconvert.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright Contributors to the OpenImageIO project.
2-
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
2+
// SPDX-License-Identifier: Apache-2.0
33
// https://github.com/AcademySoftwareFoundation/OpenImageIO
44

55

src/include/OpenImageIO/platform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright Contributors to the OpenImageIO project.
2-
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
2+
// SPDX-License-Identifier: Apache-2.0
33
// https://github.com/AcademySoftwareFoundation/OpenImageIO
44

55

src/libtexture/imagecache.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright Contributors to the OpenImageIO project.
2-
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
2+
// SPDX-License-Identifier: Apache-2.0
33
// https://github.com/AcademySoftwareFoundation/OpenImageIO
44

55

src/oiiotool/oiiotool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright Contributors to the OpenImageIO project.
2-
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
2+
// SPDX-License-Identifier: Apache-2.0
33
// https://github.com/AcademySoftwareFoundation/OpenImageIO
44

55

src/python/py_imagebufalgo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright Contributors to the OpenImageIO project.
2-
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
2+
// SPDX-License-Identifier: Apache-2.0
33
// https://github.com/AcademySoftwareFoundation/OpenImageIO
44

55
#include "py_oiio.h"

0 commit comments

Comments
 (0)