Skip to content

Commit

Permalink
admin: update licensing (AcademySoftwareFoundation#3903)
Browse files Browse the repository at this point in the history
Since LG has re-licensed all his old code under Apache-2.0, we can
change the license notice from BSD to Apache-2.0 for all files in which
LG is the only extant author. Also change all files that LG co-authored
with other people to specify "BSD-3-Clause and Apache-2.0".

Some files (mostly test scripts) had no license notice, so in those
cases, we added one.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
  • Loading branch information
lgritz authored Jul 6, 2023
1 parent 42c629f commit eda748e
Show file tree
Hide file tree
Showing 356 changed files with 914 additions and 240 deletions.
2 changes: 1 addition & 1 deletion src/bmp.imageio/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2008-present Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

add_oiio_plugin (bmpinput.cpp bmpoutput.cpp bmp_pvt.cpp)
2 changes: 1 addition & 1 deletion src/build-scripts/build_OpenJPEG.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build OpenJPEG
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_Ptex.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build Ptex
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/build_cmake.bash
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/usr/bin/env bash

# Utility script to download and build cmake
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
set -ex
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_gif.bash
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Utility script to download and build giflib
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_libjpeg-turbo.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build libjpeg-turbo
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_libpng.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build libpng
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/build_libraw.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Utility script to download and build LibRaw

# Exit the whole script if any command fails.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/build_libtiff.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Utility script to download and build libtiff

# Exit the whole script if any command fails.
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_llvm.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build LLVM & clang
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/build_ninja.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
set -ex

Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/build_opencolorio.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Utility script to download and build OpenColorIO

# Exit the whole script if any command fails.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/build_openexr.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

# Utility script to download and build OpenEXR & IlmBase

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
set -ex

Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_pugixml.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build pugixml
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/build_pybind11.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Utility script to download and build pybind11

# Exit the whole script if any command fails.
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_webp.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build webp
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_zlib.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Utility script to download and build zlib
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Exit the whole script if any command fails.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/ci-build.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Important: set -ex causes this whole script to terminate with error if
# any command in it fails. This is crucial for CI tests.
set -ex
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/ci-coverage.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Run code coverage analysis
# This assumes that the build occurred with CODECOV=1 and tests have already
# fully run.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/ci-startup.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# This script is run when CI system first starts up.
# Since it sets many env variables needed by the caller, it should be run
# with 'source', not in a separate shell.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/ci-test.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Important: set -ex causes this whole script to terminate with error if
# any command in it fails. This is crucial for CI tests.
# (Though we let it run all the way through for code coverage workflows.)
Expand Down
5 changes: 5 additions & 0 deletions src/build-scripts/gh-installdeps.bash
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/usr/bin/env bash
#

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio


set -ex


Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/gh-win-installdeps.bash
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# Copyright 2008-present Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# DEP_DIR="$PWD/ext/dist"
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/install_homebrew_deps.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# This script, which assumes it is running on a Mac OSX with Homebrew
# installed, does a "brew install" in all packages reasonably needed by
# OIIO.
Expand Down
4 changes: 4 additions & 0 deletions src/build-scripts/save-env.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Save the env for use by other stages. Exclude things that we know aren't
# needed.
printenv \
Expand Down
2 changes: 1 addition & 1 deletion src/cineon.imageio/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2008-present Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

add_oiio_plugin (cineoninput.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/cineon.imageio/cineoninput.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2008-present Contributors to the OpenImageIO project.
// SPDX-License-Identifier: BSD-3-Clause
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
// https://github.com/OpenImageIO/oiio

#include <cmath>
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/Config.cmake.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/add_oiio_plugin.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
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/cmake/check_is_enabled.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2008-present Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Is the named package "enabled" via our disabling convention? If either
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
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/cmake/colors.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2008-present Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause
# 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
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Macro to add an executable build target. The executable name can be
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindDCMTK.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Module to find DCMTK
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio
#
# This module will first look into the directories defined by the variables:
# - DCMTK_ROOT, DCMTK_INCLUDE_PATH, DCMTK_LIBRARY_PATH
#
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindJPEGTurbo.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# - Try to find libjpeg-turbo
# Once done, this will define
#
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindLibheif.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Module to find LIBHEIF
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio
#
# This module will first look into the directories defined by the variables:
# - Libheif_ROOT, LIBHEIF_INCLUDE_PATH, LIBHEIF_LIBRARY_PATH
#
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindNuke.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# - CMake find module for Nuke
#
# If requesting a specific release, the Nuke version string must be converted
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindOpenCV.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# - Find OpenCV
# Find the OpenCV library
# This module defines
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindOpenColorIO.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# Module to find OpenColorIO
#
# This module will first look into the directories hinted by the variables:
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindR3DSDK.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# https://github.com/OpenImageIO/oiio

# - Try to find R3D SDK
#
# Set R3DSDK_ROOT Environment variable to root of the SDK
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindRobinmap.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Find Robinmap
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio
#
# Sets the usual variables expected for find_package scripts:
#
# ROBINMAP_INCLUDES - header location
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/FindWebP.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Module to find Webp
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio
#
# This module will first look into the directories defined by the variables:
# - Webp_ROOT, WEBP_INCLUDE_PATH, WEBP_LIBRARY_PATH
#
Expand Down
4 changes: 4 additions & 0 deletions src/cmake/modules/Findfmt.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Find fmt library
#
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio
#
# Sets the usual variables expected for find_package scripts:
#
# FMT_INCLUDES - header location
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/modules/Findpugixml.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
# SPDX-License-Identifier: Apache-2.0
# https://github.com/OpenImageIO/oiio

# Find the pugixml XML parsing library.
Expand Down
Loading

0 comments on commit eda748e

Please sign in to comment.