Skip to content

Commit

Permalink
admin: Relicense code under Apache 2.0 (#3989)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
lgritz committed Sep 20, 2023
1 parent b3ac0a2 commit 86186b8
Show file tree
Hide file tree
Showing 26 changed files with 35 additions and 26 deletions.
10 changes: 10 additions & 0 deletions RELICENSING.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,16 @@ the Developer Certificate of Origin, version 1.1:
- johnfea
- Max Liani (maxliani)
- Michael Görner (v4hn)
- Philip Nemec (p-nemec)
- Google
- Nandan Dubey (ndubey)
- NVIDIA
- Jonathan Hearn (splidje)
- Michael Root
- Ott Tinn
- Lukas Shrangl (luhk)
- Manuel Gamito (mgamito)
- Rémi Achard (remia)

**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
Expand Down
3 changes: 1 addition & 2 deletions src/build-scripts/build_openexr.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build OpenEXR & IlmBase

# 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

# Exit the whole script if any command fails.
Expand All @@ -28,7 +28,6 @@ echo "Building OpenEXR ${OPENEXR_VERSION}"
echo "OpenEXR build dir will be: ${OPENEXR_BUILD_DIR}"
echo "OpenEXR install dir will be: ${OPENEXR_INSTALL_DIR}"
echo "OpenEXR Build type is ${OPENEXR_BUILD_TYPE}"
echo "CMAKE_PREFIX_PATH is ${CMAKE_PREFIX_PATH}"

# Clone OpenEXR project (including IlmBase) from GitHub and build
if [[ ! -e ${OPENEXR_SOURCE_DIR} ]] ; then
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/checked_find_package.cmake
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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/cmake/fancy_add_executable.cmake
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/OpenImageIO/oiio

# Macro to add an executable build target. The executable name can be
Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/color.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/OpenImageIO/oiio

#pragma once
Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/hash.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/OpenImageIO/oiio

// clang-format off
Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/imagebufalgo.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/imageio.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/oiioversion.h.in
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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/thread.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/OpenImageIO/oiio

// clang-format off
Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/timer.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/iv/ivmain.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/OpenImageIO/oiio

#if defined(_MSC_VER)
Expand Down
2 changes: 1 addition & 1 deletion src/jpeg2000.imageio/jpeg2000input.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/OpenImageIO/oiio

#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/imagebuf_test.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/imageio.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/OpenImageIO/oiio

#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/imageio_pvt.h.in
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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/maketexture.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/OpenImageIO/oiio

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion src/libutil/filesystem.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/OpenImageIO/oiio

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion src/libutil/plugin.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/OpenImageIO/oiio

#include <cstdlib>
Expand Down
2 changes: 1 addition & 1 deletion src/libutil/sysutil.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/OpenImageIO/oiio

#if (defined __MINGW32__) || (defined __MINGW64__) && !(defined _POSIX_C_SOURCE)
Expand Down
2 changes: 1 addition & 1 deletion src/nuke/txWriter/txWriter.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/OpenImageIO/oiio

#include <sstream>
Expand Down
2 changes: 1 addition & 1 deletion src/pnm.imageio/pnmoutput.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/OpenImageIO/oiio

#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion src/python/py_imagespec.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/OpenImageIO/oiio

#include "py_oiio.h"
Expand Down
2 changes: 1 addition & 1 deletion src/python/py_oiio.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/OpenImageIO/oiio

#include "py_oiio.h"
Expand Down
2 changes: 1 addition & 1 deletion src/rla.imageio/rlaoutput.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/OpenImageIO/oiio

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/python-imageoutput/src/test_imageoutput.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# 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

from __future__ import print_function
Expand Down

0 comments on commit 86186b8

Please sign in to comment.