License and CLA change (#30)

* Change license and CLA. * Updated contact email in CODE_OF_CONDUCT.md * Added SPDX license header to all source files.
OpenTimelineIO · May 3, 2022 · 9745fe5 · 9745fe5
1 parent 78e52d9
commit 9745fe5
Show file tree

Hide file tree

Showing 122 changed files with 398 additions and 223 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opentimelineio-[email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opentimelineio-[email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
-
-                               Modified Apache 2.0 License
-
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -136,9 +136,9 @@
       with Licensor regarding such Contributions.
 
    6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor
-      and its affiliates, except as required to comply with Section 4(c) of
-      the License and to reproduce the content of the NOTICE file.
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
    7. Disclaimer of Warranty. Unless required by applicable law or
       agreed to in writing, Licensor provides the Work (and each
@@ -173,4 +173,29 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-OpenTimelineIO bundles ffmpeg_burnins.py, which is available under the MIT License.  For details contrib/adapters.
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/OTIO_CLA_Corporate.pdf b/OTIO_CLA_Corporate.pdf
diff --git a/OTIO_CLA_Individual.pdf b/OTIO_CLA_Individual.pdf
diff --git a/include/copentime/errorStatus.h b/include/copentime/errorStatus.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #ifdef __cplusplus

diff --git a/include/copentime/optionalOpenTime.h b/include/copentime/optionalOpenTime.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "rationalTime.h"

diff --git a/include/copentime/rationalTime.h b/include/copentime/rationalTime.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "copentime/errorStatus.h"

diff --git a/include/copentime/timeRange.h b/include/copentime/timeRange.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "rationalTime.h"

diff --git a/include/copentime/timeTransform.h b/include/copentime/timeTransform.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "rationalTime.h"

diff --git a/include/copentime/util.h b/include/copentime/util.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "rationalTime.h"

diff --git a/include/copentimelineio/any.h b/include/copentimelineio/any.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #ifdef __cplusplus

diff --git a/include/copentimelineio/anyDictionary.h b/include/copentimelineio/anyDictionary.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 #include "any.h"
 #include <stdbool.h>

diff --git a/include/copentimelineio/anyVector.h b/include/copentimelineio/anyVector.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "any.h"

diff --git a/include/copentimelineio/clip.h b/include/copentimelineio/clip.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "anyDictionary.h"

diff --git a/include/copentimelineio/composable.h b/include/copentimelineio/composable.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "anyDictionary.h"

diff --git a/include/copentimelineio/composableRetainerVector.h b/include/copentimelineio/composableRetainerVector.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "composable.h"

diff --git a/include/copentimelineio/composableVector.h b/include/copentimelineio/composableVector.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "composable.h"

diff --git a/include/copentimelineio/composition.h b/include/copentimelineio/composition.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "anyDictionary.h"

diff --git a/include/copentimelineio/deserialization.h b/include/copentimelineio/deserialization.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "any.h"

diff --git a/include/copentimelineio/effect.h b/include/copentimelineio/effect.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "anyDictionary.h"

diff --git a/include/copentimelineio/effectRetainerVector.h b/include/copentimelineio/effectRetainerVector.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "effect.h"

diff --git a/include/copentimelineio/effectVector.h b/include/copentimelineio/effectVector.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "effect.h"

diff --git a/include/copentimelineio/errorStatus.h b/include/copentimelineio/errorStatus.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
 #pragma once
 
 #include "serializableObject.h"