Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

admin: Relicense code under Apache 2.0 #3905

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

lgritz
Copy link
Collaborator

@lgritz lgritz commented Jul 7, 2023

To help the effort to re-license this project under Apache 2.0, we are asking all historical contributors to OpenImageIO to please re-license their prior work to us under the new license. You still retain full ownership, we are not asking for a copyright assignment. Only that the prior code you licensed under BSD, that now you let us know it's fine to use Apache 2.0. I have already done this myself for all the code that I own.

If this is acceptable to you,

  • Add a COMMENT to this PR that says "all of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1."

If you were working at the time for an employer who owned your IP output or you submitted the code under the auspices of your company's CLA to the project, we'll also need a similar grant from somebody who can re-submit on behalf of the company. That can be you, if you are still at that company, as long as you check that relicensing under Apache 2.0 is ok with the company and they authorize you to do so. But if you're not authorized to re-license any commits owned by the company, please alert us to the situation so that we -- or better, you -- can contact somebody there to provide that piece.

Thank you so much, we would really appreciate it if you could do us this very quick favor.

@lgritz
Copy link
Collaborator Author

lgritz commented Jul 7, 2023

@inequation @robert-matusewicz @aras-p @dewyatt @leamsi Your participation here would be very helpful, because after me, you are some of the most prolific contributors who don't also need the clearance of a company because as far as I know, you were students or independent at the time of your large contributions.

And for some of you, YES, I know it has been many many years since you participated in this project. The fact that after all this time, you still represent some of the top authors in today's version of the software is testament to how important (and appreciated) your contributions have been. We could really use this one additional favor.

RELICENSING.md Outdated Show resolved Hide resolved
RELICENSING.md Outdated Show resolved Hide resolved
RELICENSING.md Outdated Show resolved Hide resolved
@inequation
Copy link
Contributor

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

I'm on mobile right now and can't seem to get the flow from point 2 working, so this comment will have to do. 🙂

RELICENSING.md Outdated Show resolved Hide resolved
RELICENSING.md Outdated Show resolved Hide resolved
@lgritz
Copy link
Collaborator Author

lgritz commented Jul 7, 2023

Don't worry, if you create a merge conflict, I will fix it by hand. The important thing is that by commenting/modifying on this ticket, we have the recording.

RELICENSING.md Outdated Show resolved Hide resolved
RELICENSING.md Outdated Show resolved Hide resolved
@AdamMainsTL
Copy link
Contributor

I don't know if my contributions are extensive enough to warrant this, but I will add this just in case.

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

RELICENSING.md Outdated Show resolved Hide resolved
@lgritz
Copy link
Collaborator Author

lgritz commented Jul 8, 2023

Thanks, everybody, for jumping on this quickly. We're already past 95% of the code base (counted by lines of code) relicensed. (Though it's less complete if you count file by file.)

Keep 'em coming! I would love to get to the point where there are only a handful of files or functions that have to be marked as a mix of licenses.

@hobbes1069
Copy link
Contributor

I've mostly only contributed CMake code but let me know if you need the standard statement from me.

@lgritz
Copy link
Collaborator Author

lgritz commented Jul 10, 2023

@hobbes1069 Yes, please, if it's not too much to ask.

We can deal with the eventuality of some code not being relicensed -- after all, that is already the case for the things that we have intentionally incorporated straight from other projects (and we are careful to label them as such). But all other things being equal, we would love to get as close to 100% as possible, both measured in number of lines, but also in minimizing the number of files that must be labeled as containing both BSD and Apache-2.0 code. So a couple lines here and there, while a minuscule portion of the code base, could easily be the last bit we need to mark a those files as being purely Apache-2.0.

@lgritz
Copy link
Collaborator Author

lgritz commented Jul 10, 2023

I got the ok from Sony Pictures Imageworks to relicense all the prior code it owns (that is, from everybody other than me who were working there at the time of their contributions).

@fpsunflower @marsupial : It's possible that you two may have made contributions before (Roman) or after (Chris) your time at SPI, so I think we still need you two to sign onto this to be sure it covers every one of your historical commits (or to say that you believe all your prior commits were for SPI), if you please. See the original comment of this PR for instructions.

@jeremyselan @lecocqp @olegul @aconty : I'm pretty sure SPI's relicensing completely covers you, but it would be nice if you could add an "I agree" comment (or to object, if for some reason you do) on this ticket just so it's recorded here for you individually as well.

I can't find Brian Hall and David Gordon on GitHub, maybe their contributions (which were all at SPI) predated our use of GitHub? I don't remember quite when we made that switch. I'll contact them separately by email.

RELICENSING.md Outdated Show resolved Hide resolved
RELICENSING.md Outdated Show resolved Hide resolved
@aconty
Copy link
Contributor

aconty commented Jul 11, 2023

I agree

@hobbes1069
Copy link
Contributor

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

@olegul
Copy link
Contributor

olegul commented Jul 11, 2023

I agree

@brianhall77
Copy link

I don't recall specifically what my contributions were, but anything I contributed between Dec 1999 and May 2015 is certainly covered by SPI's relicensing. I agree.

@jeremyselan
Copy link
Contributor

jeremyselan commented Jul 11, 2023

I agree.

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

@mszczepanczyk
Copy link
Contributor

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

@lgritz
Copy link
Collaborator Author

lgritz commented Sep 8, 2023

@lukh Aha, great, that clears it up, then. I think your commits only had your real name / email (at least as viewed by an ordinary "git log"), and not your GitHub ID associated with it, and your GitHub account doesn't give any clue about your real name. 😄

Thanks very much!

@lgritz
Copy link
Collaborator Author

lgritz commented Sep 9, 2023

I am making an executive decision that the following git blame attribution results are "artifacts" of the diff process and do not in fact represent actual code ownership:

  • Whitespace
  • An opening or closing brace where it MUST be to satisfy C++ syntax (such as the opening brace of a function).
  • A single #include directive of a header that MUST be included in that file.
  • A single typo fix correcting a misspelling or mis-capitalization to the correct word.

My rationale is that such trivial cases do not constitute protectable IP, and cannot be meaningfully "rewritten" to replace an author's material. (Example: If I totally delete your function and in its place put my completely rewritten and unrelated function, it will still end with the same required closing brace, git will think that line didn't change, and will retain your authorship on that one line forever, despite the fact that in no way is any of "your" code still in the file. We have several such situations.)

In source files where the only lines still attributed to an author who has not yet relicensed their historical contributions fall into one of the above cases, I'm going to go ahead and mark the file as entirely "Apache 2.0". It just doesn't make sense to represent a file as being Apache 2.0 licensed except for one } character which is BSD licensed.

@JGoldstone
Copy link
Contributor

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1

lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Sep 17, 2023
This is Update 5, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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 <lg@larrygritz.com>
lgritz added a commit that referenced this pull request Sep 20, 2023
This is Update 5, the original PR is ongoing and we will continue to
update as additional people relicense.

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.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
@melevine
Copy link
Contributor

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Sep 20, 2023
This is Update 5, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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 <lg@larrygritz.com>
lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Sep 20, 2023
This is Update 5, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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 <lg@larrygritz.com>
@cometyang
Copy link

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

@merwaaan
Copy link
Contributor

all of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Oct 29, 2023
This is Update 6, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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 <lg@larrygritz.com>
lgritz added a commit that referenced this pull request Nov 16, 2023
This is Update 6, the original PR is ongoing and we will continue to
update as additional people relicense.

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.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Nov 16, 2023
This is Update 6, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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 <lg@larrygritz.com>
@ghost
Copy link

ghost commented Nov 18, 2023

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed under the Apache License, Version 2.0, and are compliant with the Developer Certificate of Origin, version 1.1.

@ix-dcourtois
Copy link
Contributor

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed under the Apache License, Version 2.0, and are compliant with the Developer Certificate of Origin, version 1.1.

@crand
Copy link

crand commented Dec 19, 2023

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

@gmueckl
Copy link

gmueckl commented Feb 16, 2024

all of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Feb 16, 2024
This is Update 7, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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.

To the best of our estimation, we now have 99.85% of lines of code
relicensed, and 93.2% of all source files now consist of ONLY
Apache-2.0 licensed code with no traces of BSD remaining.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Feb 16, 2024
This is Update 7, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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.

To the best of our estimation, we now have 99.85% of lines of code
relicensed, and 93.2% of all source files now consist of ONLY
Apache-2.0 licensed code with no traces of BSD remaining.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
Signed-off-by: Larry Gritz <lg@larrygritz.com>
@@ -138,6 +138,8 @@ the Developer Certificate of Origin, version 1.1:
- Carl Rand (crand)
- Gregor Mückl (gmueckl)

...
Copy link
Contributor

@marsupial marsupial Feb 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1

-- Thanks!

lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Feb 20, 2024
This is Update 7, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#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.

To the best of our estimation, we now have 99.85% of lines of code
relicensed, and 93.2% of all source files now consist of ONLY
Apache-2.0 licensed code with no traces of BSD remaining.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
@jephill
Copy link
Contributor

jephill commented Feb 23, 2024

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

@johnhaddon
Copy link
Contributor

All of my contributions originally submitted to this project under the 3-Clause BSD License are hereby relicensed to the Apache License, Version 2.0, and are submitted pursuant to the Developer Certificate of Origin, version 1.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet