Bump version for developer preview

* Add UDIM pattern `<uvtile>` (in lower-case)

This UDIM pattern is equivalent to `u<u>_v<v>`.
See also #3280.

References:
- Clarisse: https://clarissewiki.com/5.0/image-maps-texture.html
- V-Ray: https://docs.chaos.com/display/VMAYA/File+Names+for+Bitmap+Textures

* LG Updated test and ref output

.clang-format

@@ -5,8 +5,11 @@ SpaceBeforeParens: ControlStatements
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: true
+#AlignConsecutiveAssignments: Consecutive
+#AlignConsecutiveBitFields: Consecutive
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
+#AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
@@ -75,6 +78,7 @@ IncludeCategories:
     Priority:        1
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
+IndentExternBlock: NoIndent
 IndentPPDirectives: AfterHash
 IndentWidth:     4
 IndentWrappedFunctionNames: false
@@ -118,7 +122,7 @@ SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+Standard:        c++14
 StatementMacros: 
   - Q_UNUSED
   - QT_REQUIRE_VERSION

.git-blame-ignore-revs

@@ -0,0 +1,38 @@
+# Reformatting via clang-format (part 1) (#2059)
+5e76177f6850a8d04c544dc98128bcdfe55ca40a
+
+# clang-format stage 2: src/libutil (#2064)
+1a5b7aa00dd34883a8829875ee05c55b2a1f6736
+
+# clang-format stage 3 -- src/*.imageio/* (#2065)
+22e1af2ff0caa2c9aa31c0d7a69eb7762c04302d
+
+# clang-format of src/libtexture and src/libOpenImageIO (#2067)
+400e2340cf12ae84792f9a0146426b6022474dc9
+
+# clang-format, final-ish update (#2069)
+5af338158ad47fc84e7b0d03086fece04e0e2d24
+
+# Adjustments from clang-format update
+3e106c35845715875c3b3ce7b1621cb62ea41f0d
+
+# clang-format fixes (#2137)
+e536411711367ed7309ca884ebc9de4cea4d0da0
+c31816192691562e96b4ebc10dd7e5fd2e9c801b
+
+# Minor formatting changes in ustring with new clang-format (#2574)
+9e911bddf275206867643d0009f0bd7b9a20e463
+9fa2a5d42465870ae370afe5e3298433b2ecb56c
+
+# Fix broken clang-format test (#2627)
+7e5b841a80ed63b38f6d343889de615ef8cc4316
+
+# Adjustments from clang-format update with clang 8
+e83809b77e4d895dbf48fb6c2b5fb914a5f8eb06
+
+# Touch up formatting with clang-format
+f701a76b745b6ddba41c77b24a1ea7e1f48ae0b4
+
+# clang-format: Adjust alignment of line continuation backslashes (#2664)
+742173e39588e07cf43cbe7b49dd22d624a48388
+d8810c5365ea88e2b1bce6155b7b495c18f2f9bc

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,7 +21,7 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Evidence**
-Do you have error messages? (please quote exacty) Screenshots? Example
+Do you have error messages? (please quote exactly) Screenshots? Example
 command lines or scripts that reliably reproduce the error? If it only
 happens with certain image files, can you attach the smallest image you
 can make that reproduces the problem?

.github/workflows/ci.yml

@@ -0,0 +1,926 @@
+# Copyright 2008-present Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+name: CI
+
+on:
+  push:
+    # Skip jobs when only documentation files are changed
+    paths-ignore:
+      - '**.md'
+      - '**.rst'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**.rst'
+  schedule:
+    # Full nightly build
+    - cron: "0 8 * * *"
+
+
+jobs:
+  vfxplatform-2019:
+    name: "Linux VFX Platform 2019: gcc6/C++14 py2.7 boost1.66 exr2.3 ocio1.1"
+    runs-on: ubuntu-latest
+    container:
+      image: aswf/ci-osl:2019
+    env:
+      CXX: g++
+      CC: gcc
+      CMAKE_CXX_STANDARD: 14
+      USE_SIMD: sse4.2
+      FMT_VERSION: 6.1.2
+      PUGIXML_VERSION: v1.9
+      PYBIND11_VERSION: v2.4.2
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  vfxplatform-2020:
+    name: "Linux VFX Platform 2020: gcc6/C++14 py3.7 boost1.70 exr2.4 ocio1.1"
+    runs-on: ubuntu-latest
+    container:
+      image: aswf/ci-osl:2020
+    env:
+      CXX: g++
+      CC: gcc
+      CMAKE_CXX_STANDARD: 14
+      FMT_VERSION: 7.0.1
+      PYBIND11_VERSION: v2.5.0
+      PYTHON_VERSION: 3.7
+      USE_SIMD: avx
+      WEBP_VERSION: v1.1.0
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  vfxplatform-2021:
+    name: "Linux VFX Platform 2021: gcc9/C++17 py3.7 boost1.73 exr2.5 ocio2.0 qt-5.15"
+    runs-on: ubuntu-latest
+    container:
+      image: aswf/ci-osl:2021
+    env:
+      CXX: g++
+      CC: gcc
+      CMAKE_CXX_STANDARD: 17
+      FMT_VERSION: 7.1.0
+      PYBIND11_VERSION: v2.7.0
+      PYTHON_VERSION: 3.7
+      USE_SIMD: avx2,f16c
+      WEBP_VERSION: v1.1.0
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  vfxplatform-2022:
+    name: "Linux VFX Platform 2022: gcc9/C++17 py3.9 boost1.76 exr3.1 ocio2.1 qt5.15"
+    runs-on: ubuntu-latest
+    container:
+      image: aswf/ci-osl:2022-clang11
+    env:
+      CXX: g++
+      CC: gcc
+      CMAKE_CXX_STANDARD: 17
+      FMT_VERSION: 8.1.1
+      PYBIND11_VERSION: v2.9.0
+      PYTHON_VERSION: 3.9
+      USE_SIMD: avx2,f16c
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-gcc7-cpp14-debug:
+    # Test against gcc7, and also at the same time, do a Debug build.
+    name: "Linux debug gcc7/C++14, sse4.2, exr2.4"
+    runs-on: ubuntu-18.04
+    env:
+      CXX: g++-7
+      CMAKE_CXX_STANDARD: 14
+      USE_SIMD: sse4.2
+      OPENEXR_VERSION: v2.4.3
+      PYBIND11_VERSION: v2.6.2
+      CMAKE_BUILD_TYPE: Debug
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-gcc8:
+    # Test against gcc8.
+    name: "Linux gcc8: gcc8 C++17 avx exr2.5"
+    runs-on: ubuntu-18.04
+    env:
+      CXX: g++-8
+      CMAKE_CXX_STANDARD: 17
+      USE_SIMD: avx
+      OPENEXR_VERSION: v2.5.6
+      PYBIND11_VERSION: v2.5.0
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-latest-releases:
+    # Test against latest supported releases of toolchain and dependencies.
+    name: "Linux latest releases: gcc10 C++17 avx2 exr3.1 ocio2.1"
+    runs-on: ubuntu-20.04
+    env:
+      CXX: g++-10
+      CMAKE_CXX_STANDARD: 17
+      USE_SIMD: avx2,f16c
+      FMT_VERSION: 8.1.1
+      LIBRAW_VERSION: 0.20.2
+      LIBTIFF_VERSION: v4.3.0
+      OPENCOLORIO_VERSION: v2.1.1
+      OPENEXR_VERSION: v3.1.4
+      OPENJPEG_VERSION: v2.4.0
+      PUGIXML_VERSION: v1.11.4
+      PTEX_VERSION: v2.4.0
+      PYBIND11_VERSION: v2.9.0
+      PYTHON_VERSION: 3.8
+      WEBP_VERSION: v1.2.1
+      OPENIMAGEIO_OPTIONS: "openexr:core=1"
+      USE_OPENVDB: 0
+      # The old installed OpenVDB has a TLS conflict with Python 3.8
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-bleeding-edge:
+    # Test against development master for relevant dependencies, latest
+    # supported releases of everything else.
+    name: "Linux bleeding edge: gcc11 C++20 py38 OCIO/libtiff/exr-master boost1.71 avx2"
+    runs-on: ubuntu-20.04
+    env:
+      CXX: g++-11
+      CMAKE_CXX_STANDARD: 20
+      USE_SIMD: avx2,f16c
+      FMT_VERSION: master
+      LIBRAW_VERSION: master
+      LIBTIFF_VERSION: master
+      OPENCOLORIO_VERSION: main
+      OPENEXR_VERSION: main
+      OPENJPEG_VERSION: master
+      PUGIXML_VERSION: master
+      PTEX_VERSION: main
+      PYBIND11_VERSION: master
+      PYTHON_VERSION: 3.8
+      WEBP_VERSION: master
+      OPENIMAGEIO_OPTIONS: "openexr:core=1"
+      USE_OPENVDB: 0
+      # The old installed OpenVDB has a TLS conflict with Python 3.8
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: CCache
+        id: ccache
+        if: always()
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-oldest:
+    # Oldest versions of the dependencies that we can muster, and various
+    # things disabled (no SSE, OCIO, or OpenCV, don't embed plugins).
+    name: "Linux oldest/hobbled: gcc6.3/C++14 py2.7 boost-1.66 exr-2.3 no-sse no-ocio"
+    runs-on: ubuntu-latest
+    container:
+      image: aswf/ci-osl:2019
+    env:
+      CMAKE_CXX_STANDARD: 14
+      USE_SIMD: 0
+      USE_JPEGTURBO: 0
+      USE_OPENCOLORIO: 0
+      USE_OPENCV: 0
+      EMBEDPLUGINS: 0
+      FMT_VERSION: 6.1.2
+      OPENEXR_VERSION: v2.3.0
+      PTEX_VERSION: v2.3.1
+      PYBIND11_VERSION: v2.4.2
+      WEBP_VERSION: v1.0.0
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            sudo rm -rf /usr/local/include/OpenEXR
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  macos10-py38:
+    name: "MacOS-10.15 appleclang12/C++14 py38 boost1.76 exr3.1 ocio2.1"
+    runs-on: macos-10.15
+    env:
+      CXX: clang++
+      PYTHON_VERSION: 3.8
+      CMAKE_CXX_STANDARD: 14
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /Users/runner/.ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/install_homebrew_deps.bash
+            src/build-scripts/install_test_images.bash
+      - name: Build
+        run: |
+            export PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  macos11-py38:
+    name: "MacOS-11 appleclang13/C++17 py39 boost1.76 exr3.1 ocio2.1"
+    runs-on: macos-11
+    env:
+      CXX: clang++
+      PYTHON_VERSION: 3.9
+      CMAKE_CXX_STANDARD: 17
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /Users/runner/.ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/install_homebrew_deps.bash
+            src/build-scripts/install_test_images.bash
+      - name: Build
+        run: |
+            export PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  windows-vs2019:
+    name: "Windows VS2019"
+    runs-on: windows-2019
+    env:
+      PYTHON_VERSION: 3.7
+      CMAKE_GENERATOR: "Visual Studio 16 2019"
+      OPENEXR_VERSION: v2.5.6
+      USE_SIMD: sse4.2
+      CTEST_ARGS: "--timeout 120 --repeat after-timeout:6"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Build setup
+        shell: bash
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        shell: bash
+        run: |
+            src/build-scripts/gh-win-installdeps.bash
+      - name: Build
+        shell: bash
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        shell: bash
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  windows-vs2017:
+    name: "Windows VS2017"
+    runs-on: windows-2016
+    env:
+      PYTHON_VERSION: 3.7
+      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+      OPENEXR_VERSION: v2.5.6
+      CTEST_ARGS: "--timeout 120 --repeat after-timeout:6"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Build setup
+        shell: bash
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        shell: bash
+        run: |
+            src/build-scripts/gh-win-installdeps.bash
+      - name: Build
+        shell: bash
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        shell: bash
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  sanitizer:
+    # Run sanitizers.
+    name: "Sanitizers"
+    runs-on: ubuntu-18.04
+    container:
+      image: aswf/ci-osl:2020
+    env:
+      CXX: g++
+      CC: gcc
+      CMAKE_CXX_STANDARD: 14
+      PYTHON_VERSION: 3.7
+      USE_PYTHON: 0
+      SANITIZE: address
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-clang10-cpp14:
+    # Test compiling with clang on Linux.
+    name: "Linux clang10: clang10 C++14 avx2 exr2.5 ocio2.0"
+    runs-on: ubuntu-18.04
+    container:
+      image: aswf/ci-osl:2021-clang10
+    env:
+      CXX: clang++
+      CMAKE_CXX_STANDARD: 14
+      PYTHON_VERSION: 3.7
+      USE_SIMD: avx2,f16c
+      PYBIND11_VERSION: v2.6.2
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-clang13-cpp17:
+    # Test compiling with clang and C++17 on Linux.
+    name: "Linux clang13: clang13 C++17 py39 avx2 exr3.1 ocio2.0"
+    runs-on: ubuntu-18.04
+    container:
+      image: aswf/ci-osl:2022-clang13
+    env:
+      CXX: clang++
+      CMAKE_CXX_STANDARD: 17
+      PYBIND11_VERSION: v2.8.1
+      PYTHON_VERSION: 3.9
+      USE_SIMD: avx2,f16c
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  linux-static:
+    # Test building static libs.
+    name: "Linux static libs: gcc7 C++14 exr2.4"
+    runs-on: ubuntu-18.04
+    env:
+      CXX: g++-7
+      CMAKE_CXX_STANDARD: 14
+      BUILD_SHARED_LIBS: OFF
+      OPENEXR_VERSION: v2.4.3
+      PYBIND11_VERSION: v2.6.2
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare ccache timestamp
+        id: ccache_cache_keys
+        run: |
+          echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      - name: ccache
+        id: ccache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
+          restore-keys: |
+            ${{ github.job }}-
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            sudo rm -rf /usr/local/include/OpenEXR
+            sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - name: Testsuite
+        run: |
+            src/build-scripts/ci-test.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: |
+            build/*.cmake
+            build/CMake*
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+
+  clang-format:
+    # Test formatting. This test entry doesn't do a full build, it just runs
+    # clang-format on everything, and passes if nothing is misformatted.
+    # Upon failure, the build artifact will be the full source code with the
+    # formatting fixed (diffs will also appear in the console output).
+    name: "clang-format verification"
+    runs-on: ubuntu-18.04
+    container:
+      image: aswf/ci-osl:2022-clang12
+    env:
+      BUILDTARGET: clang-format
+      PYTHON_VERSION: 3.9
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build setup
+        run: |
+            src/build-scripts/ci-startup.bash
+      - name: Dependencies
+        run: |
+            src/build-scripts/gh-installdeps.bash
+      - name: Build
+        run: |
+            src/build-scripts/ci-build.bash
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: ${{ github.job }}
+          path: src/*/*.{cpp,h}

.github/workflows/workflow.yml

@@ -1,434 +0,0 @@
-# Copyright 2008-present Contributors to the OpenImageIO project.
-# SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
-
-name: CI
-
-on:
-  push:
-    # Skip jobs when only documentation files are changed
-    paths-ignore:
-      - '**.md'
-      - '**.rst'
-  pull_request:
-    paths-ignore:
-      - '**.md'
-      - '**.rst'
-  schedule:
-    # Full nightly build
-    - cron: "0 4 * * *"
-
-
-jobs:
-  linux-gcc48:
-    name: "Linux 2017-ish: gcc4.8/C++11 py2.7 boost-1.66 exr-2.3"
-    runs-on: ubuntu-latest
-    container:
-      image: aswf/ci-osl:2019
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: /usr/bin/g++
-          CC: /usr/bin/gcc
-          CMAKE_CXX_STANDARD: 11
-          MY_CMAKE_FLAGS: -DBUILD_FMT_VERSION=6.2.1
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps-centos.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  vfxplatform-2019:
-    name: "Linux VFX Platform 2019: gcc6/C++14 py2.7 boost-1.66 exr-2.3"
-    runs-on: ubuntu-latest
-    container:
-      image: aswf/ci-osl:2019
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++
-          CC: gcc
-          CMAKE_CXX_STANDARD: 14
-          USE_SIMD: sse4.2
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps-centos.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  vfxplatform-2020:
-    name: "Linux VFX Platform 2020: gcc6/C++14 py3.7 boost-1.70 exr-2.4"
-    runs-on: ubuntu-latest
-    container:
-      image: aswf/ci-osl:2020
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++
-          CC: gcc
-          CMAKE_CXX_STANDARD: 14
-          PYTHON_VERSION: 3.7
-          USE_SIMD: avx
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps-centos.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  vfxplatform-2021:
-    # Test what's anticipated to be VFX Platform 2021 -- mainly, that means
-    # gcc9 and C++17.
-    name: "Linux VFX Platform 2021: gcc9/C++17 py3.7 boost-1.70 exr-2.5"
-    runs-on: ubuntu-18.04
-    container:
-      image: aswf/ci-osl:2021
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++
-          CC: gcc
-          CMAKE_CXX_STANDARD: 17
-          PYTHON_VERSION: 3.7
-          USE_SIMD: avx2,f16c
-          OPENEXR_BRANCH: v2.5.0
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps-centos.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  linux-gcc7-cpp14-debug:
-    # Test against gcc7, and also at the same time, do a Debug build.
-    name: "Linux debug gcc7/C++14, sse4.2, exr2.4"
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++-7
-          CMAKE_CXX_STANDARD: 14
-          USE_SIMD: sse4.2
-          DEBUG: 1
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  linux-gcc8:
-    # Test against gcc8.
-    name: "Linux gcc8: gcc8 C++17 avx exr2.5"
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++-8
-          CMAKE_CXX_STANDARD: 17
-          USE_SIMD: avx
-          OPENEXR_BRANCH: v2.5.0
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  linux-latest-releases:
-    # Test against latest supported releases of toolchain and dependencies.
-    name: "Linux latest releases: gcc10 C++17 avx2 exr2.5"
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++-10
-          CMAKE_CXX_STANDARD: 17
-          USE_SIMD: avx2,f16c
-          OPENEXR_BRANCH: v2.5.0
-          PYBIND11_VERSION: 2.5.0
-          LIBRAW_BRANCH: 0.20.0
-          MY_CMAKE_FLAGS: -DBUILD_FMT_VERSION=7.0.1
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  linux-bleeding-edge:
-    # Test against development master for relevant dependencies, latest
-    # supported releases of everything else.
-    # We don't need to run this on every push or PR -- only run on nightly
-    # test, or if the branch name contains certain substring: gh, release,
-    # bleeding.
-    name: "Linux bleeding edge: gcc10 C++17 avx2 OCIO/libtiff/exr master"
-    runs-on: ubuntu-18.04
-    if: github.event_name == 'schedule' || contains(github.ref, 'release') || contains(github.ref, 'gh') || contains(github.ref, 'bleeding') || contains(github.ref, 'RB') || contains(github.ref, 'master')
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++-10
-          CMAKE_CXX_STANDARD: 17
-          USE_SIMD: avx2,f16c
-          OPENEXR_BRANCH: master
-          OCIO_BRANCH: master
-          LIBTIFF_BRANCH: master
-          PYBIND11_BRANCH: master
-          LIBRAW_BRANCH: master
-          MY_CMAKE_FLAGS: -DBUILD_FMT_VERSION=master
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  linux-oldest:
-    # Oldest versions of the dependencies that we can muster, and various
-    # things disabled (no SSE, OCIO, or OpenCV, don't embed plugins).
-    # We don't need to run this on every push or PR -- only run on nightly
-    # test, or if the branch name contains certain substrings: gh, release,
-    # old.
-    name: "Linux oldest/hobbled: gcc4.8/C++11 py2.7 boost-1.66 exr-2.2 no-sse no-ocio"
-    if: github.event_name == 'schedule' || contains(github.ref, 'release') || contains(github.ref, 'gh') || contains(github.ref, 'RB') || contains(github.ref, 'master')
-    runs-on: ubuntu-latest
-    container:
-      image: aswf/ci-osl:2019
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: /usr/bin/g++
-          CC: /usr/bin/gcc
-          CMAKE_CXX_STANDARD: 11
-          USE_SIMD: 0
-          USE_JPEGTURBO: 0
-          USE_OPENCOLORIO: 0
-          USE_OPENCV: 0
-          EMBEDPLUGINS: 0
-          OPENEXR_BRANCH: v2.2.0
-          MY_CMAKE_FLAGS: -DBUILD_FMT_VERSION=6.1.2
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps-centos.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  macos-py37:
-    name: "Mac py38"
-    runs-on: macOS-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: clang++
-          PYTHON_VERSION: 3.8
-          CMAKE_CXX_STANDARD: 14
-          ENABLE_FIELD3D: OFF
-          ENABLE_WEBP: OFF
-          #  ^^ webp seems broken on GH CI Mac. Investigate later.
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/install_homebrew_deps.bash
-            pip3.8 install numpy
-            src/build-scripts/install_test_images.bash
-            export PYTHONPATH=/usr/local/lib/python3.8/site-packages:$PYTHONPATH
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  windows-vs2019:
-    name: "Windows VS2019"
-    runs-on: windows-2019
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Nuget.exe
-        uses: warrenbuckley/Setup-Nuget@v1
-      - name: all
-        shell: bash
-        env:
-          PYTHON_VERSION: 3.6
-          CMAKE_GENERATOR: "Visual Studio 16 2019"
-          OPENEXR_BRANCH: v2.4.1
-          SKIP_TESTS: 1
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-win-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  windows-vs2017:
-    name: "Windows VS2017"
-    runs-on: windows-2016
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Nuget.exe
-        uses: warrenbuckley/Setup-Nuget@v1
-      - name: all
-        shell: bash
-        env:
-          PYTHON_VERSION: 3.6
-          CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-          OPENEXR_BRANCH: v2.4.1
-          SKIP_TESTS: 1
-          #MY_CMAKE_FLAGS: -DUSE_PYTHON=0
-          USE_NINJA: 0
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-win-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  sanitizer:
-    # Run sanitizers. These don't need to run on every push. Just PRs, nightly
-    # builds, or if the branch name contains one of several tokens: san,
-    # gh, RB, release, or master.
-    name: "Sanitizers"
-    runs-on: ubuntu-18.04
-    if: github.event_name == 'pull_request' || github.event_name == 'schedule' || contains(github.ref, 'san') || contains(github.ref, 'RB') || contains(github.ref, 'release') || contains(github.ref, 'master') || contains(github.ref, 'gh')
-    container:
-      image: aswf/ci-osl:2020
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++
-          CC: gcc
-          CMAKE_CXX_STANDARD: 14
-          PYTHON_VERSION: 3.7
-          USE_PYTHON: 0
-          SANITIZE: address
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps-centos.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  linux-clang9:
-    # Test compiling with clang9 on Linux.
-    name: "Linux clang: clang9 C++14 avx2 exr2.4"
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: clang++
-          LLVM_VERSION: 9.0.0
-          CMAKE_CXX_STANDARD: 14
-          USE_SIMD: avx2,f16c
-          OPENEXR_BRANCH: v2.4.1
-          OCIO_BRANCH: 1c624651b7
-          # Pick an OCIO commit that includes a warning fix we need for clang
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  linux-static:
-    # Test building static libs.  We don't need to run this on every push --
-    # only run on PRs, nightly test, or if the branch name contains
-    # "gh", "master", "release", or "static".
-    name: "Linux static libs: gcc7 C++14 exr2.4"
-    if: github.event_name == 'pull_request' || github.event_name == 'schedule' || contains(github.ref, 'static') || contains(github.ref, 'release') || contains(github.ref, 'RB') || contains(github.ref, 'master') || contains(github.ref, 'gh')
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          CXX: g++-7
-          CMAKE_CXX_STANDARD: 14
-          BUILD_SHARED_LIBS: OFF
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: build/*/testsuite/*/*.*
-
-  clang-format:
-    # Test formatting. This test entry doesn't do a full build, it just runs
-    # clang-format on everything, and passes if nothing is misformatted.
-    # Upon failure, the build artifact will be the full source code with the
-    # formatting fixed (diffs will also appear in the console output).
-    name: "clang-format verification"
-    runs-on: ubuntu-18.04
-    container:
-      image: aswf/ci-osl:2021
-    steps:
-      - uses: actions/checkout@v2
-      - name: all
-        env:
-          BUILDTARGET: clang-format
-          PYTHON_VERSION: 3.7
-          SKIP_TESTS: 1
-        run: |
-            source src/build-scripts/ci-startup.bash
-            source src/build-scripts/gh-installdeps-centos.bash
-            source src/build-scripts/ci-build-and-test.bash
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ${{ github.job }}
-          path: src/*/*.{cpp,h}

.gitignore

@@ -1,10 +1,21 @@
 *~
+*.bak
 branches/
 build/
 dist/
 ext/
-testsuite/runtest.pyc
+.idea
+.vscode
 .cproject
 .project
 .DS_Store
+*.pyc
 
+# Exclude test files I tend to leave around at the top level. The leading
+# slash ensures that files with these extensions within subdirectories are not
+# ignored.
+/*.exr
+/*.tif
+/*.jpg
+/*.tx
+/*.log

.readthedocs.yml

@@ -12,7 +12,7 @@ sphinx:
 # Optionally build your docs in additional formats such as PDF and ePub
 formats:
   - pdf
-
+  - htmlzip
 
 # Optionally set the version of Python and requirements required to build your docs
 python:

.travis.yml

@@ -1,202 +0,0 @@
-# Copyright 2008-present Contributors to the OpenImageIO project.
-# SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
-
-# .travis.yml for OIIO
-
-language: cpp
-osx_image: xcode10
-dist: xenial
-
-
-# Add-ons: specify apt packages for Linux
-# We actaully specify packages per-matrix-entry, so these don't do anything
-# except to tag them (&add-sources, &common-packages, &common-boost-packages)
-# so they can be referened later ('*') to save repetition.
-addons:
-  apt:
-   sources: &add-sources
-      - ubuntu-toolchain-r-test
-   packages: &common-packages
-      - libilmbase-dev
-      - libopenexr-dev
-      - libopencolorio-dev
-      - libgif-dev
-      - libopenjpeg-dev
-      - libwebp-dev
-      - libfreetype6-dev
-      - libjpeg-turbo8-dev
-      - dcmtk
-      - locales
-      - python-numpy
-      - libraw-dev
-      - ninja-build
-      # - qtbase5-dev   # FIXME: enable Qt5 on Linux
-      # - bzip2
-      # - libtinyxml-dev
-      # - liblcms2-dev
-      # - libyaml-cpp-dev
-   packages: &common-boost-packages
-      - libboost1.58-dev
-      - libboost-filesystem1.58
-      - libboost-regex1.58
-      - libboost-system1.58
-      - libboost-thread1.58
-   packages: &old-boost-packages
-      - libboost1.55-dev
-      - libboost-filesystem1.55
-      - libboost-regex1.55
-      - libboost-system1.55
-      - libboost-thread1.55
-
-cache:
-    ccache: true
-    apt: true
-    directories:
-      - $HOME/.ccache
-      - $PWD/oiio-images
-      - $PWD/libtiffpic
-
-before_install:
-    - source src/build-scripts/ci-startup.bash
-    - export WHICHGCC=${WHICHGCC:="4.8"}
-    - if [ "$CXX" == "g++" ]; then export CXX="g++-${WHICHGCC}" ; fi
-
-install:
-    - if [[ $TRAVIS_OS_NAME == osx ]] ; then source src/build-scripts/install_homebrew_deps.bash ; fi
-    - if [[ "$BUILD_CMAKE" == "1" ]] ; then source src/build-scripts/build_cmake.bash ; fi
-    - if [[ "$OPENEXR_VERSION" || "$OPENEXR_BRANCH" ]] ; then CXX="ccache $CXX" source src/build-scripts/build_openexr.bash ; fi
-    - if [[ "$OCIO_VERSION" || "$OCIO_BRANCH" ]] ; then CXX="ccache $CXX" source src/build-scripts/build_ocio.bash ; fi
-    - if [[ $TRAVIS_OS_NAME == linux ]] ; then source src/build-scripts/build_pybind11.bash ; fi
-    - src/build-scripts/install_test_images.bash
-
-# before_script:
-
-script:
-    - export LD_LIBRARY_PATH=$OpenImageIO_ROOT/lib:$LD_LIBRARY_PATH
-    - export DYLD_LIBRARY_PATH=$OpenImageIO_ROOT/lib:$DYLD_LIBRARY_PATH
-    - source src/build-scripts/ci-build-and-test.bash
-
-
-
-branches:
-  only:
-    - master
-    - /RB-/
-    - /lg-/
-
-jobs:
-    fast_finish: true
-    allow_failures:
-      - name: "Linux ARM64"
-    include:
-    # test default compile: C++11, optimized, default compilers, SSE2
-      # - name: "VFX Platform 2017 (gcc48, py27, exr2.2)"
-      #   os: linux
-      #   dist: trusty
-      #   compiler: gcc
-      #   env: WHICHGCC=4.8 OPENEXR_BRANCH=v2.2.0 BUILD_CMAKE=1
-      #   addons:
-      #     apt:
-      #       sources: *add-sources
-      #       packages:
-      #         - *common-packages
-      #         - *old-boost-packages
-      #         - g++-4.8
-
-      # - name: "Mac (latest clang, py37)"
-      #   os: osx
-      #   compiler: clang
-      #   env: PYTHON_VERSION=3.7
-    # Make sure Python 2.7 still works on OSX, but only for PRs, master/RB
-    # pushes, or if the branch name includes "python".
-      # - name: "Mac py27 (latest clang)"
-      #   os: osx
-      #   compiler: clang
-      #   env: PYTHON_VERSION=2.7
-      #   # if: branch =~ /(master|RB|travis|python)/ OR type = pull_request
-
-    # One more, just for the heck of it, turn all SIMD off, and also make
-    # sure we're falling back on libjpeg, not jpeg-turbo, no OCIO support,
-    # and don't embed the plugins (to make sure that doesn't rust away).  I
-    # guess this should/could be both platforms, but in the interest of
-    # making the tests go faster, don't bother doing it on OSX.
-    # Only build this case for PRs, direct pushes to master or RB branches,
-    # or if the branch name includes "simd". Other ordinary work branch
-    # pushes don't need to run this.
-      # - name: "Oldest everything: gcc4.8, boost 1.55, no simd, no jpegturbo, no OCIO, dso plugins, exr2.2"
-      #   os: linux
-      #   dist: trusty
-      #   compiler: gcc
-      #   env: WHICHGCC=4.8 USE_SIMD=0 USE_JPEGTURBO=0 USE_OPENCOLORIO=0 EMBEDPLUGINS=0 OPENEXR_BRANCH=v2.2.0 BUILD_CMAKE=1
-      #   # if: branch =~ /(master|RB|travis|simd)/ OR type = pull_request
-      #   addons:
-      #     apt:
-      #       sources: *add-sources
-      #       packages:
-      #         - *common-packages
-      #         - *old-boost-packages
-      #         - g++-4.8
-
-    # test ARM64 architecture
-      - name: "Linux ARM64"
-        os: linux
-        arch: arm64
-        dist: bionic
-        compiler: gcc
-        env: WHICHGCC=7 BUILD_CMAKE=1
-        addons:
-          apt:
-            #sources: *add-sources
-            packages:
-              - libuv1
-              - rhash
-              - libstdc++6
-              - libboost-all-dev
-              - libtiff-dev
-              - libilmbase-dev
-              - libopenexr-dev
-              - libjpeg-turbo8-dev
-              - libgif-dev
-              - libopencolorio-dev
-              #- libopenjpeg-dev
-              - libwebp-dev
-              - libheif-dev
-              #- libfreetype6-dev
-              #- libjpeg-turbo8-dev
-              - libdcmtk-dev
-              #- locales
-              #- python-numpy
-              - libraw-dev
-              - ninja-build
-              - python3
-              - libpython3-dev
-              - libopenvdb-dev
-              - libsquish-dev
-              - qt5-default
-
-    # Static analysis: build with clang-tidy.
-    # Disabled -- this takes so long to run, it can't complete in Travis's
-    # 50 minute time limit. Left here just to show how it should work.
-      #  - name: "Static analysis / clang-tidy"
-      #    os: linux
-      #    compiler: gcc
-      #    env: CLANG_TIDY=1 CLANG_TIDY_FIX=1 SKIP_TESTS=1
-      #    if: branch =~ /(master|RB|travis|tidy)/ OR type = pull_request
-    # Build with EMBEDPLUGINS=0, both platforms.
-      # FIXME: doesn't work yet on Travis
-      # - os: linux
-      #   compiler: gcc
-      #   env: EMBEDPLUGINS=0
-      # FIXME: don't have OSX EMBEDPLUGINS=0 working yet on Travis (though
-      # it works fine on my laptop).
-      # - os: osx
-      #   compiler: clang
-      #   env: EMBEDPLUGINS=0
-
-notifications:
-    email:
-        recipients:
-            - lg@openimageio.org
-        on_success: change
-        on_failure: always

CMakeLists.txt

@@ -1,18 +1,34 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 cmake_minimum_required (VERSION 3.12)
-project (OpenImageIO VERSION 2.2.4.0
+project (OpenImageIO VERSION 2.4.0.4
          HOMEPAGE_URL "https://openimageio.org"
          LANGUAGES CXX C)
 set (PROJ_NAME OIIO)    # short name, caps
 string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER)  # short name lower case
 string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER)  # short name upper case
-set (PROJECT_VERSION_RELEASE_TYPE "dev")   # "dev", "betaX", "RCY", ""
+set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING
+    "Build type, for example: dev, beta2, RC1 (empty string for normal release)")
 set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE})
 set (PROJECT_AUTHORS "Contributors to the OpenImageIO project")
-set (${PROJECT_NAME}_SUPPORTED_RELEASE 0)  # Change to 1 after release branch
+option (${PROJECT_NAME}_SUPPORTED_RELEASE
+       "Set ON for supported release branch, OFF for master" OFF)
+if (${PROJECT_NAME}_SUPPORTED_RELEASE)
+    set (${PROJECT_NAME}_DEV_RELEASE OFF)
+else ()
+    set (${PROJECT_NAME}_DEV_RELEASE ON)
+endif ()
+
+# Set PROJECT_IS_TOP_LEVEL to ON if if this is the top level project (not
+# if this is included as a subproject of something else). Note that this is
+# handled automatically for CMake >= 3.21.
+if (CMAKE_VERSION VERSION_LESS 3.21)
+    if ("${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
+        set (PROJECT_IS_TOP_LEVEL ON)
+    endif ()
+endif ()
 
 # If the user wants to use Conan to build dependencies, they will have done
 # this prior to the cmake config:
@@ -25,13 +41,19 @@ if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
     conan_basic_setup()
 endif()
 
-message (STATUS "Building ${PROJECT_NAME} ${PROJECT_VERSION}")
-message (STATUS "CMake version is ${CMAKE_VERSION}")
-
 if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE "Release")
 endif ()
 
+# If the user hasn't configured cmake with an explicit
+# -DCMAKE_INSTALL_PREFIX=..., then set it to safely install into ./dist, to
+# help prevent the user from accidentally writing over /usr/local or whatever.
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
+      AND PROJECT_IS_TOP_LEVEL)
+    set (CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/dist" CACHE PATH
+         "Installation location" FORCE)
+endif()
+
 message (STATUS "Configuring ${PROJECT_NAME} ${PROJECT_VERSION}")
 message (STATUS "CMake ${CMAKE_VERSION}")
 message (STATUS "CMake system           = ${CMAKE_SYSTEM}")
@@ -67,14 +89,10 @@ option (BUILD_OIIOUTIL_ONLY "If ON, will build *only* libOpenImageIO_Util" OFF)
 option (BUILD_DOCS "If ON, build documentation and man pages." ON)
 option (INSTALL_DOCS "If ON, install documentation and man pages." ON)
 option (INSTALL_FONTS "If ON, install default fonts" ON)
-option (INSTALL_CMAKE_HELPER "If On, install FindOpenImageIO.cmake" ON)
 option (EMBEDPLUGINS "Embed format plugins in libOpenImageIO" ON)
 set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
 file (TO_NATIVE_PATH "${PLUGIN_SEARCH_PATH}" PLUGIN_SEARCH_PATH_NATIVE)
-set (CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library naming postfix for Debug builds (e.g., '_debug')")
-
-set(OIIO_TESTSUITE_IMAGEDIR "${PROJECT_SOURCE_DIR}/.." CACHE PATH
-    "Location of oiio-images, openexr-images, libtiffpic, etc.." )
+set (CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Library naming postfix for Debug builds")
 
 option (OIIO_THREAD_ALLOW_DCLP "OIIO threads may use DCLP for speed" ON)
 if (NOT OIIO_THREAD_ALLOW_DCLP)
@@ -89,10 +107,11 @@ endif ()
 # Set the default namespace
 set (${PROJ_NAME}_NAMESPACE ${PROJECT_NAME} CACHE STRING
      "Customized outer namespace base name (version will be added)")
-option (${PROJ_NAME}_NAMESPACE_INCLUDE_PATCH "Should the inner namespace include the patch number" OFF)
+option (${PROJ_NAME}_NAMESPACE_INCLUDE_PATCH
+        "Should the inner namespace include the patch number" ${${PROJECT_NAME}_DEV_RELEASE})
 set (PROJ_NAMESPACE "${${PROJ_NAME}_NAMESPACE}")
 set (PROJ_NAMESPACE_V "${PROJ_NAMESPACE}_v${PROJECT_VERSION_MAJOR}_${PROJECT_VERSION_MINOR}")
-if (OIIO_NAMESPACE_INCLUDE_PATCH)
+if (${PROJ_NAME}_NAMESPACE_INCLUDE_PATCH)
     set (PROJ_NAMESPACE_V "${PROJ_NAMESPACE_V}_${PROJECT_VERSION_PATCH}")
 endif ()
 message(STATUS "Setting Namespace to: ${PROJ_NAMESPACE_V}")
@@ -104,23 +123,31 @@ list (APPEND CMAKE_MODULE_PATH
 
 include (GNUInstallDirs)
 
+# Utilities
 include (colors)
 include (check_is_enabled)
+include (checked_find_package)
+include (fancy_add_executable)
+include (add_oiio_plugin)
 
-# All the C++ and compiler related options and adjustments live here
+# All the C++ and compiler related options and adjustments
 include (compiler)
 
-include (oiio_macros)
-
-# All the dependency finding and options are here
-include (externalpackages)
-
-# Utilities related to finding python and making python bindings
+# Utilities and options related to finding python and making python bindings
 include (pythonutils)
 
-# We want CTest for testing, so this must be added before all the calls to
-# add_subdirectory, or their add_test commands will not register.
-include (CTest)
+# Dependency finding utilities and all dependency-related options
+include (externalpackages)
+
+# Include all our testing apparatus and utils, but not if it's a subproject
+if (PROJECT_IS_TOP_LEVEL)
+    include (testing)
+else ()
+    macro (oiio_add_tests)
+    endmacro ()
+    macro (oiio_add_all_tests)
+    endmacro ()
+endif ()
 
 
 include_directories (
@@ -128,6 +155,7 @@ include_directories (
     "${CMAKE_SOURCE_DIR}/src/include"
     "${CMAKE_BINARY_DIR}/src/include"
     "${CMAKE_BINARY_DIR}/include"
+    "${CMAKE_BINARY_DIR}/include/OpenImageIO"
   )
 
 # Tell CMake to process the sub-directories
@@ -183,7 +211,7 @@ if (NOT EMBEDPLUGINS AND NOT BUILD_OIIOUTIL_ONLY)
     endforeach ()
 endif ()
 
-if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY)
+if (USE_PYTHON AND Python_Development_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
     add_subdirectory (src/python)
 endif ()
 
@@ -204,17 +232,12 @@ if (OIIO_SITE AND EXISTS "${PROJECT_SOURCE_DIR}/site/${OIIO_SITE}/cmake/sitecust
 endif ()
 
 # install pkgconfig file
-IF ( NOT MSVC )
+if (NOT MSVC)
    configure_file(src/build-scripts/OpenImageIO.pc.in "${CMAKE_BINARY_DIR}/OpenImageIO.pc" @ONLY)
    install (FILES "${CMAKE_BINARY_DIR}/OpenImageIO.pc"
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
             COMPONENT developer)
-ENDIF()
-
-# Oddball: install the FindOpenImageIO.cmake file
-install (FILES src/cmake/modules/FindOpenImageIO.cmake
-         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules
-         COMPONENT cmake)
+endif()
 
 # Export the configuration files. There are also library-specific config
 # exports in the CMakeLists.txt of libOpenImageIO.
@@ -256,242 +279,11 @@ install (EXPORT OIIO_EXPORTED_TARGETS
         NAMESPACE ${PROJECT_NAME}::)
 
 
-#########################################################################
-# Testing
-#
-# Just call oiio_add_tests(testname...) for each test.  Additional
-# optional arguments include:
-#     FOUNDVAR   specifies the name of a CMAKE variable; if not defined,
-#                    the test will not be added for 'make test' (helpful
-#                    for excluding tests for libraries not found).
-#     IMAGEDIR   specifies a directory for test images, one level higher
-#                    than where the oiio top level source lives -- a
-#                    message will be printed if not found.
-#     URL        URL where the test images can be found, will be
-#                    incorporated into the error message if the test
-#                    image directory is not found.
-#     LABEL      If set to "broken", will designate the test as one
-#                    that is known to be broken, so will only be run
-#                    for "make testall", but not "make test".
-#
-
-# Make a build/platform/testsuite directory, and copy the master runtest.py
-# there. The rest is up to the tests themselves.
-file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/testsuite")
-file (COPY "${CMAKE_CURRENT_SOURCE_DIR}/testsuite/common"
-      DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/testsuite")
-add_custom_command (OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/testsuite/runtest.py"
-                    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        "${CMAKE_CURRENT_SOURCE_DIR}/testsuite/runtest.py"
-                        "${CMAKE_CURRENT_BINARY_DIR}/testsuite/runtest.py"
-                    MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/testsuite/runtest.py")
-add_custom_target ( CopyFiles ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/testsuite/runtest.py" )
-
-#   Tests that require oiio-images:
-oiio_add_tests (gpsread
-                oiiotool oiiotool-attribs  oiiotool-copy
-                oiiotool-readerror oiiotool-xform
-                oiiotool-fixnan ## maketx & oiiotool-maketx depend on this
-                maketx oiiotool-maketx
-                misnamed-file
-                missingcolor
-                texture-interp-bicubic
-                texture-blurtube
-                texture-crop texture-cropover
-                texture-derivs texture-fill texture-filtersize
-                texture-flipt texture-gettexels texture-gray
-                texture-mip-nomip texture-mip-trilinear
-                texture-overscan texture-pointsample
-                texture-uint8
-                texture-width0blur
-                texture-fat texture-skinny texture-wrapfill
-                texture-missing texture-res texture-maxres
-                texture-udim texture-udim2
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images"
-               )
-
-#   Remaining freestanding tests:
-oiio_add_tests (nonwhole-tiles
-                oiiotool-composite
-                oiiotool-pattern
-                oiiotool-subimage oiiotool-text
-                diff
-                dither dup-channels
-                jpeg-corrupt
-                null
-                rational
-               )
-
-# Travis + old libjpeg seems to not catch an error in this test, skip it
-# for that case.
-if (JPEG_TURBO_FOUND OR NOT DEFINED ENV{TRAVIS})
-    oiio_add_tests (jpeg-corrupt-header)
-endif()
-
-# Add tests that require the Python bindings if we built the Python
-# bindings. This is mostly the test that are specifically about testing
-# the Python bindings themselves, but also a handful of tests that are
-# mainly about other things but happen to use Python in order to perform
-# thee test.
-# We also exclude these tests if this is a sanitizer build on Linux,
-# because the Python interpreter itself won't be linked with the right asan
-# libraries to run correctly.
-if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY AND NOT SANITIZE_ON_LINUX)
-    oiio_add_tests (
-            python-typedesc python-paramlist
-            python-imagespec python-roi python-deep python-colorconfig
-            python-imageinput python-imageoutput
-            python-imagebuf python-imagebufalgo
-            IMAGEDIR oiio-images
-            )
+if (PROJECT_IS_TOP_LEVEL AND BUILD_TESTING)
+    oiio_setup_test_data()
+    oiio_add_all_tests()
 endif ()
 
-oiio_add_tests (oiiotool-color
-                FOUNDVAR OPENCOLORIO_FOUND)
-
-# Advanced tests that are done by hand and for releases:
-# FIXME -- at some point, try to fix these or provide new ref images
-if (NOT DEFINED ENV{TRAVIS})
-    oiio_add_tests (
-                    texture-half texture-uint16
-                    texture-interp-bilinear
-                    texture-interp-closest
-                    texture-mip-onelevel
-                   )
+if (PROJECT_IS_TOP_LEVEL)
+    include (packaging)
 endif ()
-if (NOT DEFINED ENV{TRAVIS} AND NOT DEFINED ENV{CIRCLECI} AND NOT DEFINED ENV{GITHUB_ACTIONS})
-    oiio_add_tests (texture-icwrite)
-endif ()
-
-# List testsuites for specific formats or features which might be not found
-# or be intentionally disabled, or which need special external reference
-# images from the web that if not found, should skip the tests:
-
-oiio_add_tests (bmp
-                ENABLEVAR ENABLE_BMP
-                IMAGEDIR bmpsuite
-                URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
-oiio_add_tests (dpx
-                ENABLEVAR ENABLE_DPX
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (field3d texture-field3d
-                FOUNDVAR Field3D_FOUND ENABLEVAR ENABLE_FIELD3D)
-oiio_add_tests (fits
-                ENABLEVAR ENABLE_FITS
-                IMAGEDIR fits-images
-                URL http://www.cv.nrao.edu/fits/data/tests/)
-oiio_add_tests (gif
-                FOUNDVAR GIF_FOUND ENABLEVAR ENABLE_GIF
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (heif
-                FOUNDVAR Libheif_FOUND ENABLEVAR ENABLE_Libheif
-                URL https://github.com/nokiatech/heif/tree/gh-pages/content)
-oiio_add_tests (ico
-                ENABLEVAR ENABLE_ICO
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (iff
-                ENABLEVAR ENABLE_IFF
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (jpeg2000
-                FOUNDVAR OPENJPEG_FOUND
-                IMAGEDIR j2kp4files_v1_5
-                URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
-oiio_add_tests (openexr-suite openexr-multires openexr-chroma
-                openexr-v2 openexr-window openexr-damaged perchannel
-                oiiotool-deep
-                IMAGEDIR openexr-images
-                URL http://www.openexr.com/downloads.html)
-oiio_add_tests (openvdb
-                FOUNDVAR OpenVDB_FOUND ENABLEVAR ENABLE_OpenVDB)
-oiio_add_tests (png
-                ENABLEVAR ENABLE_PNG
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (pnm
-                ENABLEVAR ENABLE_PNM
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (psd psd-colormodes
-                ENABLEVAR ENABLE_PSD
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (ptex
-                FOUNDVAR PTEX_FOUND ENABLEVAR ENABLE_PTEX)
-oiio_add_tests (raw
-                FOUNDVAR LIBRAW_FOUND ENABLEVAR ENABLE_LIBRAW
-                IMAGEDIR oiio-images/raw
-                URL "Recent checkout of oiio-images")
-oiio_add_tests (rla
-                ENABLEVAR ENABLE_RLA
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (sgi
-                ENABLEVAR ENABLE_SGI
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (targa-tgautils
-                ENABLEVAR ENABLE_TARGA
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-oiio_add_tests (tiff-suite tiff-depths tiff-misc
-                IMAGEDIR libtiffpic
-                URL http://www.simplesystems.org/libtiff/images.html)
-oiio_add_tests (webp
-                FOUNDVAR Webp_FOUND ENABLEVAR ENABLE_Webp
-                IMAGEDIR oiio-images/webp URL "Recent checkout of oiio-images")
-oiio_add_tests (zfile ENABLEVAR ENABLE_ZFILE
-                IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
-
-if (SPI_TESTS)
-  oiio_add_tests (oiiotool-spi
-    FOUNDVAR SPI_TESTS
-    IMAGEDIR spi-oiio-tests
-    URL "noplace -- it's SPI specific tests")
-endif ()
-
-
-
-#########################################################################
-# Packaging
-set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
-# "Vendor" is only used in copyright notices, so we use the same thing that
-# the rest of the copyright notices say.
-set (CPACK_PACKAGE_VENDOR ${PROJECT_AUTHORS})
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenImageIO is an open source library for reading and writing image file formats, a nice format-agnostic image viewer, and other image-related classes and utilities.")
-set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/src/doc/Description.txt")
-set (CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-#SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_SOURCE_DIR}")
-file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/cpack")
-file (COPY "${PROJECT_SOURCE_DIR}/LICENSE.md" DESTINATION "${CMAKE_BINARY_DIR}/cpack")
-file (RENAME "${CMAKE_BINARY_DIR}/cpack/LICENSE.md" "${CMAKE_BINARY_DIR}/cpack/License.txt")
-set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/cpack/License.txt")
-file (COPY "${PROJECT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_BINARY_DIR}/cpack")
-set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/cpack/README.md")
-set (CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/src/doc/Welcome.txt")
-#SET (CPACK_STRIP_FILES Do we need this?)
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    set (CPACK_GENERATOR "TGZ;STGZ;RPM;DEB")
-    set (CPACK_SOURCE_GENERATOR "TGZ")
-endif ()
-if (APPLE)
-    set (CPACK_GENERATOR "TGZ;STGZ;PackageMaker")
-    set (CPACK_SOURCE_GENERATOR "TGZ")
-endif ()
-if (WIN32)
-    set (CPACK_GENERATOR "NSIS")
-    set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer")
-#    set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer")
-    set(CPACK_NSIS_MODIFY_PATH ON)
-    include (InstallRequiredSystemLibraries)
-endif ()
-set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-source)
-#set (CPACK_SOURCE_STRIP_FILES Do we need this?)
-set (CPACK_SOURCE_IGNORE_FILES ".*~")
-set (CPACK_COMPONENT_UNSPECIFIED_HIDDEN TRUE)
-set (CPACK_COMPONENT_UNSPECIFIED_REQUIRED TRUE)
-set (CPACK_COMPONENTS_ALL user developer documentation Unspecified)
-set (CPACK_COMPONENT_USER_DISPLAY_NAME "Applications")
-set (CPACK_COMPONENT_DEVELOPER_DISPLAY_NAME "Developer files")
-set (CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
-set (CPACK_COMPONENT_USER_DESCRIPTION
-     "Applications: oiotool, iv, iinfo, iconvert, idiff, igrep, maketx and libraries")
-set (CPACK_COMPONENT_DEVELOPER_DESCRIPTION "Include files")
-set (CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "OpenImageIO documentation")
-set (CPACK_COMPONENT_DEVELOPER_DEPENDS user)
-include (CPack)

CONTRIBUTING.md

@@ -111,13 +111,11 @@ component that deserves extended discussion or debate among the wider OIIO
 community, then it may be prudent to email oiio-dev pointing everybody to
 the pull request URL and discussing any issues you think are important.
 
-6. All pull requests automatically launch jobs on [TravisCI](https://travis-ci.org)
-for Linux and MacOS and on [Appveyor](http://appveyor.com) for Windows.
-This ensures that the build completes and that the tests suite runs
-correctly, for a varity of platform, compiler, library, and flag combinations.
-The status of the CI tests for your PR will be displayed on the GitHub PR
-page. We will not accept PRs that don't build cleanly or pass the existing
-testsuite.
+6. All pull requests automatically launch CI jobs on GitHub Actions to
+ensure that the build completes and that the tests suite runs correctly, for
+a varity of platform, compiler, library, and flag combinations. The status
+of the CI tests for your PR will be displayed on the GitHub PR page. We will
+not accept PRs that don't build cleanly or pass the existing testsuite.
 
 7. The reviewer will look over the code and critique on the "comments" area.
 Reviewers may ask for changes, explain problems they found, congratulate the
@@ -145,7 +143,7 @@ and it will automatically reformat your code according to the configuration
 file found in the `.clang-format` file at the root directory of the OIIO
 source code checkout.
 
-One of the TravisCI test matrix entries runs clang-format and fails if any
+One of the CI test matrix entries runs clang-format and fails if any
 diffs were generated (that is, if any of your code did not 100% conform to
 the `.clang-format` formatting configuration). If it fails, clicking on that
 test log will show you the diffs generated, so that you can easily correct
@@ -153,9 +151,9 @@ it on your end and update the PR with the formatting fixes.
 
 If you don't have clang-format set up on your machine, and your patch is not
 very long, you may find that it's more convenient to just submit it and hope
-for the best, and if it doesn't pass the Travis test, look at the diffs in
+for the best, and if it doesn't pass the CI test, look at the diffs in
 the log and make the corrections by hand and then submit an update to the
-patch (i.e. relying on Travis to run clang-format for you).
+patch (i.e. relying on CI to run clang-format for you).
 
 Because the basic formatting is automated by clang-format, we won't
 enumerate the rules here.

CREDITS.md

@@ -4,6 +4,7 @@ by first name.
 If you know of somebody that I missed or have corrections, please email:
 lg@openimageio.org
 
+* Adam Mains
 * Akihiro Yamasaki
 * Alan Jones
 * Alejandro Conty
@@ -14,25 +15,34 @@ lg@openimageio.org
 * Alexandre Gauthier
 * Alexis Oblet
 * Alexy Pawlow
+* Alister Chowdhury
 * Aman Shah
 * Ananth Garre
+* Anders Langlands
 * Arkady Shapkin
 * Basileios Anastasatos
 * Bastien Montagne
 * Ben De Luca
+* Biswapriyo Nath
 * Blair Tennessy
+* Blazej Floch
+* Brad Smith
 * Brecht Van Lommel
 * Brent Davis
 * Brian Hall
+* Brice Gros
 * Carl Rand
 * Cassian Andrei
 * Chad Dombrova
 * Changlin Hsieh
+* Chris Crosetto
 * Chris Foster
 * Chris Kulla
+* Chris Whalen
 * Christoph Willing
 * Cliff Stein
 * Clément Champetier
+* Dalai Felinto
 * Dan Wexler
 * Daniel Dresser
 * Daniel Flehner Heen
@@ -40,30 +50,35 @@ lg@openimageio.org
 * David Aguilar
 * David Gordon
 * Deepak Gopinath
-* Delai Felinto
 * Dennis Schridde
+* Dieter De Baets
 * Dinko Galetik
 * Dominik Bartkiewicz
 * Duncan Chan
+* Dustin Rodrigues
 * Edgar Velazquez-Armendariz
 * Eloi Du Bois
 * Elvic Liang
 * Fabien Castan
 * Fabien Servant
-* Frédéric Devernay
 * Fredrik Averpil
+* Frédéric Devernay
+* Gaurav Bansal
 * Ghislain Antony Vaillant
 * Gonzalo Garramuño
-* Grégoire De Lillo
 * Gregor Mueckl
+* Grégoire De Lillo
 * Guillaume Chatelet
 * Hanspeter Niederstrasser
+* Harry Mallon
 * Heiko Becker
 * Henri Fousse
-* Harry Mallon
 * Hugh Macdonald
+* Imarz
 * Irena Damsky
 * Ismael Cortes
+* Jan Hettenkofer
+* Jens Lindgren
 * Jep Hill
 * Jeph Alapat
 * Jeremy Rose
@@ -78,6 +93,7 @@ lg@openimageio.org
 * Justina Mikonyte
 * Kazuki Takahashi
 * Kevin Brightwell
+* Kimball Thurston
 * Konrad Kleine
 * Krzysztof Blicharski
 * Larry Gritz (project leader)
@@ -88,6 +104,7 @@ lg@openimageio.org
 * Lucille Caillaud
 * Lukas Schrangl
 * Lukasz Maliszewski
+* Luke Emrose
 * M Joonas Pihlaja
 * Malcolm Humphreys
 * Manuel Gamito
@@ -100,6 +117,7 @@ lg@openimageio.org
 * Matteo F. Vescovi
 * Matthew E. Levine
 * Max Liani
+* Merwan Achibet
 * Michel Lerenard
 * Michel Normand
 * Mikael Sundell
@@ -111,21 +129,27 @@ lg@openimageio.org
 * Nick Black
 * Nicolas Burtnyk
 * Nixon Kwok
+* Northon Patrick
 * Nuno Cardoso
+* Ole Gulbrandsen
 * Ott Tinn
 * Pascal Lecocq
 * Patrick Hodoul
+* Patrick Piché
+* Paul Melis
 * Paul Molodowitch
 * Pavel Karneliuk
 * Pete Larabell
 * Philip Nemec
 * Pino Toscano
 * Puneet Jain
+* Radu Arjocu
 * Ramon Montoya
 * Ray Molenkamp
+* Rémi Achard
 * Richard Shaw
-* Roeland Schoukens
 * Robert Matusewicz
+* Roeland Schoukens
 * Roman Zulak
 * Rui Li
 * Ryen
@@ -134,11 +158,13 @@ lg@openimageio.org
 * Samuel Nicholas
 * Scott Wilson
 * Sebastian Elsner
+* SebTV
 * Seifeddine Dridi
 * Sergey Sharybin
 * Shane Ambler
 * Simon Boorer
 * Solomon Boulos
+* SRHMorris
 * Stefan Bruens
 * Stefan Stavrev
 * Thiago Ize
@@ -156,3 +182,4 @@ lg@openimageio.org
 * Xo Wang
 * Yang Yang
 * Yann Lanthony
+* zomgrolf

INSTALL.md

@@ -2,9 +2,9 @@ Installation instructions for OpenImageIO
 =========================================
 
 # Table of Contents
-1. [OpenImageIO's Dependences](#dependencies)
-2. [Installing binaries from package managers](#installingfrompackagemanagers)
-3. [Building OIIO from source](#buildingfromsource)
+1. [OpenImageIO's Dependencies](#dependencies)
+2. [Installing binaries from package managers](#installing-from-package-managers)
+3. [Building OIIO from source](#building-from-source)
 
 
 Dependencies
@@ -14,12 +14,17 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
 
 ### Required dependencies -- OIIO will not build at all without these
 
- * C++11 (also builds with C++14 and C++17)
- * Compilers: gcc 4.8.2 - 10.1, clang 3.3 - 10.0, MSVS 2015 - 2019,
-   icc version 13 or higher
- * CMake >= 3.12 (tested through 3.18)
- * OpenEXR >= 2.0 (recommended: 2.2 or higher; tested through 2.5)
- * libTIFF >= 3.9 (recommended: 4.0+; tested through 4.1.0)
+ * **C++14** (also builds with C++17, and C++20)
+     * The default build mode is C++14. This can be controlled by via the
+       CMake configuration flag: `-DCMAKE_CXX_STANDARD=17`, etc.
+ * Compilers: **gcc 6.1 - 11.2**, **clang 3.4 - 13**, **MSVS 2017 - 2019**,
+   **icc 17+**.
+ * CMake >= 3.12 (tested through 3.22)
+ * OpenEXR/Imath >= 2.3 (recommended: 2.4 or higher; tested through 3.1)
+ * libTIFF >= 3.9 (recommended: 4.0+; tested through 4.3)
+ * libjpeg >= 8, or libjpeg-turbo >= 1.1 (tested through jpeg9d and jpeg-turbo
+   2.1)
+ * Boost >= 1.53 (recommended: at least 1.66; tested through 1.76)
 
 ### Optional dependencies -- features may be disabled if not found
  * If you are building the `iv` viewer (which will be disabled if any of
@@ -27,38 +32,48 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
      * Qt >= 5.6 (tested through 5.15)
      * OpenGL
  * If you are building the Python bindings or running the testsuite:
-     * Python >= 2.7 (tested against 2.7, 3.6, 3.7, 3.8)
-     * pybind11 >= 2.4.2 (Tested through 2.5.)
+     * Python >= 2.7 (tested against 2.7, 3.7, 3.8, 3.9)
+     * pybind11 >= 2.4.2 (Tested through 2.9.)
      * NumPy
  * If you want support for camera "RAW" formats:
-     * LibRaw >= 0.15 (tested 0.15 - 0.20; LibRaw >= 0.18 is necessary for
-       ACES support and much better recognition of camera metadata)
+     * LibRaw >= 0.15 (tested 0.15 - 0.20.2; LibRaw >= 0.18 is necessary for
+       ACES support and much better recognition of camera metadata; if
+       building with C++17 or higher, LibRaw >= 0.20 is necessary)
  * If you want support for a wide variety of video formats:
-     * ffmpeg >= 2.6 (tested through 4.3)
+     * **ffmpeg >= 3.0** (tested through 5.0)
  * If you want support for jpeg 2000 images:
-     * **OpenJpeg >= 2.0** (tested through 2.3)
- * If you want support for Field3D files:
-     * Field3D
+     * **OpenJpeg >= 2.0** (tested through 2.4; we recommend 2.4 or higher
+       for multithreading support)
  * If you want support for OpenVDB files:
-     * OpenVDB >= 5.0 (tested through 7.0) and Intel TBB >= 2018 (tested
-       through 2020_U1)
+     * OpenVDB >= 5.0 (tested through 9) and Intel TBB >= 2018 (tested
+       through 2021)
+     * Note that OpenVDB 8.0+ requires C++14 or higher.
  * If you want support for converting to and from OpenCV data structures,
    or for capturing images from a camera:
-     * OpenCV 2.x, 3.x, or 4.x (tested through 4.3)
+     * **OpenCV 3.x, or 4.x** (tested through 4.5)
  * If you want support for GIF images:
      * giflib >= 4.1 (tested through 5.2; 5.0+ is strongly recommended for
        stability and thread safety)
- * If you want support for HEIF/HEIC images:
-     * libheif >= 1.3 (tested through 1.6; older versions may also work, we
-       haven't tested)
+ * If you want support for HEIF/HEIC or AVIF images:
+     * libheif >= 1.3 (1.7 required for AVIF support, tested through 1.12)
+     * libheif must be built with an AV1 encoder/decoder for AVIF support.
+     * Avoid libheif 1.10 on Mac, it is very broken. Libheif 1.11 is fine.
  * If you want support for DDS files:
      * libsquish >= 1.13 (tested through 1.15)
      * But... if not found on the system, an embedded version will be used.
  * If you want support for DICOM medical image files:
      * DCMTK >= 3.6.1 (tested through 3.6.5)
+ * If you want support for WebP images:
+     * WebP >= 0.6.1 (tested through 1.2.1)
  * If you want support for OpenColorIO color transformations:
-     * OpenColorIO >= 1.1 (also tested against the current master that will
-       become OCIO 2.0).
+     * OpenColorIO >= 1.1 (tested through 2.1; 2.0+ is recommended)
+ * If you want support for Ptex:
+     * Ptex >= 2.3.1 (probably works for older; tested through 2.4.0)
+ * We use PugiXML for XML parsing. There is a version embedded in the OIIO
+   tree, but if you want to use an external, system-installed version (as
+   may be required by some software distributions with policies against
+   embedding other projects), then just build with `-DUSE_EXTERNAL_PUGIXML=1`.
+   Any PugiXML >= 1.8 should be fine (we have tested through 1.11).
 
 
 
@@ -68,6 +83,11 @@ Mac OS X, and Windows.
 Our build system is based upon 'CMake'.  If you don't already have it
 installed on your system, you can get it from http://www.cmake.org
 
+If certain dependencies (robin-map and fmtlib) are not found, their sources
+will be retrieved and built into libraries, as part of the build process. The 
+sources of those dependences are cloned from their Git repo, hence `git` must 
+be available as a command.
+
 After you build OpenImageIO, if you compiled with the `EMBEDPLUGINS=0` flag
 you will need to set the environment variable `OIIO_LIBRARY_PATH` to point
 to the 'lib' directory where OpenImageIO is installed, or else it will
@@ -81,10 +101,10 @@ If all you want to do is install the OIIO libraries, headers, and command
 line tools as quickly as possible (don't need OIIO source or any custom
 build options), maybe one of these packages managers will do it for you:
 
-* vckpg (https://github.com/Microsoft/vcpkg)
+* vcpkg (https://github.com/Microsoft/vcpkg)
     * https://github.com/Microsoft/vcpkg/tree/master/ports/openimageio
-    * `.\vcpkg install openimageio [tools]`
-    * For a full list of supported build features: `.\vcpkg search openimageio`
+    * `vcpkg install openimageio [tools]`
+    * For a full list of supported build features: `vcpkg search openimageio`
 * homebrew (https://github.com/Homebrew/brew)
     * https://formulae.brew.sh/formula/openimageio
     * `brew install openimageio`
@@ -139,7 +159,7 @@ file format (jpeg, fits, png, etc.). This works both as a CMake variable and
 also as an environment variable.
 
 `ENABLE_PkgName=0` : Disables use of an *optional* dependency (such as
-FFmpeg, Field3D, Webp, etc.) -- even if the dependency is found on the
+FFmpeg, OpenVDB, Webp, etc.) -- even if the dependency is found on the
 system. This will obviously disable any functionality that requires the
 dependency. This works both as a CMake variable and
 also as an environment variable.
@@ -215,7 +235,7 @@ Additionally, a few helpful modifiers alter some build-time options:
 | make USE_PYTHON=0 ...     |  Don't build the Python binding                |
 | make BUILD_SHARED_LIBS=0  |  Build static library instead of shared        |
 | make LINKSTATIC=1 ...     |  Link with static external libraries when possible |
-| make SOVERSION=nn ...     |  Include the specifed major version number in the shared object metadata |
+| make SOVERSION=nn ...     |  Include the specified major version number in the shared object metadata |
 | make NAMESPACE=name       |   Wrap everything in another namespace         |
 
 The command 'make help' will list all possible options.
@@ -243,91 +263,10 @@ or, if you are using CMake directly,
 Building on Windows
 -------------------
 
-**Method 1 - Default**
+**Method 1 - from source**
 
-1. Check out the trunk or a branch of your choice.  The remainder of
-   these instructions assume that you checked out the trunk to the
-   D:\OIIO\trunk directory.
-
-2. Download the package with precompiled external libraries from
-http://www.openimageio.org/external.zip
-
-   Next, unpack it. The directory with downloaded code from the repository
-   and the directory with unpacked libraries should be siblings. For example,
-
-   ```
-   D:
-       \OIIO
-           \trunk          // this is my tree
-               \src        // directory with src files for OIIO
-               \build      // directory that is created by cmake
-           \external       // this is extracted external package
-               \dist
-                   \windows
-                       \glew-1.5.1
-                       \ilmbase-1.0.1
-                       \jpeg-6b
-                       \libpng-1.2.3
-                       \openexr-1.6.1
-                       \tbb-21_20080605oss
-                       \zlib-1.2.3
-                       \tiff-3.8.2
-   ```
-
-3. Download precompiled Qt4 binaries for Windows from here:
-   http://qt.windows.binaries.googlepages.com/index.html
-
-   Unpack it (it doesn't matter where). After unpacking, add the path to
-   the Qt bin directory to the PATH variable. For example, if you unpacked
-   this package to the D:\qt-win directory, you should add D:\qt-win\bin to
-   your PATH. It's important to add the Qt bin directory to PATH because
-   the FindQt4 module uses it to search for qmake applications.
-
-4. Also, just to be safe, add QTDIR to the environment variables. It
-   should point to directory where you unpacked Qt.
-
-5. Download precompiled BOOST 1.53 or newer libraries from
-   http://www.boostpro.com/download
-
-   Install it on your system. Choose two versions: Multithread Debug, DLL
-   and Multithread, DLL for Your Visual Studio version.
-
-6. Download precompiled BOOST 1.53 or newer libraries from here (unfficial
-   mirror) or from here (unofficial mirror, registration required). Install
-   it on Your system. Choose two versions: Multithread Debug, DLL and
-   Multithread, DLL for Your Visual Studio version.
-
-7. Install cmake. You can download precompiled binaries from here:
-   http://www.cmake.org/cmake/resources/software.html
-   After installing, run cmake-gui. Set the field that specifies the source
-   code location (for example, to D:\OIIO\trunk\src). Then set the field
-   that specifies where to build binaries to the directory you want to
-   build project for OIIO (for example, D:\OIIO\trunk\build).
-
-8. Set the THIRD_PARTY_TOOLS_HOME environment variable to the directory
-   where are stored unpacked external libraries (for example,
-   D:\OIIO\external\dist\windows). You can add variables by clicking Add
-   entry button.
-
-9. Hit the Configure button. Cmake should automatically find externals
-   libraries and prepare the environment for creating the OIIO project. If
-   the configuration process ends without errors go to next step. If not,
-   read the instructions from the end of this tutorial.
-
-10. Hit the Generate button. Cmake will build Visual Studio a solution in
-the build directory.
-
-11. That's all. You can open the OpenImageIO solution and start developing
-OIIO! Potential problems:
-
-
-It may happen that cmake won't find zlib, png, tiff or jpeg
-libraries. If so you have to set CMAKE_PREFIX_PATH to point to the
-directory where the missing libraries are stored. For example, if cmake
-can't find ZLIB, add to CMAKE_PREFIX_PATH the
-D:\OIIO\external\dist\windows\zlib-1.2.3 directory. If it can't find
-ZLIB and PNG, add
-D:\OIIO\external\dist\windows\zlib-1.2.3;D:\OIIO\external\dist\windows\libpng-1.2.3.
+I really need someone to write correct, modern docs about how to build
+from source on Windows.
 
 **Method 2 - Using vcpkg**
 
@@ -335,7 +274,7 @@ D:\OIIO\external\dist\windows\zlib-1.2.3;D:\OIIO\external\dist\windows\libpng-1.
 
 2. Follow vcpkg installation instructions and complete the install. Please note vcpkg has its own list of prerequisites listed on their page.
 
-3. Execute the PowerShell command from where vcpkg is located in directory. ``.\vcpkg install openimageio``
+3. Execute the PowerShell command from where vcpkg is located in directory. ``vcpkg install openimageio``
 
 Test Images
 -----------

LICENSE.md

@@ -1,5 +1,3 @@
-BSD 3-Clause License
-
 Copyright (c) 2008-present by Contributors to the OpenImageIO project.
 All Rights Reserved.
 

Makefile

@@ -10,7 +10,7 @@
 #
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 #########################################################################
 
 
@@ -21,18 +21,9 @@ working_dir	:= ${shell pwd}
 # Figure out which architecture we're on
 include ${working_dir}/src/make/detectplatform.mk
 
-# Presence of make variables DEBUG and PROFILE cause us to make special
-# builds, which we put in their own areas.
-ifdef DEBUG
-    variant +=.debug
-endif
-ifdef PROFILE
-    variant +=.profile
-endif
-
 MY_MAKE_FLAGS ?=
 MY_NINJA_FLAGS ?=
-MY_CMAKE_FLAGS += -g3
+MY_CMAKE_FLAGS ?=
 BUILDSENTINEL ?= Makefile
 NINJA ?= ninja
 CMAKE ?= cmake
@@ -46,10 +37,8 @@ endif
 
 # Set up variables holding the names of platform-dependent directories --
 # set these after evaluating site-specific instructions
-top_build_dir ?= build
-build_dir     ?= ${top_build_dir}/${platform}${variant}
-top_dist_dir  ?= dist
-dist_dir      ?= ${top_dist_dir}/${platform}${variant}
+build_dir ?= build
+dist_dir  ?= dist
 
 INSTALL_PREFIX ?= ${working_dir}/${dist_dir}
 
@@ -95,7 +84,7 @@ MY_CMAKE_FLAGS += -DPYLIB_INCLUDE_SONAME:BOOL=${PYLIB_INCLUDE_SONAME}
 endif
 
 ifneq (${USE_EXTERNAL_PUGIXML},)
-MY_CMAKE_FLAGS += -DUSE_EXTERNAL_PUGIXML:BOOL=${USE_EXTERNAL_PUGIXML} -DPUGIXML_HOME=${PUGIXML_HOME}
+MY_CMAKE_FLAGS += -DUSE_EXTERNAL_PUGIXML:BOOL=${USE_EXTERNAL_PUGIXML}
 endif
 
 ifneq (${OPENEXR_ROOT},)
@@ -245,7 +234,7 @@ endif
 #########################################################################
 # Top-level documented targets
 
-all: dist
+all: install
 
 # 'make debug' is implemented via recursive make setting DEBUG
 debug:
@@ -265,7 +254,7 @@ config:
 		cd ${build_dir} ; \
 		${CMAKE} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} \
 			 -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
-			 ${MY_CMAKE_FLAGS} ../.. ; \
+			 ${MY_CMAKE_FLAGS} ${working_dir} ; \
 	 fi)
 
 
@@ -303,7 +292,7 @@ clang-format: config
 	  )
 
 
-# 'make dist' is just a synonym for 'make install'
+# DEPRECATED: 'make dist' is just a synonym for 'make install'
 dist : install
 
 TEST_FLAGS += --force-new-ctest-process --output-on-failure
@@ -336,10 +325,8 @@ clean:
 realclean: clean
 	${CMAKE} -E remove_directory ${dist_dir}
 
-# 'make nuke' blows away the build and dist areas for all platforms
-nuke:
-	${CMAKE} -E remove_directory ${top_build_dir}
-	${CMAKE} -E remove_directory ${top_dist_dir}
+# DEPRECATED: 'make nuke' blows away the build and dist areas for all platforms
+nuke: realclean
 
 doxygen:
 	doxygen src/doc/Doxyfile
@@ -359,7 +346,6 @@ help:
 	@echo "  make profile      Build and install for profiling"
 	@echo "  make clean        Remove the temporary files in ${build_dir}"
 	@echo "  make realclean    Remove both ${build_dir} AND ${dist_dir}"
-	@echo "  make nuke         Remove ALL of build and dist (not just ${platform})"
 	@echo "  make test         Run tests"
 	@echo "  make testall      Run all tests, even broken ones"
 	@echo "  make clang-format Run clang-format on all the source files"
@@ -370,7 +356,7 @@ help:
 	@echo "      STOP_ON_WARNING=0        Do not stop building if compiler warns"
 	@echo "      OPENIMAGEIO_SITE=xx      Use custom site build mods"
 	@echo "      MYCC=xx MYCXX=yy         Use custom compilers"
-	@echo "      CMAKE_CXX_STANDARD=14    Compile in C++14 mode (default is C++11)"
+	@echo "      CMAKE_CXX_STANDARD=14    C++ standard to build with (default is 14)"
 	@echo "      USE_LIBCPLUSPLUS=1       For clang, use libc++"
 	@echo "      GLIBCXX_USE_CXX11_ABI=1  For gcc, use the new string ABI"
 	@echo "      EXTRA_CPP_ARGS=          Additional args to the C++ command"
@@ -392,7 +378,7 @@ help:
 	@echo "      For each dependeny Foo, defining ENABLE_Foo=0 disables it, even"
 	@echo "      if found. And you can hint where to find it with Foo_ROOT=path"
 	@echo "      Note that it is case sensitive! The list of package names is:"
-	@echo "          DCMTK  FFmpeg  Field3D  Freetype  GIF  JPEGTurbo"
+	@echo "          DCMTK  FFmpeg  Freetype  GIF  JPEGTurbo"
 	@echo "          LibRaw  OpenColorIO  OpenCV  OpenGL  OpenJpeg  OpenVDB"
 	@echo "          PTex  R3DSDK  TBB  TIFF  Webp"
 	@echo "  Finding and Using Dependencies:"

README.md

@@ -2,8 +2,7 @@ README for OpenImageIO
 ======================
 
 [![License](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md)
-[![Build Status](https://travis-ci.org/OpenImageIO/oiio.svg?branch=master)](https://travis-ci.org/OpenImageIO/oiio)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/a0l32ti7gcoergtf/branch/master?svg=true)](https://ci.appveyor.com/api/projects/status/a0l32ti7gcoergtf/branch/master)
+[![CI](https://github.com/OpenImageIO/oiio/actions/workflows/ci.yml/badge.svg)](https://github.com/OpenImageIO/oiio/actions/workflows/ci.yml)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2694/badge)](https://bestpractices.coreinfrastructure.org/projects/2694)
 
 
@@ -19,7 +18,7 @@ OpenImageIO consists of:
 * Simple but powerful ImageInput and ImageOutput APIs that provide
   an abstraction for reading and writing image files of nearly any
   format, without the calling application needing to know any of the
-  details of these file formats, and indeed without the calling 
+  details of these file formats, and indeed without the calling
   application needing to be aware of which formats are available.
 
 * A library that manages subclasses of ImageInput and ImageOutput that
@@ -31,9 +30,9 @@ OpenImageIO consists of:
 * Plugins implementing I/O for several popular image file formats,
   including TIFF, JPEG/JFIF, OpenEXR, PNG, HDR/RGBE, ICO, BMP, Targa,
   JPEG-2000, RMan Zfile, FITS, DDS, Softimage PIC, PNM, DPX, Cineon,
-  IFF, Field3D, OpenVDB, Ptex, Photoshop PSD, Wavefront RLA, SGI, WebP,
-  GIF, DICOM, HEIC/HEIF, many "RAW" digital camera formats, and a variety of
-  movie formats (readable as individual frames).  More are being developed
+  IFF, OpenVDB, Ptex, Photoshop PSD, Wavefront RLA, SGI, WebP,
+  GIF, DICOM, HEIF/HEIC/AVIF, many "RAW" digital camera formats, and a variety
+  of movie formats (readable as individual frames).  More are being developed
   all the time.
 
 * Several command line image tools based on these classes, including
@@ -83,7 +82,7 @@ particular licensing terms in your own application.
 Some code and resources are distributed along with OIIO that have highly
 compatible, though slightly different, licenses (generally MIT or Apache).
 See the PDF documentation Acknowledgements section, and the
-[LICENSE-THIRD-PARTY](LICENSE-THIRD-PARTY.md) file for details.
+[THIRD-PARTY](THIRD-PARTY.md) file for details.
 
 
 Building and Installation
@@ -113,7 +112,7 @@ Simple "how do I...", "I'm having trouble", or "is this a bug" questions are
 best asked on the [oiio-dev developer mail
 list](http://lists.openimageio.org/listinfo.cgi/oiio-dev-openimageio.org).
 That's where the most people will see it and potentially be able to answer
-your question quickly (moreso than a GH "issue").
+your question quickly (more so than a GH "issue").
 
 Bugs, build problems, and discovered vulnerabilities that you are relatively
 certain is a legit problem in the code, and for which you can give clear
@@ -146,4 +145,3 @@ Mail list subscriptions and archives:
 * Developer mail list: http://lists.openimageio.org/listinfo.cgi/oiio-dev-openimageio.org
 
 * Just release announcements: http://lists.openimageio.org/listinfo.cgi/oiio-announce-openimageio.org
-

THIRD-PARTY.md

@@ -21,12 +21,19 @@ SPDX-License-Identifier: BSD-3-Clause
   OIIO, but since some elements are derived from that, we still acknowledge
   the original copyright here.
 
-* Open Shading Language. Copyright Sony Pictures Imageworks Inc.
+* Open Shading Language. Copyright contributors to the OSL project.
+  https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
 
   A few parts here and there, notably parts of fmath.h and many of the CMake
   files, contain code that was originally developed for Open Shading
   Language but subsequently moved to OIIO.
 
+* OpenColorIO (c) Copyright contributors to the OpenColorIO Project.
+  https://github.com/AcademySoftwareFoundation/OpenColorIO
+
+  The sample OpenColorIO configurations in our testsuite are borrowed from
+  this ASWF project, also BSD-3-Clause licensed.
+
 * DPX reader/writer (c) Copyright 2009 Patrick A. Palmer.
   https://github.com/patrickpalmer/dpx
 

appveyor.yml

@@ -1,117 +0,0 @@
-version: '{branch}-{build}'
-image: Previous Visual Studio 2015
-clone_folder: C:\projects\oiio
-test: off
-configuration:
-    - Release
-    # - Debug
-platform:
-    - x64
-# branches:
-#   only:
-#     - master
-environment:
-  matrix:
-    - CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
-      PYTHON_DIR: "C:\\Python27-x64"
-      tbs_arch: "x64"
-      tbs_tools: "msvc14"
-      tbs_static_runtime: 0
-      MY_CMAKE_FLAGS: -DUSE_PYTHON=0
-      USE_PYTHON: 0
-
-
-cache:
-  - C:\tools\vcpkg\installed
-  #- C:\tools\vcpkg -> appveyor.yml
-  #- C:\projects\ext -> appveyor.yml
-  # The -> means that the cache dir is discarded if appveyor.yml has changed
-
-install:
-  - ps: $OIIO_INSTALL_BEGIN=Get-Date
-  - cinstall: python
-  - git submodule update --init --recursive
-  - set CMAKE_PREFIX_PATH=C:/Sys;%APPVEYOR_BUILD_FOLDER%/ext;c:/tools/vcpkg/installed/%platform%-windows
-  - set CMAKE_LIBRARY_PATH=C:/Sys/lib;%APPVEYOR_BUILD_FOLDER%/ext/lib
-  - set CMAKE_INCLUDE_PATH=C:/Sys/include;%APPVEYOR_BUILD_FOLDER%/ext/include
-  - mkdir c:\sys
-  - mkdir ext
-  - cd ext
-  - mkdir lib
-  - mkdir include
-
-  # Boost
-  # 1.63 is already installed on appveyor, just use it
-  - set BOOST_ROOT=C:\Libraries\boost_1_66_0
-  - set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%BOOST_ROOT%
-
-  # Install a bunch of vcpkg dependencies. We rely on the run-to-run caching
-  # of these, but if the cache is flushed, it takes too long to rebuild them
-  # all, so we stage it.
-  - vcpkg list
-  - vcpkg update
-  # - vcpkg help triplet
-
-  # Dependencies that don't take too long, just build them unconditionally.
-  - vcpkg install zlib:"%platform%"-windows
-  - vcpkg install tiff:"%platform%"-windows
-  - vcpkg install libpng:"%platform%"-windows
-  - vcpkg install openexr:"%platform%"-windows
-  - vcpkg install freetype:"%platform%"-windows
-  - vcpkg install giflib:"%platform%"-windows
-  - vcpkg install libwebp:"%platform%"-windows
-  - vcpkg install openjpeg:"%platform%"-windows
-  - vcpkg install ptex:"%platform%"-windows
-  - vcpkg install libraw:x64-windows
-  - vcpkg install pybind11:x64-windows
-
-  # Qt
-  - set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;C:\Qt\5.12
-
-
-  # Expensive optional deps only build if there's plenty of time left.
-  # If we run out the clock, the cache won't be saved.
-  # - ps: |
-  #       $OIIO_BUILD_NOW=Get-Date
-  #       if (($OIIO_BUILD_NOW-$OIIO_INSTALL_BEGIN).TotalMinutes -gt 15) {
-  #           Add-AppveyorMessage -Message "OIIO low on time, skippping dependency qt5-base"
-  #       } else {
-  #           vcpkg install qt5-base:x64-windows
-  #       }
-
-  # Wish list:
-  #   OpenCV
-  #   ffmpeg
-  #   OpenColorIO
-
-  - cd ..
-  - dir C:\Sys
-  # - dir C:\Sys\include
-  # - dir C:\Sys\lib
-  - vcpkg list
-  - dir c:\tools\vcpkg
-  - dir c:\tools\vcpkg\installed\x64-windows
-  - dir C:\projects\oiio\ext
-  - dir C:\projects\oiio\ext\include
-  - dir C:\projects\oiio\ext\lib
-
-
-build_script:
-  - echo Running cmake...
-  - cd c:\projects\oiio
-  - mkdir build
-  - mkdir build\windows64
-  - cd build\windows64
-  - cmake -G "%CMAKE_PLATFORM%" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake \
-      -DCMAKE_INSTALL_PREFIX=C:\projects\oiio\dist\windows64 \
-      -DUSE_PYTHON=0 -DUSE_PTEX=0 \
-      -DPYTHON_INCLUDE_DIR:PATH=%PYTHON_DIR%/include -DPYTHON_LIBRARY:FILEPATH=%PYTHON_DIR%/libs/python27.lib -DPYTHON_EXECUTABLE:FILEPATH=%PYTHON_DIR%/python.exe -DCMAKE_LIBRARY_PATH=%CMAKE_LIBRARY_PATH% -DCMAKE_INCLUDE_PATH=%CMAKE_INCLUDE_PATH%  -DCMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH% -DOPENEXR_ROOT_DIR=C:\projects\oiio\ext -DVERBOSE=1 -DBUILD_MISSING_DEPS=1 ../..
-  - dir c:\projects\oiio
-  - dir c:\projects\oiio\build
-  - dir c:\projects\oiio\build\windows64
-  - cmake --build . --config %CONFIGURATION% --target install
-  - dir c:\projects\oiio\dist\windows64
-
-
-matrix:
-    fast_finish: true

conanfile.txt

@@ -18,7 +18,6 @@ tbb/2020.0
 # pybind11/2.4.3 - conan doesn't have this minimum version
 # dcmtk
 # ffmpeg
-# field3d
 # libheif
 # libraw
 # openvdb

site/spi/Makefile-bits

@@ -3,48 +3,18 @@ ifneq (${VERBOSE},)
 $(info Including spi/Makefile-bits)
 endif
 
-# For SpComp2 builds, do:
-#
-#     make OIIO_SPCOMP2=1 spcomp2_install
-# or
-#     make OIIO_SPCOMP2=1 SPCOMP2_LOCAL_PATH=/test/path spcomp2_install_local
-#
 # For Arnold builds, do:
 #
 #     make OIIO_ARNOLD=1
 #
-# For a Rez-bound build, do:
-#
-#     make OIIO_SPIREZ=1 spi
-#
-#     (Options: OIIO_REZ_NAME=blah REZ_PACKAGE_ROOT=path)
-#
 # Otherwise a default 'make' will make a fully generic OIIO build.
 
-OIIO_SPCOMP2 ?= 0
 OIIO_ARNOLD ?= 0
-OIIO_SPIREZ ?= 0
-OIIO_REZ_NAME ?= OpenImageIO
 OIIO_VERS = $(shell grep "OpenImageIO VERSION" CMakeLists.txt | egrep -o "[0-9.]+")
-ONEVERS = $(shell site/spi/format_version.py ${OIIO_VERS})
-OPENIMAGEIO_SPCOMP2_VERSION ?= ${ONEVERS}
 
-ifeq (${OIIO_SPCOMP2},1)
-    $(info Building for SpComp2)
-    OIIO_ARNOLD := 0
-    NAMESPACE ?= 'OpenImageIO_SpComp2'
-    SOVERSION ?= ${OPENIMAGEIO_SPCOMP2_VERSION}
-    PYLIB_LIB_PREFIX ?= 1
-    PYLIB_INCLUDE_SONAME ?= 1
-else ifeq (${OIIO_ARNOLD},1)
+ifeq (${OIIO_ARNOLD},1)
     $(info Building for Arnold)
     NAMESPACE ?= 'OpenImageIO_Arnold'
-else ifeq (${OIIO_SPIREZ},1)
-    $(info Building for Rez distribution)
-    # NAMESPACE ?= 'OpenImageIO'
-    MY_CMAKE_FLAGS += -DOIIO_SPIREZ=1 -DOIIO_REZ_PACKAGE_NAME=${OIIO_REZ_NAME}
-    MY_CMAKE_FLAGS += -DCMAKE_DEBUG_POSTFIX=_d
-else
     $(info Building generic OpenImageIO)
     # NAMESPACE ?= 'OpenImageIO'
 endif
@@ -57,43 +27,36 @@ ifeq (${SP_OS}, rhel7)
     # Rhel7 (current)
     platform := rhel7
     SPI_COMPILER_PLATFORM ?= gcc-6.3
-    ifeq (${SPI_COMPILER_PLATFORM},gcc-4.8)
-        SPCOMP2_COMPILER ?= gcc48m64
-        CMAKE_CXX_STANDARD ?= 11
-        LLVM_VERSION ?= 9.0.1-1
-    else
+    ifeq (${SPI_COMPILER_PLATFORM},gcc-6.3)
         SPCOMP2_COMPILER ?= gcc63
         CMAKE_CXX_STANDARD ?= 14
-        LLVM_VERSION ?= 10.0.0-1
+        LLVM_VERSION ?= 12.0.1
     endif
     SP_PLATFORM ?= linux
-    SP_PROC ?= x86_64
-    SP_REZ_OS ?= CentOS-7
 else ifeq (${platform}, macosx)
     # Generic OSX machines (including LG's laptop)
     COMPILER ?= clang
     SPCOMP2_COMPILER ?= clang
+    CMAKE_CXX_STANDARD ?= 14
     SP_OS ?= macosx
     SP_PLATFORM ?= macosx
-    SP_PROC ?= x86_64
-    SP_REZ_OS ?= MacOS
 else
     $(error Unknown SP_OS=${SP_OS} platform=${platform})
 endif  # endif ${SP_OS}
 
-PYTHON_VERSION ?= 2.7
 MY_CMAKE_FLAGS += -DSP_OS=${SP_OS} -DSP_PLATFORM=${SP_PLATFORM}
-MY_CMAKE_FLAGS += -DSP_PROC=${SP_PROC} -DSP_REZ_OS=${SP_REZ_OS}
 MY_CMAKE_FLAGS += -DSPI_COMPILER_PLATFORM=${SPI_COMPILER_PLATFORM}
 MY_CMAKE_FLAGS += -DEXTRA_CPP_ARGS:STRING="-DOIIO_SPI=1" -DOIIO_SITE:STRING=spi
-MY_CMAKE_FLAGS += -DSPI_TESTS=1
+MY_CMAKE_FLAGS += -DSPI_TESTS=1 -DPROJECT_VERSION_RELEASE_TYPE=spi
 MY_CMAKE_FLAGS += -DOIIO_NAMESPACE_INCLUDE_PATCH=1
+MY_CMAKE_FLAGS += -DCMAKE_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX:-_d}
 REZ_PACKAGE_ROOT ?= /shots/spi/home/software/packages
 SPCOMP2_ROOT ?= /shots/spi/home/lib/SpComp2
 
 
 ## Rhel7 (current)
 ifeq (${SP_OS}, rhel7)
+    PYTHON_VERSION ?= 2.7
     USE_SIMD ?= sse4.1,aes
     CMAKE ?= cmake
     USE_NINJA ?= 1
@@ -106,8 +69,6 @@ ifeq (${SP_OS}, rhel7)
     MY_CMAKE_FLAGS += -DCMAKE_INSTALL_LIBDIR="${INSTALL_PREFIX}/lib"
     ifeq (${OIIO_SPCOMP2},1)
         MY_CMAKE_FLAGS += -DPYTHON_SITE_DIR="${INSTALL_PREFIX}/python"
-    else ifeq (${OIIO_SPIREZ},1)
-        MY_CMAKE_FLAGS += -DPYTHON_SITE_DIR="${INSTALL_PREFIX}/python"
     else ifeq (${OIIO_ARNOLD},1)
         OIIO_LIBNAME_SUFFIX=_Arnold
     endif
@@ -117,18 +78,15 @@ ifeq (${SP_OS}, rhel7)
     #
     # A variety of tags can be used to try specific versions of gcc or
     # clang from the site-specific places we have installed them.
-    LLVM_DIRECTORY ?= /shots/spi/home/software/packages/llvm/${LLVM_VERSION}/${SPI_COMPILER_PLATFORM}
-    ifeq (${COMPILER},clang7)
-        LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_7.0.1
-        MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
-    else ifeq (${COMPILER},clang8)
-        LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_8.0.0
-        MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
-    else ifeq (${COMPILER},clang9)
-        LLVM_DIRECTORY := /shots/spi/home/software/packages/llvm/9.0.1-1/${SPI_COMPILER_PLATFORM}
+    LLVM_DIRECTORY ?= ${REZ_PACKAGE_ROOT}/llvm/${LLVM_VERSION}/${SPI_COMPILER_PLATFORM}
+    ifeq (${COMPILER},clang9)
+        LLVM_DIRECTORY := ${REZ_PACKAGE_ROOT}/llvm/9.0.1-1/${SPI_COMPILER_PLATFORM}
         MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
     else ifeq (${COMPILER},clang10)
-        LLVM_DIRECTORY := /shots/spi/home/software/packages/llvm/10.0.0-1/${SPI_COMPILER_PLATFORM}
+        LLVM_DIRECTORY := ${REZ_PACKAGE_ROOT}/llvm/10.0.0-1/${SPI_COMPILER_PLATFORM}
+        MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
+    else ifeq (${COMPILER},clang11)
+        LLVM_DIRECTORY := ${REZ_PACKAGE_ROOT}/llvm/11.0.0/${SPI_COMPILER_PLATFORM}
         MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
     else ifeq (${COMPILER},clang)
         MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
@@ -144,43 +102,16 @@ ifeq (${SP_OS}, rhel7)
            -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang \
            -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
     endif
-    ifeq (${SPI_COMPILER_PLATFORM},gcc-4.8)
-            MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" \
-                              -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" \
-                              -DTOOLCHAIN_FLAGS="--gcc-toolchain=/usr"
-    endif
 
     #
     # Boost
     #
     BOOSTVERS ?= 1.70
-    BOOSTSPSUFFIX ?=
-    BOOSTVERSSP=${BOOSTVERS}${BOOSTSPSUFFIX}
-    MY_CMAKE_FLAGS += -DBOOST_VERS_SP=${BOOSTVERSSP}
-    # $(info BOOSTVERSSP ${BOOSTVERSSP})
-    ifeq (${BOOSTVERS},1.55)
-        SPBOOST_INC_DIR ?= /usr/include/boost_${BOOSTVERSSP}
-        SPBOOST_LIB_DIR ?= /usr/lib64/boost_${BOOSTVERSSP}
-        ifeq (${BOOSTSPSUFFIX}, sp)
-            SPBOOST_LIBNAMESTART ?= lib${BOOSTSPSUFFIX}boost_${shell echo ${BOOSTVERS} | sed "s/\\./_/"}_0
-        else
-            SPBOOST_LIBNAMESTART ?= lib${BOOSTSPSUFFIX}boost
-        endif
-        SPBOOST_LIBNAMEEND ?= -gcc48-mt-${shell echo ${BOOSTVERS} | sed "s/\\./_/"}
-        MY_CMAKE_FLAGS += \
-            -DBOOST_CUSTOM=1 \
-            -DBoost_VERSION=${BOOSTVERS} \
-            -DBoost_INCLUDE_DIRS=${SPBOOST_INC_DIR} \
-            -DBoost_LIBRARY_DIRS=${SPBOOST_LIB_DIR} \
-            -DBoost_LIBRARIES:STRING="${SPBOOST_LIB_DIR}/${SPBOOST_LIBNAMESTART}_filesystem${SPBOOST_LIBNAMEEND}.so;${SPBOOST_LIB_DIR}/${SPBOOST_LIBNAMESTART}_regex${SPBOOST_LIBNAMEEND}.so;${SPBOOST_LIB_DIR}/${SPBOOST_LIBNAMESTART}_system${SPBOOST_LIBNAMEEND}.so;${SPBOOST_LIB_DIR}/${SPBOOST_LIBNAMESTART}_thread${SPBOOST_LIBNAMEEND}.so"
-    else
-        # Our Boost >= 1.61 setup is MUCH simpler and more standard
-	SPBOOST_INC_DIR := /usr/include/boostroot/boost${BOOSTVERSSP}.0
-	SPBOOST_LIB_DIR := /usr/lib64/boostroot/boost${BOOSTVERSSP}.0
-        MY_CMAKE_FLAGS += \
+	SPBOOST_INC_DIR := /usr/include/boostroot/boost${BOOSTVERS}.0
+	SPBOOST_LIB_DIR := /usr/lib64/boostroot/boost${BOOSTVERS}.0
+    MY_CMAKE_FLAGS += \
             -DBOOST_INCLUDEDIR=${SPBOOST_INC_DIR} \
             -DBOOST_LIBRARYDIR=${SPBOOST_LIB_DIR}
-    endif
 
     #
     # Python
@@ -188,18 +119,7 @@ ifeq (${SP_OS}, rhel7)
     PYTHON_INCLUDE_DIR ?= /usr/include/python${PYTHON_VERSION}
     PYTHON_LIBRARY_DIR ?= /usr/lib64
     PYTHON_LIBRARY ?= ${PYTHON_LIBRARY_DIR}/libpython${PYTHON_VERSION}.so
-    ifeq (${PYTHON_VERSION},3.6)
-        # Special sauce for Python 3.6
-        PYTHON_INCLUDE_DIR := /usr/include/python${PYTHON_VERSION}m
-        PYTHON_LIBRARY := ${PYTHON_LIBRARY_DIR}/libpython${PYTHON_VERSION}m.so
-        MY_CMAKE_FLAGS += \
-            -DPYTHONINTERP_FOUND=1 \
-            -DPYTHON_VERSION_STRING=3.6.3 \
-            -DPYTHON_VERSION_MAJOR=3 \
-            -DPYTHON_VERSION_MINOR=6 \
-            -DPYTHON_VERSION_PATCH=3 \
-            -DPython_ADDITIONAL_VERSIONS="${PYTHON_VERSION}"
-    else ifeq (${PYTHON_VERSION},3.7)
+    ifeq (${PYTHON_VERSION},3.7)
         # Special sauce for Python 3.7
         PYTHON_INCLUDE_DIR := /usr/include/python${PYTHON_VERSION}m
         PYTHON_LIBRARY := ${PYTHON_LIBRARY_DIR}/libpython${PYTHON_VERSION}m.so
@@ -225,42 +145,30 @@ ifeq (${SP_OS}, rhel7)
     MY_CMAKE_FLAGS += \
         -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_INCLUDE_DIR} \
         -DPYTHON_LIBRARY:STRING=${PYTHON_LIBRARY} \
-        -Dpybind11_ROOT:STRING=${REZ_PACKAGE_ROOT}/pybind11/2.4.3/python-${PYTHON_VERSION}
+        -Dpybind11_ROOT:STRING=${REZ_PACKAGE_ROOT}/pybind11/2.6.2/python-${PYTHON_VERSION}
 
     # Set our preferred OpenEXR path, but allow env variable to override
     # with custom/test version.
-    OPENEXR_VERSION ?= 2.4.0
-    OpenEXR_ROOT ?= ${REZ_PACKAGE_ROOT}/OpenEXR/${OPENEXR_VERSION}/${SPI_COMPILER_PLATFORM}/python-${PYTHON_VERSION}
+    OPENEXR_VERSION ?= 2.4.3
+    OpenEXR_ROOT ?= ${REZ_PACKAGE_ROOT}/OpenEXR/${OPENEXR_VERSION}/${SPI_COMPILER_PLATFORM}
     MY_CMAKE_FLAGS += -DOpenEXR_ROOT=${OpenEXR_ROOT}
 
     #
     # SpComp2 and other weird SPI-installed packages
     #
     NUKE_VERSION ?= 11.2v3
-    SPCOMP2_FULLBOOST_SUFFIX = ${SP_OS}-${SPCOMP2_COMPILER}-boost${shell echo ${BOOSTVERSSP} | sed "s/\\.//"}
+    SPCOMP2_FULLBOOST_SUFFIX = ${SP_OS}-${SPCOMP2_COMPILER}-boost${shell echo ${BOOSTVERS} | sed "s/\\.//"}
     # $(info SPCOMP2_FULLBOOST_SUFFIX ${SPCOMP2_FULLBOOST_SUFFIX})
-    ifeq (${OIIO_SPCOMP2},1)
-        OCIO_SPCOMP_VERSION ?= 2
-        OpenColorIO_ROOT ?= ${SPCOMP2_ROOT}/OpenColorIO/${SP_OS}-${SPCOMP2_COMPILER}/v${OCIO_SPCOMP_VERSION}
-        # OPENVDB_SPCOMP2_VERSION ?= v6020001
-        # OpenVDB_ROOT ?= ${SPCOMP2_ROOT}/openvdb/${SPCOMP2_FULLBOOST_SUFFIX}/${OPENVDB_SPCOMP2_VERSION}
-        OPENVDB_VERSION ?= 6.2.2-3
-        OpenVDB_ROOT ?= ${REZ_PACKAGE_ROOT}/OpenVDB/${OPENVDB_VERSION}/${SPI_COMPILER_PLATFORM}/python-${PYTHON_VERSION}/boost-${BOOSTVERS}
-    else
-        OPENCOLORIO_VERSION ?= 1.1.1-1
-        OpenColorIO_ROOT ?= ${REZ_PACKAGE_ROOT}/OpenColorIO/${OPENCOLORIO_VERSION}/${SPI_COMPILER_PLATFORM}
-        MY_CMAKE_FLAGS += -DOPENCOLORIO_LIBRARY=${OpenColorIO_ROOT}/lib/libOpenColorIO_SPI.so
-        # Anybody remember why we needed Field3d disabled for SpComp2?
-        Field3D_ROOT ?= ${SPCOMP2_ROOT}/Field3D/${SPCOMP2_FULLBOOST_SUFFIX}/v412
-        OPENVDB_VERSION ?= 6.2.2-3
-        OpenVDB_ROOT ?= ${REZ_PACKAGE_ROOT}/OpenVDB/${OPENVDB_VERSION}/${SPI_COMPILER_PLATFORM}/python-${PYTHON_VERSION}/boost-${BOOSTVERS}
-	endif
+    OPENCOLORIO_VERSION ?= 2.1.0
+    OpenColorIO_ROOT ?= ${REZ_PACKAGE_ROOT}/OpenColorIO/${OPENCOLORIO_VERSION}/${SPI_COMPILER_PLATFORM}/python-${PYTHON_VERSION}
+    #MY_CMAKE_FLAGS += -DOPENCOLORIO_LIBRARY=${OpenColorIO_ROOT}/lib/libOpenColorIO_SPI.so
+    OPENVDB_VERSION ?= 8.0.0-2
+    OpenVDB_ROOT ?= ${REZ_PACKAGE_ROOT}/OpenVDB/${OPENVDB_VERSION}/${SPI_COMPILER_PLATFORM}/python-${PYTHON_VERSION}/boost-${BOOSTVERS}
     TBB_ROOT ?= /net/apps/rhel7/intel/tbb
     TBB_LIBRARY ?= /net/apps/rhel7/intel/tbb/lib/intel64/gcc4.7
-    Libheif_ROOT=/shots/spi/home/lib/arnold/rhel7/libheif-1.3.2
+    Libheif_ROOT ?= /shots/spi/home/lib/arnold/rhel7/libheif-1.3.2
     MY_CMAKE_FLAGS += \
         -DOpenColorIO_ROOT=${OpenColorIO_ROOT} \
-        -DField3D_ROOT=${Field3D_ROOT} \
         -DOpenVDB_ROOT=${OpenVDB_ROOT} \
         -DTBB_ROOT=${TBB_ROOT} \
         -DTBB_LIBRARY=${TBB_LIBRARY} \
@@ -269,21 +177,17 @@ ifeq (${SP_OS}, rhel7)
         -DHDF5_LIBRARIES=/usr/lib64/libhdf5.so \
         -DNuke_ROOT=/net/apps/rhel7/foundry/nuke${NUKE_VERSION} \
         -DLibheif_ROOT=${Libheif_ROOT} \
-        -DFFMPEG_INCLUDES=/usr/include/ffmpegroot/ffmpeg34 \
-        -DFFMPEG_LIBRARIES="/usr/lib64/ffmpegroot/ffmpeg345/libavcodec.so;/usr/lib64/ffmpegroot/ffmpeg345/libavformat.so;/usr/lib64/ffmpegroot/ffmpeg345/libavutil.so;/usr/lib64/ffmpegroot/ffmpeg345/libswscale.so;" \
+        -DFFMPEG_INCLUDES=/usr/include/ffmpegroot/ffmpeg42 \
+        -DFFMPEG_LIBRARIES="/usr/lib64/ffmpegroot/ffmpeg424/libavcodec.so;/usr/lib64/ffmpegroot/ffmpeg424/libavformat.so;/usr/lib64/ffmpegroot/ffmpeg424/libavutil.so;/usr/lib64/ffmpegroot/ffmpeg424/libswscale.so;" \
         -DUSE_OPENCV=0 \
         -DVISIBILITY_MAP_FILE:STRING="${working_dir}/site/spi/hidesymbols.map"
 
     # LibRaw
-    ifeq (${SPI_COMPILER_PLATFORM},gcc-4.8)
-        MY_CMAKE_FLAGS += -DLIBRAW_INCLUDEDIR_HINT=/usr/include/libraw-0.18.11
-        MY_CMAKE_FLAGS += -DLIBRAW_LIBDIR_HINT=/usr/lib64/libraw-0.18.11
-        LIBRAW_LIBDIR = /usr/lib64/libraw-0.18.11
-    else
-        LibRaw_ROOT ?= /shots/spi/home/software/packages/LibRaw/0.20.0-dev3/${SPI_COMPILER_PLATFORM}
-        MY_CMAKE_FLAGS += -DLibRaw_ROOT=${LibRaw_ROOT}
-        LIBRAW_LIBDIR = ${LibRaw_ROOT}/lib
-    endif
+    LibRaw_ROOT ?= ${REZ_PACKAGE_ROOT}/LibRaw/0.21.0.0/${SPI_COMPILER_PLATFORM}
+    MY_CMAKE_FLAGS += -DLibRaw_ROOT=${LibRaw_ROOT}
+    LIBRAW_LIBDIR = ${LibRaw_ROOT}/lib
+
+    MY_CMAKE_FLAGS += -DWebP_ROOT=${REZ_PACKAGE_ROOT}/webp/1.2.1/${SPI_COMPILER_PLATFORM}
 
     # Use libtiff I built myself, static, and try to hide its symbols.
     MY_CMAKE_FLAGS += \
@@ -298,38 +202,32 @@ else ifeq (${platform}, macosx)
     USE_SIMD ?= sse4.2
     MY_CMAKE_FLAGS += \
         -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
-        -DCMAKE_INSTALL_NAME_DIR="${working_dir}/dist/${platform}${variant}/lib"
+        -DCMAKE_INSTALL_NAME_DIR="${working_dir}/dist/lib"
 
     # A variety of tags can be used to try specific versions of gcc or
     # clang from the site-specific places we have installed them.
-    ifeq (${COMPILER}, gcc48)
-        MY_CMAKE_FLAGS += \
-           -DCMAKE_C_COMPILER=gcc-4.8 -DCMAKE_CXX_COMPILER=g++-4.8
-        USE_LIBCPLUSPLUS := 0
-    else ifeq (${COMPILER}, gcc5)
-        MY_CMAKE_FLAGS += \
-           -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5
-        USE_LIBCPLUSPLUS := 0
-    else ifeq (${COMPILER}, gcc6)
+    ifeq (${COMPILER}, gcc6)
         MY_CMAKE_FLAGS += \
            -DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6
         USE_LIBCPLUSPLUS := 0
-    else ifeq (${COMPILER}, gcc8)
+    else ifeq (${COMPILER}, gcc9)
         MY_CMAKE_FLAGS += \
-           -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8
+           -DCMAKE_C_COMPILER=gcc-9 -DCMAKE_CXX_COMPILER=g++-9
+        USE_LIBCPLUSPLUS := 0
+    else ifeq (${COMPILER}, gcc10)
+        MY_CMAKE_FLAGS += \
+           -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10
+        USE_LIBCPLUSPLUS := 0
+    else ifeq (${COMPILER}, gcc11)
+        MY_CMAKE_FLAGS += \
+           -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11
         USE_LIBCPLUSPLUS := 0
-    else ifeq (${COMPILER},clang7)
-        MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/opt/llvm@7/bin/clang \
-        				  -DCMAKE_CXX_COMPILER=/usr/local/llvm@7/bin/clang++
-    else ifeq (${COMPILER},clang8)
-        MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/opt/llvm@8/bin/clang \
-        				  -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@8/bin/clang++
     else ifeq (${COMPILER},clang9)
         MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/opt/llvm@9/bin/clang \
         				  -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@9/bin/clang++
-    else ifeq (${COMPILER},clang10)
-        MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang \
-        				  -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++
+    else ifeq (${COMPILER},clang11)
+        MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/opt/llvm@11/bin/clang \
+        				  -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@11/bin/clang++
     else ifeq (${COMPILER},clang)
         MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
     else ifeq (${COMPILER},gcc)
@@ -349,130 +247,7 @@ endif  # endif ${SP_OS}
 
 
 
-ifeq (${OIIO_SPIREZ},1)
-    # Rpath touch-ups
-    # NOTE: This MUST match the order and naming of the Rez variants
-    # set in rez/package.py.in
-    REZ_INSTALL_PATH := ${REZ_PACKAGE_ROOT}/${OIIO_REZ_NAME}/${OIIO_VERS}/${SPI_COMPILER_PLATFORM}/python-${PYTHON_VERSION}/boost-${BOOSTVERSSP}
-    MY_CMAKE_FLAGS += -DOIIO_REZ_INSTALL_PATH=${REZ_INSTALL_PATH}
-    MY_CMAKE_FLAGS += -DCMAKE_INSTALL_RPATH=${REZ_INSTALL_PATH}/lib
-    INSTALL_PREFIX := ${working_dir}/dist/${platform}
-endif
-
-
 ifneq (${VERBOSE},)
     $(info MY_CMAKE_FLAGS: $(MY_CMAKE_FLAGS))
 endif
 
-
-
-############################################################################
-# SpComp2 magic incantations follow. Here be dragons.
-############################################################################
-
-
-CPPSTDSUFFIX=
-SPCOMP2_INSTALL_ROOT ?= $(SPCOMP2_ROOT)
-BOOSTVERSSP?=${BOOSTVERS}${BOOSTSPSUFFIX}
-SPARCH=${SP_OS}-$(SPCOMP2_COMPILER)$(CPPSTDSUFFIX)-boost$(subst .,,$(BOOSTVERSSP))
-OIIO_SPCOMP2_PATH := ${SPCOMP2_INSTALL_ROOT}/OpenImageIO/${SPARCH}/v${OPENIMAGEIO_SPCOMP2_VERSION}
-# $(info New rhel7 OIIO_SPCOMP2_PATH is ${OIIO_SPCOMP2_PATH})
-
-PYVERNOSPACE=${shell echo ${PYTHON_VERSION} | sed "s/\\.//"}
-SPPYARCH=$(SPARCH)-py$(PYVERNOSPACE)
-
-
-
-all: dist
-
-local: dist
-
-.PHONY: spcomp2_install spcomp2_install_local spi clean all
-
-spi: MY_CMAKE_FLAGS += -DCMAKE_DEBUG_POSTFIX=_d
-spi: debug dist
-
-
-
-comma:= ,
-empty:=
-space:= $(empty) $(empty)
-
-INSTALL_SPCOMP2_CURRENT = $(SPCOMP2_INSTALL_ROOT)/OpenImageIO/$(SPARCH)/v$(OPENIMAGEIO_SPCOMP2_VERSION)
-INSTALL_BIN_LOCATION = $(INSTALL_SPCOMP2_CURRENT)/bin
-SPCOMP2_LOCAL_PATH ?= /net/soft_scratch/users/$(USER)/SpComp2_test
-
-spcomp2_install_local: SPCOMP2_INSTALL_ROOT = $(SPCOMP2_LOCAL_PATH)
-spcomp2_install_local: INSTALL_BIN_LOCATION = $(INSTALL_SPCOMP2_CURRENT)/bin
-spcomp2_install_local: spcomp2_install
-
-SPCOMP2_RPATH_OPT ?= ${OpenEXR_ROOT}/lib:${OpenColorIO_ROOT}/lib:${Field3D_ROOT}/lib:${LIBRAW_LIBDIR}:${OpenVDB_ROOT}/lib:${Libheif_ROOT}/lib:shots/spi/home/lib/arnold/rhel7/libde265-1.0.3/lib:${TBB_ROOT}/lib/intel64/gcc4.7:${SPBOOST_LIB_DIR}
-SPCOMP2_RPATH_DEBUG ?= ${OpenEXR_ROOT}/lib:${OpenColorIO_ROOT}/lib:${Field3D_ROOT}/lib/debug:${LIBRAW_LIBDIR}:${OpenVDB_ROOT}/lib/debug:${Libheif_ROOT}/lib:shots/spi/home/lib/arnold/rhel7/libde265-1.0.3/lib:${TBB_ROOT}/lib/intel64/gcc4.7:${SPBOOST_LIB_DIR}
-PYSPCOMP2_RPATH_OPT ?= ${SPCOMP2_RPATH_OPT}:${OIIO_SPCOMP2_PATH}/lib:${PYTHON_LIBRARY_DIR}
-PYSPCOMP2_RPATH_DEBUG ?= ${SPCOMP2_RPATH_DEBUG}:${OIIO_SPCOMP2_PATH}/lib/debug:${PYTHON_LIBRARY_DIR}
-
-
-spcomp2: MY_CMAKE_FLAGS += \
-		-DCMAKE_SKIP_BUILD_RPATH:BOOL=OFF \
-		-DCMAKE_INSTALL_RPATH=$(SPCOMP2_INSTALL_ROOT)/OpenImageIO/$(SPARCH)/v$(OPENIMAGEIO_SPCOMP2_VERSION)/lib \
-		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
-		-DPYLIB_INCLUDE_SONAME:BOOL=ON \
-		-DPYLIB_LIB_PREFIX:BOOL=ON \
-		-DPYMODULE_SUFFIX="V${OPENIMAGEIO_SPCOMP2_VERSION}"
-
-spcomp2: dist
-
-spcomp2_debug: MY_CMAKE_FLAGS += \
-		-DCMAKE_SKIP_BUILD_RPATH:BOOL=OFF \
-		-DCMAKE_INSTALL_RPATH=$(SPCOMP2_INSTALL_ROOT)/OpenImageIO/$(SPARCH)/v$(OPENIMAGEIO_SPCOMP2_VERSION)/lib \
-		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
-		-DPYLIB_INCLUDE_SONAME:BOOL=ON \
-		-DPYLIB_LIB_PREFIX:BOOL=ON \
-		-DPYMODULE_SUFFIX="V${OPENIMAGEIO_SPCOMP2_VERSION}"
-
-spcomp2_debug: debug
-
-spcomp2_install_fixup_rhel7: spcomp2 spcomp2_debug
-	echo $(SPCOMP2_INSTALL_ROOT)
-	patchelf --set-rpath ${SPCOMP2_RPATH_OPT} ${dist_dir}/lib/libOpenImageIO$(OIIO_LIBNAME_SUFFIX).so
-	patchelf --set-rpath ${SPCOMP2_RPATH_DEBUG} ${dist_dir}.debug/lib/libOpenImageIO$(OIIO_LIBNAME_SUFFIX).so
-	patchelf --set-rpath ${SPCOMP2_RPATH_OPT} ${dist_dir}/lib/libOpenImageIO_Util$(OIIO_LIBNAME_SUFFIX).so
-	patchelf --set-rpath ${SPCOMP2_RPATH_DEBUG} ${dist_dir}.debug/lib/libOpenImageIO_Util$(OIIO_LIBNAME_SUFFIX).so
-	patchelf --set-rpath ${PYSPCOMP2_RPATH_OPT} ${dist_dir}/python/libPyOpenImageIO.so
-	patchelf --set-rpath ${PYSPCOMP2_RPATH_DEBUG} ${dist_dir}.debug/python/libPyOpenImageIO.so
-
-# This goal can't start with 'install' because something elsewhere picks
-# it up and starts doing bad things
-spcomp2_install: spcomp2_install_fixup_${SP_OS}
-	perl -I/usr/local/spi/lib/make /usr/local/spi/bin/spcomp_install.pl -m installhost \
-	  --project=OpenImageIO \
-	  --version=$(OPENIMAGEIO_SPCOMP2_VERSION) \
-	  --root=$(SPCOMP2_INSTALL_ROOT) \
-	  --arch=$(SPARCH) \
-	  --headers=$(subst $(space),$(comma),$(wildcard ${dist_dir}/include/OpenImageIO/*)) \
-	  --cflags= --static_lflags="$(LINK_BOOST) $(LINK_OPENEXR) -lpthread" \
-	  --namespace=${NAMESPACE} \
-	  --srcdir=${dist_dir}/lib \
-	  --builddir_o=${dist_dir}/lib \
-	  --builddir_d=${dist_dir}.debug/lib
-	perl -I/usr/local/spi/lib/make /usr/local/spi/bin/spcomp_install.pl -m installhost \
-	  --project=OpenImageIO_Util \
-	  --version=$(OPENIMAGEIO_SPCOMP2_VERSION) \
-	  --root=$(SPCOMP2_INSTALL_ROOT) \
-	  --arch=$(SPARCH) \
-	  --headers=$(subst $(space),$(comma),$(wildcard ${dist_dir}/include/OpenImageIO/*)) \
-	  --cflags= --static_lflags="$(LINK_BOOST) $(LINK_OPENEXR) -lpthread" \
-	  --namespace=${NAMESPACE} \
-	  --srcdir=${dist_dir}/lib \
-	  --builddir_o=${dist_dir}/lib \
-	  --builddir_d=${dist_dir}.debug/lib
-	perl -I/usr/local/spi/lib/make /usr/local/spi/bin/spcomp_install.pl -m installhost \
-	  --project=PyOpenImageIO \
-	  --version=$(OPENIMAGEIO_SPCOMP2_VERSION) \
-	  --root=$(SPCOMP2_INSTALL_ROOT) \
-	  --arch=$(SPPYARCH) \
-	  --cflags= --static_lflags="$(LINK_BOOST) $(LINK_OPENEXR) -lpthread"\
-	  --namespace=${NAMESPACE} \
-	  --srcdir=${dist_dir}/python \
-	  --builddir_o=${dist_dir}/python \
-	  --builddir_d=${dist_dir}.debug/python

site/spi/cmake/sitecustom.cmake

@@ -2,15 +2,6 @@ option (${PROJ_NAME}_SPIREZ "Enable extra bits for building for SPI Rez install"
 set (${PROJ_NAME}_REZ_PACKAGE_NAME CACHE STRING "${PROJECT_NAME}")
 
 if (${PROJ_NAME}_SPIREZ)
-#    message (STATUS "Creating package.py from package.py.in")
-#    configure_file ("${PROJECT_SOURCE_DIR}/site/spi/rez/package.py.in" "${CMAKE_BINARY_DIR}/package.py")
-
     set (appcfg_filename "${CMAKE_BINARY_DIR}/${PROJECT_NAME}_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}.xml")
     configure_file ("${PROJECT_SOURCE_DIR}/site/spi/appcfg.xml.in" "${appcfg_filename}")
-
-    # install (FILES ${CMAKE_BINARY_DIR}/package.py
-    #                "${PROJECT_SOURCE_DIR}/site/spi/rez/CMakeLists.txt"
-    #                ${appcfg_filename}
-    #          DESTINATION ${CMAKE_INSTALL_PREFIX}
-    #          COMPONENT developer)
 endif ()

site/spi/format_version.py

@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-# This helper script takes a major.minor.patch semantic version string
-# ("2.1.1") and reformats it into the dot-less zero-padded version like
-# "20101".  This is necessary to turn external release designations into
-# integer SpComp2 version numbers.
-
-from __future__ import print_function
-from __future__ import absolute_import
-import sys
-
-if len(sys.argv) != 2 :
-    print('Need 1 argument: version number with dots')
-    exit(1)
-
-vers = sys.argv[1]
-parts = vers.split('.')
-print ('{:d}{:02d}{:02d}'.format(int(parts[0]), int(parts[1]), int(parts[2])))

src/bmp.imageio/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 add_oiio_plugin (bmpinput.cpp bmpoutput.cpp bmp_pvt.cpp)

src/bmp.imageio/bmp_pvt.cpp

@@ -1,11 +1,14 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
 
 
+#include <OpenImageIO/filesystem.h>
+#include <OpenImageIO/fmath.h>
+#include <OpenImageIO/imageio.h>
+
 #include "bmp_pvt.h"
 
-#include <OpenImageIO/fmath.h>
 
 OIIO_PLUGIN_NAMESPACE_BEGIN
 
@@ -14,23 +17,21 @@ namespace bmp_pvt {
 /// Helper - write, with error detection
 template<class T>
 bool
-fwrite(FILE* fd, const T* buf)
+fwrite(Filesystem::IOProxy* fd, const T* buf)
 {
-    size_t n = std::fwrite(buf, sizeof(T), 1, fd);
-    return n == 1;
+    return fd->write(buf, sizeof(T)) == sizeof(T);
 }
 
 /// Helper - read, with error detection
 template<class T>
 bool
-fread(FILE* fd, T* buf, size_t itemsize = sizeof(T))
+fread(Filesystem::IOProxy* fd, T* buf, size_t itemsize = sizeof(T))
 {
-    size_t n = std::fread(buf, itemsize, 1, fd);
-    return n == 1;
+    return fd->read(buf, itemsize) == itemsize;
 }
 
 bool
-BmpFileHeader::read_header(FILE* fd)
+BmpFileHeader::read_header(Filesystem::IOProxy* fd)
 {
     if (!fread(fd, &magic) || !fread(fd, &fsize) || !fread(fd, &res1)
         || !fread(fd, &res2) || !fread(fd, &offset)) {
@@ -45,7 +46,7 @@ BmpFileHeader::read_header(FILE* fd)
 
 
 bool
-BmpFileHeader::write_header(FILE* fd)
+BmpFileHeader::write_header(Filesystem::IOProxy* fd)
 {
     if (bigendian())
         swap_endian();
@@ -86,7 +87,7 @@ BmpFileHeader::swap_endian(void)
 
 
 bool
-DibInformationHeader::read_header(FILE* fd)
+DibInformationHeader::read_header(Filesystem::IOProxy* fd)
 {
     if (!fread(fd, &size))
         return false;
@@ -120,14 +121,16 @@ DibInformationHeader::read_header(FILE* fd)
             }
         }
     } else if (size == OS2_V1) {
-        // some of theses fields are smaller then in WINDOWS_Vx headers,
-        // so we use hardcoded counts
-        width  = 0;
-        height = 0;
-        if (!fread(fd, &width, 2) || !fread(fd, &height, 2)
+        // some of theses fields are smaller than in WINDOWS_Vx headers,
+        // so we read into 16 bit ints and copy.
+        uint16_t width16  = 0;
+        uint16_t height16 = 0;
+        if (!fread(fd, &width16) || !fread(fd, &height16)
             || !fread(fd, &cplanes) || !fread(fd, &bpp)) {
             return false;
         }
+        width  = width16;
+        height = height16;
     }
     if (bigendian())
         swap_endian();
@@ -137,7 +140,7 @@ DibInformationHeader::read_header(FILE* fd)
 
 
 bool
-DibInformationHeader::write_header(FILE* fd)
+DibInformationHeader::write_header(Filesystem::IOProxy* fd)
 {
     if (bigendian())
         swap_endian();

src/bmp.imageio/bmp_pvt.h

@@ -1,14 +1,9 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
 
 #pragma once
 
-#include <cstdio>
-
-#include <OpenImageIO/filesystem.h>
-#include <OpenImageIO/imageio.h>
-
 OIIO_PLUGIN_NAMESPACE_BEGIN
 
 
@@ -30,16 +25,20 @@ const int16_t MAGIC_CI = 0x4943;
 const int16_t MAGIC_CP = 0x5043;
 const int16_t MAGIC_PT = 0x5450;
 
-//const int32_t RLE4_COMPRESSION = 2;
+const int32_t NO_COMPRESSION   = 0;  // BI_RGB
+const int32_t RLE8_COMPRESSION = 1;  // BI_RLE8
+const int32_t RLE4_COMPRESSION = 2;  // BI_RLE4
+
+
 
 // store informations about BMP file
 class BmpFileHeader {
 public:
     // reads informations about BMP file
-    bool read_header(FILE* fd);
+    bool read_header(Filesystem::IOProxy* fd);
 
     // writes information about bmp file to given file
-    bool write_header(FILE* fd);
+    bool write_header(Filesystem::IOProxy* fd);
 
     // return true if given file is BMP file
     bool isBmp() const;
@@ -48,7 +47,7 @@ public:
     int32_t fsize;   // size of the BMP file
     int16_t res1;    // reserved
     int16_t res2;    // reserved
-    int32_t offset;  //offset of image data
+    int32_t offset;  // offset of image data (pixels)
 private:
     void swap_endian(void);
 };
@@ -57,24 +56,26 @@ private:
 class DibInformationHeader {
 public:
     // reads informations about bitmap
-    bool read_header(FILE* fd);
+    bool read_header(Filesystem::IOProxy* fd);
 
     // writes informations about bitmap
-    bool write_header(FILE* fd);
+    bool write_header(Filesystem::IOProxy* fd);
 
-    int32_t size;         // size of the header
-    int32_t width;        // bitmap width in pixels
-    int32_t height;       // bitmap height in pixels
-    int16_t cplanes;      // number of color planes - always 1
-    int16_t bpp;          // number of bits per pixel, image color depth
-    int32_t compression;  // compression used in file
-    int32_t isize;        // size of the raw image data
-    int32_t hres;         // horizontal resolution in pixels per meter
-    int32_t vres;         // vertical resolutions in pixels per meter
-    int32_t cpalete;      // number of entries in the color palete
-    int32_t important;    // number of importatn color used,
-                          // 0 - all colors are important,
-                          // in most cases ignored
+    int32_t size;     // size of the header
+    int32_t width;    // bitmap width in pixels
+    int32_t height;   // bitmap height in pixels
+    int16_t cplanes;  // number of color planes - always 1
+    int16_t bpp;      // number of bits per pixel, image color depth
+
+    // Added after Version 1 of the format
+    int32_t compression = 0;  // compression used in file
+    int32_t isize       = 0;  // size of the raw image data
+    int32_t hres        = 0;  // horizontal resolution in pixels per meter
+    int32_t vres        = 0;  // vertical resolutions in pixels per meter
+    int32_t cpalete     = 0;  // number of entries in the color palette
+    int32_t important   = 0;  // number of important color used,
+                              // 0 - all colors are important,
+                              // in most cases ignored
 
     // added in Version 4 of the format
     int32_t red_mask;
@@ -116,76 +117,4 @@ struct color_table {
 
 
 
-class BmpInput final : public ImageInput {
-public:
-    BmpInput() { init(); }
-    virtual ~BmpInput() { close(); }
-    virtual const char* format_name(void) const override { return "bmp"; }
-    virtual bool valid_file(const std::string& filename) const override;
-    virtual bool open(const std::string& name, ImageSpec& spec) override;
-    virtual bool close(void) override;
-    virtual bool read_native_scanline(int subimage, int miplevel, int y, int z,
-                                      void* data) override;
-
-private:
-    int64_t m_padded_scanline_size;
-    int m_pad_size;
-    FILE* m_fd;
-    bmp_pvt::BmpFileHeader m_bmp_header;
-    bmp_pvt::DibInformationHeader m_dib_header;
-    std::string m_filename;
-    std::vector<bmp_pvt::color_table> m_colortable;
-    int64_t m_image_start;
-    void init(void)
-    {
-        m_padded_scanline_size = 0;
-        m_pad_size             = 0;
-        m_fd                   = NULL;
-        m_filename.clear();
-        m_colortable.clear();
-    }
-
-    bool read_color_table(void);
-};
-
-
-
-class BmpOutput final : public ImageOutput {
-public:
-    BmpOutput() { init(); }
-    virtual ~BmpOutput() { close(); }
-    virtual const char* format_name(void) const override { return "bmp"; }
-    virtual int supports(string_view feature) const override;
-    virtual bool open(const std::string& name, const ImageSpec& spec,
-                      OpenMode mode) override;
-    virtual bool close(void) override;
-    virtual bool write_scanline(int y, int z, TypeDesc format, const void* data,
-                                stride_t xstride) override;
-    virtual bool write_tile(int x, int y, int z, TypeDesc format,
-                            const void* data, stride_t xstride,
-                            stride_t ystride, stride_t zstride) override;
-
-private:
-    int64_t m_padded_scanline_size;
-    FILE* m_fd;
-    std::string m_filename;
-    bmp_pvt::BmpFileHeader m_bmp_header;
-    bmp_pvt::DibInformationHeader m_dib_header;
-    int64_t m_image_start;
-    unsigned int m_dither;
-    std::vector<unsigned char> m_tilebuffer;
-
-    void init(void)
-    {
-        m_padded_scanline_size = 0;
-        m_fd                   = NULL;
-        m_filename.clear();
-    }
-
-    void create_and_write_file_header(void);
-
-    void create_and_write_bitmap_header(void);
-};
-
-
 OIIO_PLUGIN_NAMESPACE_END

src/bmp.imageio/bmpinput.cpp

@@ -1,12 +1,68 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
+
+#include <cstdio>
+
+#include <OpenImageIO/filesystem.h>
+#include <OpenImageIO/imageio.h>
+
 #include "bmp_pvt.h"
 
 OIIO_PLUGIN_NAMESPACE_BEGIN
 
 using namespace bmp_pvt;
 
+
+class BmpInput final : public ImageInput {
+public:
+    BmpInput() { init(); }
+    virtual ~BmpInput() { close(); }
+    virtual const char* format_name(void) const override { return "bmp"; }
+    int supports(string_view feature) const override
+    {
+        return feature == "ioproxy";
+    }
+    virtual bool valid_file(const std::string& filename) const override;
+    virtual bool open(const std::string& name, ImageSpec& newspec) override;
+    virtual bool open(const std::string& name, ImageSpec& newspec,
+                      const ImageSpec& config) override;
+    virtual bool close(void) override;
+    virtual bool read_native_scanline(int subimage, int miplevel, int y, int z,
+                                      void* data) override;
+
+private:
+    int64_t m_padded_scanline_size;
+    int m_pad_size;
+    bmp_pvt::BmpFileHeader m_bmp_header;
+    bmp_pvt::DibInformationHeader m_dib_header;
+    std::string m_filename;
+    std::vector<bmp_pvt::color_table> m_colortable;
+    std::vector<unsigned char> fscanline;       // temp space: read from file
+    std::vector<unsigned char> m_uncompressed;  // uncompressed palette image
+    bool m_allgray;
+
+    void init(void)
+    {
+        m_padded_scanline_size = 0;
+        m_pad_size             = 0;
+        m_filename.clear();
+        m_colortable.clear();
+        m_allgray = false;
+        fscanline.shrink_to_fit();
+        m_uncompressed.shrink_to_fit();
+        ioproxy_clear();
+    }
+
+    bool read_color_table();
+    bool color_table_is_all_gray();
+    bool read_rle_image();
+
+    bool ioeof() { return size_t(ioproxy()->tell()) == ioproxy()->size(); }
+};
+
+
+
 // Obligatory material to make this a recognizeable imageio plugin
 OIIO_PLUGIN_EXPORTS_BEGIN
 
@@ -24,7 +80,7 @@ bmp_input_imageio_create()
     return new BmpInput;
 }
 
-OIIO_EXPORT const char* bmp_input_extensions[] = { "bmp", nullptr };
+OIIO_EXPORT const char* bmp_input_extensions[] = { "bmp", "dib", nullptr };
 
 OIIO_PLUGIN_EXPORTS_END
 
@@ -32,56 +88,69 @@ OIIO_PLUGIN_EXPORTS_END
 bool
 BmpInput::valid_file(const std::string& filename) const
 {
-    FILE* fd = Filesystem::fopen(filename, "rb");
-    if (!fd)
-        return false;
-    bmp_pvt::BmpFileHeader bmp_header;
-    bool ok = bmp_header.read_header(fd) && bmp_header.isBmp();
-    fclose(fd);
-    return ok;
+    bmp_pvt::BmpFileHeader header;
+    Filesystem::IOFile file(filename, Filesystem::IOProxy::Read);
+    return file.opened() && header.read_header(&file) && header.isBmp();
 }
 
 
 
 bool
-BmpInput::open(const std::string& name, ImageSpec& spec)
+BmpInput::open(const std::string& name, ImageSpec& newspec)
+{
+    ImageSpec emptyconfig;
+    return open(name, newspec, emptyconfig);
+}
+
+
+
+bool
+BmpInput::open(const std::string& name, ImageSpec& newspec,
+               const ImageSpec& config)
 {
     // saving 'name' for later use
     m_filename = name;
 
-    m_fd = Filesystem::fopen(m_filename, "rb");
-    if (!m_fd) {
-        errorf("Could not open file \"%s\"", name);
+    // BMP cannot be 1-channel, but config hint "bmp:monochrome_detect" is a
+    // hint to try to detect when all palette entries are gray and pretend
+    // that it's a 1-channel image to allow the calling app to save memory
+    // and time. It does this by default, but setting the hint to 0 turns
+    // this behavior off.
+    bool monodetect = config["bmp:monochrome_detect"].get<int>(1);
+
+    ioproxy_retrieve_from_config(config);
+    if (!ioproxy_use_or_open(name))
         return false;
-    }
+    ioseek(0);
 
     // we read header of the file that we think is BMP file
-    if (!m_bmp_header.read_header(m_fd)) {
-        errorf("\"%s\": wrong bmp header size", m_filename);
+    if (!m_bmp_header.read_header(ioproxy())) {
+        errorfmt("\"{}\": wrong bmp header size", name);
         close();
         return false;
     }
     if (!m_bmp_header.isBmp()) {
-        errorf("\"%s\" is not a BMP file, magic number doesn't match",
-               m_filename);
+        errorfmt("\"{}\" is not a BMP file, magic number doesn't match", name);
         close();
         return false;
     }
-    if (!m_dib_header.read_header(m_fd)) {
-        errorf("\"%s\": wrong bitmap header size", m_filename);
+    if (!m_dib_header.read_header(ioproxy())) {
+        errorfmt("\"{}\": wrong bitmap header size", name);
         close();
         return false;
     }
 
     const int nchannels = (m_dib_header.bpp == 32) ? 4 : 3;
     const int height    = (m_dib_header.height >= 0) ? m_dib_header.height
-                                                  : -m_dib_header.height;
+                                                     : -m_dib_header.height;
     m_spec = ImageSpec(m_dib_header.width, height, nchannels, TypeDesc::UINT8);
-    m_spec.attribute("XResolution", (int)m_dib_header.hres);
-    m_spec.attribute("YResolution", (int)m_dib_header.vres);
-    m_spec.attribute("ResolutionUnit", "m");
+    if (m_dib_header.hres > 0 && m_dib_header.vres > 0) {
+        m_spec.attribute("XResolution", (int)m_dib_header.hres);
+        m_spec.attribute("YResolution", (int)m_dib_header.vres);
+        m_spec.attribute("ResolutionUnit", "m");
+    }
 
-    // comupting size of one scanline - this is the size of one scanline that
+    // computing size of one scanline - this is the size of one scanline that
     // is stored in the file, not in the memory
     int swidth = 0;
     switch (m_dib_header.bpp) {
@@ -97,6 +166,11 @@ BmpInput::open(const std::string& name, ImageSpec& spec)
         m_padded_scanline_size = (m_spec.width + 3) & ~3;
         if (!read_color_table())
             return false;
+        m_allgray = monodetect && color_table_is_all_gray();
+        if (m_allgray) {
+            m_spec.nchannels = 1;  // make it look like a 1-channel image
+            m_spec.default_channel_names();
+        }
         break;
     case 4:
         swidth                 = (m_spec.width + 1) / 2;
@@ -111,42 +185,139 @@ BmpInput::open(const std::string& name, ImageSpec& spec)
             return false;
         break;
     }
+    if (m_dib_header.bpp <= 16)
+        m_spec.attribute("bmp:bitsperpixel", m_dib_header.bpp);
+    switch (m_dib_header.size) {
+    case OS2_V1: m_spec.attribute("bmp:version", 1); break;
+    case WINDOWS_V3: m_spec.attribute("bmp:version", 3); break;
+    case WINDOWS_V4: m_spec.attribute("bmp:version", 4); break;
+    case WINDOWS_V5: m_spec.attribute("bmp:version", 5); break;
+    }
 
-    // file pointer is set to the beginning of image data
-    // we save this position - it will be helpfull in read_native_scanline
-    m_image_start = Filesystem::ftell(m_fd);
+    // Bite the bullet and uncompress now, for simplicity
+    if (m_dib_header.compression == RLE4_COMPRESSION
+        || m_dib_header.compression == RLE8_COMPRESSION) {
+        if (!read_rle_image()) {
+            errorfmt("BMP error reading rle-compressed image");
+            close();
+            return false;
+        }
+    }
 
-    spec = m_spec;
+    if (m_spec.width < 1 || m_spec.height < 1 || m_spec.nchannels < 1
+        || m_spec.image_bytes() < 1) {
+        errorfmt("Invalid image size {} x {} ({} chans, {})", m_spec.width,
+                 m_spec.height, m_spec.nchannels, m_spec.format);
+        return false;
+    }
+
+    newspec = m_spec;
     return true;
 }
 
 
 
+bool
+BmpInput::read_rle_image()
+{
+    int rletype = m_dib_header.compression == RLE4_COMPRESSION ? 4 : 8;
+    m_spec.attribute("compression", rletype == 4 ? "rle4" : "rle8");
+    m_uncompressed.clear();
+    m_uncompressed.resize(m_spec.height * m_spec.width);
+    // Note: the clear+resize zeroes out the buffer
+    bool ok = true;
+    int y = 0, x = 0;
+    while (ok) {
+        unsigned char rle_pair[2];
+        if (!ioread(rle_pair, 2)) {
+            ok = false;
+            break;
+        }
+        int npixels = rle_pair[0];
+        int value   = rle_pair[1];
+        if (npixels == 0 && value == 0) {
+            // [0,0] is end of line marker
+            x = 0;
+            ++y;
+        } else if (npixels == 0 && value == 1) {
+            // [0,1] is end of bitmap marker
+            break;
+        } else if (npixels == 0 && value == 2) {
+            // [0,2] is a "delta" -- two more bytes reposition the
+            // current pixel position that we're reading.
+            unsigned char offset[2];
+            ok &= ioread(offset, 2);
+            x += offset[0];
+            y += offset[1];
+        } else if (npixels == 0) {
+            // [0,n>2] is an "absolute" run of pixel data.
+            // n is the number of pixel indices that follow, but note
+            // that it pads to word size.
+            int npixels = value;
+            int nbytes  = (rletype == 4)
+                              ? round_to_multiple((npixels + 1) / 2, 2)
+                              : round_to_multiple(npixels, 2);
+            unsigned char absolute[256];
+            ok &= ioread(absolute, nbytes);
+            for (int i = 0; i < npixels; ++i, ++x) {
+                if (rletype == 4)
+                    value = (i & 1) ? (absolute[i / 2] & 0x0f)
+                                    : (absolute[i / 2] >> 4);
+                else
+                    value = absolute[i];
+                if (x < m_spec.width)
+                    m_uncompressed[y * m_spec.width + x] = value;
+            }
+        } else {
+            // [n>0,p] is a run of n pixels.
+            for (int i = 0; i < npixels; ++i, ++x) {
+                int v;
+                if (rletype == 4)
+                    v = (i & 1) ? (value & 0x0f) : (value >> 4);
+                else
+                    v = value;
+                if (x < m_spec.width)
+                    m_uncompressed[y * m_spec.width + x] = v;
+            }
+        }
+    }
+    return ok;
+}
+
+
+
 bool
 BmpInput::read_native_scanline(int subimage, int miplevel, int y, int /*z*/,
                                void* data)
 {
-    lock_guard lock(m_mutex);
+    lock_guard lock(*this);
     if (!seek_subimage(subimage, miplevel))
         return false;
 
     if (y < 0 || y > m_spec.height)
         return false;
 
+    size_t scanline_bytes = m_spec.scanline_bytes();
+    uint8_t* mscanline    = (uint8_t*)data;
+    if (m_dib_header.compression == RLE4_COMPRESSION
+        || m_dib_header.compression == RLE8_COMPRESSION) {
+        for (int x = 0; x < m_spec.width; ++x) {
+            int p = m_uncompressed[(m_spec.height - 1 - y) * m_spec.width + x];
+            mscanline[3 * x]     = m_colortable[p].r;
+            mscanline[3 * x + 1] = m_colortable[p].g;
+            mscanline[3 * x + 2] = m_colortable[p].b;
+        }
+        return true;
+    }
+
     // if the height is positive scanlines are stored bottom-up
-    if (m_dib_header.width >= 0)
+    if (m_dib_header.height >= 0)
         y = m_spec.height - y - 1;
     const int64_t scanline_off = y * m_padded_scanline_size;
 
-    std::unique_ptr<unsigned char[]> fscanline(
-        new unsigned char[m_padded_scanline_size]);
-    Filesystem::fseek(m_fd, m_image_start + scanline_off, SEEK_SET);
-    size_t n = fread(fscanline.get(), 1, m_padded_scanline_size, m_fd);
-    if (n != (size_t)m_padded_scanline_size) {
-        if (feof(m_fd))
-            errorf("Hit end of file unexpectedly");
-        else
-            errorf("read error");
+    fscanline.resize(m_padded_scanline_size);
+    ioseek(m_bmp_header.offset + scanline_off);
+    if (!ioread(fscanline.data(), m_padded_scanline_size)) {
         return false;  // Read failed
     }
 
@@ -157,13 +328,10 @@ BmpInput::read_native_scanline(int subimage, int miplevel, int y, int /*z*/,
         for (unsigned int i = 0; i < m_spec.scanline_bytes();
              i += m_spec.nchannels)
             std::swap(fscanline[i], fscanline[i + 2]);
-        memcpy(data, fscanline.get(), m_spec.scanline_bytes());
+        memcpy(data, fscanline.data(), m_spec.scanline_bytes());
         return true;
     }
 
-    size_t scanline_bytes = m_spec.scanline_bytes();
-    std::unique_ptr<unsigned char[]> mscanline(
-        new unsigned char[scanline_bytes]);
     if (m_dib_header.bpp == 16) {
         const uint16_t RED   = 0x7C00;
         const uint16_t GREEN = 0x03E0;
@@ -176,18 +344,28 @@ BmpInput::read_native_scanline(int subimage, int miplevel, int y, int /*z*/,
         }
     }
     if (m_dib_header.bpp == 8) {
-        for (unsigned int i = 0, j = 0; j < scanline_bytes; ++i, j += 3) {
-            mscanline[j]     = m_colortable[fscanline[i]].r;
-            mscanline[j + 1] = m_colortable[fscanline[i]].g;
-            mscanline[j + 2] = m_colortable[fscanline[i]].b;
+        if (m_allgray) {
+            // Keep it as 1-channel image because all colors are gray
+            for (unsigned int i = 0; i < scanline_bytes; ++i) {
+                mscanline[i] = m_colortable[fscanline[i]].r;
+            }
+        } else {
+            // Expand palette image into 3-channel RGB (existing code)
+            for (unsigned int i = 0, j = 0; j < scanline_bytes; ++i, j += 3) {
+                mscanline[j]     = m_colortable[fscanline[i]].r;
+                mscanline[j + 1] = m_colortable[fscanline[i]].g;
+                mscanline[j + 2] = m_colortable[fscanline[i]].b;
+            }
         }
     }
     if (m_dib_header.bpp == 4) {
-        for (unsigned int i = 0, j = 0; j + 6 < scanline_bytes; ++i, j += 6) {
+        for (unsigned int i = 0, j = 0; j < scanline_bytes; ++i, j += 6) {
             uint8_t mask     = 0xF0;
             mscanline[j]     = m_colortable[(fscanline[i] & mask) >> 4].r;
             mscanline[j + 1] = m_colortable[(fscanline[i] & mask) >> 4].g;
             mscanline[j + 2] = m_colortable[(fscanline[i] & mask) >> 4].b;
+            if (j + 3 >= scanline_bytes)
+                break;
             mask             = 0x0F;
             mscanline[j + 3] = m_colortable[fscanline[i] & mask].r;
             mscanline[j + 4] = m_colortable[fscanline[i] & mask].g;
@@ -208,18 +386,14 @@ BmpInput::read_native_scanline(int subimage, int miplevel, int y, int /*z*/,
             }
         }
     }
-    memcpy(data, &mscanline[0], scanline_bytes);
     return true;
 }
 
 
 
-bool inline BmpInput::close(void)
+bool
+BmpInput::close(void)
 {
-    if (m_fd) {
-        fclose(m_fd);
-        m_fd = NULL;
-    }
     init();
     return true;
 }
@@ -233,25 +407,44 @@ BmpInput::read_color_table(void)
     // if this field is 0 - color table has max colors:
     // pow(2, m_dib_header.cpalete) otherwise color table have
     // m_dib_header.cpalete entries
+    if (m_dib_header.cpalete < 0
+        || m_dib_header.cpalete > (1 << m_dib_header.bpp)) {
+        errorfmt("Possible corrupted header, invalid palette size");
+        return false;
+    }
     const int32_t colors = (m_dib_header.cpalete) ? m_dib_header.cpalete
                                                   : 1 << m_dib_header.bpp;
-    size_t entry_size = 4;
-    // if the file is OS V2 bitmap color table entr has only 3 bytes, not four
+    size_t entry_size    = 4;
+    // if the file is OS V2 bitmap color table entry has only 3 bytes, not four
     if (m_dib_header.size == OS2_V1)
         entry_size = 3;
     m_colortable.resize(colors);
     for (int i = 0; i < colors; i++) {
-        size_t n = fread(&m_colortable[i], 1, entry_size, m_fd);
-        if (n != entry_size) {
-            if (feof(m_fd))
-                errorf(
-                    "Hit end of file unexpectedly while reading color table");
+        if (!ioread(&m_colortable[i], entry_size)) {
+            if (ioeof())
+                errorfmt(
+                    "Hit end of file unexpectedly while reading color table on color {}/{})",
+                    i, colors);
             else
-                errorf("read error while reading color table");
+                errorfmt("read error while reading color table");
             return false;  // Read failed
         }
     }
     return true;  // ok
 }
 
+
+
+bool
+BmpInput::color_table_is_all_gray(void)
+{
+    size_t ncolors = m_colortable.size();
+    for (size_t i = 0; i < ncolors; i++) {
+        color_table& color = m_colortable[i];
+        if (color.b != color.g || color.g != color.r)
+            return false;
+    }
+    return true;
+}
+
 OIIO_PLUGIN_NAMESPACE_END

src/bmp.imageio/bmpoutput.cpp

@@ -1,7 +1,11 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
 
+#include <cstdio>
+
+#include <OpenImageIO/filesystem.h>
+#include <OpenImageIO/imageio.h>
 #include <OpenImageIO/strutil.h>
 
 #include "bmp_pvt.h"
@@ -11,6 +15,46 @@ OIIO_PLUGIN_NAMESPACE_BEGIN
 using namespace bmp_pvt;
 
 
+class BmpOutput final : public ImageOutput {
+public:
+    BmpOutput() { init(); }
+    virtual ~BmpOutput() { close(); }
+    virtual const char* format_name(void) const override { return "bmp"; }
+    virtual int supports(string_view feature) const override;
+    virtual bool open(const std::string& name, const ImageSpec& spec,
+                      OpenMode mode) override;
+    virtual bool close(void) override;
+    virtual bool write_scanline(int y, int z, TypeDesc format, const void* data,
+                                stride_t xstride) override;
+    virtual bool write_tile(int x, int y, int z, TypeDesc format,
+                            const void* data, stride_t xstride,
+                            stride_t ystride, stride_t zstride) override;
+
+private:
+    int64_t m_padded_scanline_size;
+    std::string m_filename;
+    bmp_pvt::BmpFileHeader m_bmp_header;
+    bmp_pvt::DibInformationHeader m_dib_header;
+    int64_t m_image_start;
+    unsigned int m_dither;
+    std::vector<unsigned char> m_tilebuffer;
+    std::vector<unsigned char> m_scratch;
+    std::vector<unsigned char> m_buf;  // more tmp space for write_scanline
+
+    void init(void)
+    {
+        m_padded_scanline_size = 0;
+        m_filename.clear();
+        ioproxy_clear();
+    }
+
+    void create_and_write_file_header(void);
+
+    void create_and_write_bitmap_header(void);
+};
+
+
+
 // Obligatory material to make this a recognizeable imageio plugin
 OIIO_PLUGIN_EXPORTS_BEGIN
 
@@ -29,7 +73,7 @@ OIIO_PLUGIN_EXPORTS_END
 int
 BmpOutput::supports(string_view feature) const
 {
-    return (feature == "alpha");
+    return (feature == "alpha" || feature == "ioproxy");
 }
 
 
@@ -38,7 +82,7 @@ bool
 BmpOutput::open(const std::string& name, const ImageSpec& spec, OpenMode mode)
 {
     if (mode != Create) {
-        errorf("%s does not support subimages or MIP levels", format_name());
+        errorfmt("{} does not support subimages or MIP levels", format_name());
         return false;
     }
 
@@ -46,9 +90,10 @@ BmpOutput::open(const std::string& name, const ImageSpec& spec, OpenMode mode)
     m_filename = name;
     m_spec     = spec;
 
-    if (m_spec.nchannels != 3 && m_spec.nchannels != 4) {
-        errorf("%s does not support %d-channel images\n", format_name(),
-               m_spec.nchannels);
+    if (m_spec.nchannels != 1 && m_spec.nchannels != 3
+        && m_spec.nchannels != 4) {
+        errorfmt("{} does not support {}-channel images\n", format_name(),
+                 m_spec.nchannels);
         return false;
     }
 
@@ -58,22 +103,21 @@ BmpOutput::open(const std::string& name, const ImageSpec& spec, OpenMode mode)
 
     int64_t file_size = m_spec.image_bytes() + BMP_HEADER_SIZE + WINDOWS_V3;
     if (file_size >= int64_t(1) << 32) {
-        errorf("%s does not support files over 4GB in size\n", format_name());
+        errorfmt("{} does not support files over 4GB in size\n", format_name());
         return false;
     }
 
-    m_fd = Filesystem::fopen(m_filename, "wb");
-    if (!m_fd) {
-        errorf("Could not open \"%s\"", m_filename);
+    ioproxy_retrieve_from_config(m_spec);
+    if (!ioproxy_use_or_open(name))
         return false;
-    }
+
+    // Scanline size is rounded up to align to 4-byte boundary
+    m_padded_scanline_size = round_to_multiple(m_spec.scanline_bytes(), 4);
 
     create_and_write_file_header();
     create_and_write_bitmap_header();
 
-    // Scanline size is rounded up to align to 4-byte boundary
-    m_padded_scanline_size = ((m_spec.width * m_spec.nchannels) + 3) & ~3;
-    m_image_start          = Filesystem::ftell(m_fd);
+    m_image_start = iotell();
 
     // If user asked for tiles -- which this format doesn't support, emulate
     // it by buffering the whole image.
@@ -90,7 +134,7 @@ BmpOutput::write_scanline(int y, int z, TypeDesc format, const void* data,
                           stride_t xstride)
 {
     if (y > m_spec.height) {
-        errorf("Attempt to write too many scanlines to %s", m_filename);
+        errorfmt("Attempt to write too many scanlines to {}", m_filename);
         close();
         return false;
     }
@@ -98,23 +142,21 @@ BmpOutput::write_scanline(int y, int z, TypeDesc format, const void* data,
     if (m_spec.width >= 0)
         y = (m_spec.height - y - 1);
     int64_t scanline_off = y * m_padded_scanline_size;
-    Filesystem::fseek(m_fd, m_image_start + scanline_off, SEEK_SET);
+    ioseek(m_image_start + scanline_off);
 
-    std::vector<unsigned char> scratch;
-    data = to_native_scanline(format, data, xstride, scratch, m_dither, y, z);
-    std::vector<unsigned char> buf;
-    buf.reserve(m_padded_scanline_size);  // reserve enough for padded scanline
-    buf.assign((const unsigned char*)data,
-               (const unsigned char*)data + m_spec.scanline_bytes());
-    buf.resize(m_padded_scanline_size, 0);  // pad with zeroes if needed
+    m_scratch.clear();
+    data = to_native_scanline(format, data, xstride, m_scratch, m_dither, y, z);
+    m_buf.assign((const unsigned char*)data,
+                 (const unsigned char*)data + m_spec.scanline_bytes());
+    m_buf.resize(m_padded_scanline_size, 0);  // pad with zeroes if needed
 
     // Swap RGB pixels into BGR format
     if (m_spec.nchannels >= 3)
-        for (int i = 0, iend = buf.size() - 2; i < iend; i += m_spec.nchannels)
-            std::swap(buf[i], buf[i + 2]);
+        for (int i = 0, iend = m_buf.size() - 2; i < iend;
+             i += m_spec.nchannels)
+            std::swap(m_buf[i], m_buf[i + 2]);
 
-    size_t byte_count = fwrite(&buf[0], 1, buf.size(), m_fd);
-    return byte_count == buf.size();  // true if wrote all bytes (no error)
+    return iowrite(&m_buf[0], m_buf.size());
 }
 
 
@@ -133,7 +175,7 @@ BmpOutput::write_tile(int x, int y, int z, TypeDesc format, const void* data,
 bool
 BmpOutput::close(void)
 {
-    if (!m_fd) {  // already closed
+    if (!ioproxy_opened()) {  // already closed
         init();
         return true;
     }
@@ -147,8 +189,7 @@ BmpOutput::close(void)
         std::vector<unsigned char>().swap(m_tilebuffer);
     }
 
-    fclose(m_fd);
-    m_fd = NULL;
+    init();
     return ok;
 }
 
@@ -157,15 +198,15 @@ void
 BmpOutput::create_and_write_file_header(void)
 {
     m_bmp_header.magic = MAGIC_BM;
-    int64_t data_size  = int64_t(m_spec.width) * m_spec.height
-                        * m_spec.nchannels;
-    int64_t file_size   = data_size + BMP_HEADER_SIZE + WINDOWS_V3;
-    m_bmp_header.fsize  = file_size;
-    m_bmp_header.res1   = 0;
-    m_bmp_header.res2   = 0;
-    m_bmp_header.offset = BMP_HEADER_SIZE + WINDOWS_V3;
+    int64_t data_size  = m_padded_scanline_size * m_spec.height;
+    int palettesize    = (m_spec.nchannels == 1) ? 4 * 256 : 0;
+    int64_t file_size  = data_size + BMP_HEADER_SIZE + WINDOWS_V3 + palettesize;
+    m_bmp_header.fsize = file_size;
+    m_bmp_header.res1  = 0;
+    m_bmp_header.res2  = 0;
+    m_bmp_header.offset = BMP_HEADER_SIZE + WINDOWS_V3 + palettesize;
 
-    m_bmp_header.write_header(m_fd);
+    m_bmp_header.write_header(ioproxy());
 }
 
 
@@ -177,33 +218,38 @@ BmpOutput::create_and_write_bitmap_header(void)
     m_dib_header.width       = m_spec.width;
     m_dib_header.height      = m_spec.height;
     m_dib_header.cplanes     = 1;
-    m_dib_header.compression = 0;
+    m_dib_header.compression = NO_COMPRESSION;
 
-    m_dib_header.bpp = m_spec.nchannels << 3;
-
-    m_dib_header.isize     = m_spec.width * m_spec.height * m_spec.nchannels;
-    m_dib_header.hres      = 0;
-    m_dib_header.vres      = 0;
-    m_dib_header.cpalete   = 0;
-    m_dib_header.important = 0;
-
-    ParamValue* p = NULL;
-    p             = m_spec.find_attribute("ResolutionUnit", TypeDesc::STRING);
-    if (p && p->data()) {
-        std::string res_units = *(char**)p->data();
-        if (Strutil::iequals(res_units, "m")
-            || Strutil::iequals(res_units, "pixel per meter")) {
-            ParamValue *resx = NULL, *resy = NULL;
-            resx = m_spec.find_attribute("XResolution", TypeDesc::INT32);
-            if (resx && resx->data())
-                m_dib_header.hres = *(int*)resx->data();
-            resy = m_spec.find_attribute("YResolution", TypeDesc::INT32);
-            if (resy && resy->data())
-                m_dib_header.vres = *(int*)resy->data();
-        }
+    if (m_spec.nchannels == 1) {
+        // Special case -- write a 1-channel image as a gray palette
+        m_dib_header.bpp       = 8;
+        m_dib_header.cpalete   = 256;
+        m_dib_header.important = 256;
+    } else {
+        m_dib_header.bpp       = m_spec.nchannels * 8;
+        m_dib_header.cpalete   = 0;
+        m_dib_header.important = 0;
     }
 
-    m_dib_header.write_header(m_fd);
+    m_dib_header.isize = int32_t(m_spec.image_pixels());
+    m_dib_header.hres  = 0;
+    m_dib_header.vres  = 0;
+
+    string_view res_units = m_spec.get_string_attribute("ResolutionUnit");
+    if (Strutil::iequals(res_units, "m")
+        || Strutil::iequals(res_units, "pixel per meter")) {
+        m_dib_header.hres = m_spec.get_int_attribute("XResolution");
+        m_dib_header.vres = m_spec.get_int_attribute("YResolution");
+    }
+
+    m_dib_header.write_header(ioproxy());
+
+    // Write palette, if there is one. This is only used for grayscale
+    // images, and the palette is just the 256 possible gray values.
+    for (int i = 0; i < m_dib_header.cpalete; ++i) {
+        unsigned char val[4] = { uint8_t(i), uint8_t(i), uint8_t(i), 255 };
+        iowrite(&val, 4);
+    }
 }
 
 OIIO_PLUGIN_NAMESPACE_END

src/build-scripts/OpenEXR-CMakeLists.txt

@@ -1,266 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
-PROJECT (openexr)
-
-SET(OPENEXR_VERSION_MAJOR "2")
-SET(OPENEXR_VERSION_MINOR "2")
-SET(OPENEXR_VERSION_PATCH "0")
-
-SET(OPENEXR_VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH})
-SET(OPENEXR_VERSION_API ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
-
-
-# enable the tests
-ENABLE_TESTING()
-
-
-# distro building 
-SET(CPACK_PACKAGE_VERSION_MAJOR "${OPENEXR_VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${OPENEXR_VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${OPENEXR_VERSION_PATCH}")
-SET(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME
-    "${CMAKE_PROJECT_NAME}-${OPENEXR_VERSION}"
-  )
-set(CPACK_SOURCE_IGNORE_FILES
-  "/.git*;/.cvs*;${CPACK_SOURCE_IGNORE_FILES}")
-INCLUDE ( CPack )
-
-
-
-# Allow the developer to select if Dynamic or Static libraries are built
-OPTION (BUILD_SHARED_LIBS    "Build Shared Libraries" ON)
-OPTION (USE_ZLIB_WINAPI      "Use ZLib Win API"       OFF)
-OPTION (NAMESPACE_VERSIONING "Use Namespace Versioning" ON)
-OPTION (BUILD_UTILS "Build the binary/utility programs" ON)
-OPTION (BUILD_TESTS "Build the tests" ON)
-
-# Setup osx rpathing
-SET (CMAKE_MACOSX_RPATH 1)
-SET (BUILD_WITH_INSTALL_RPATH 1)
-
-ADD_DEFINITIONS ( -DHAVE_CONFIG_H -DILM_IMF_TEST_IMAGEDIR="${CMAKE_SOURCE_DIR}/IlmImfTest/" )
-
-INCLUDE_DIRECTORIES (
-  ${CMAKE_CURRENT_BINARY_DIR}/config
-  IlmImf
-  IlmImfUtil
-  exrmaketiled
-  exrenvmap
-  exrmakepreview
-  exrmultiview
-  IlmImfFuzzTest
-)
-
-FIND_PACKAGE(ZLIB REQUIRED)
-INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-
-IF (NOT WIN32)
-  SET ( PTHREAD_LIB pthread )
-ENDIF()
-
-INCLUDE_DIRECTORIES ( ${ILMBASE_PACKAGE_PREFIX}/include/OpenEXR )
-LINK_DIRECTORIES ( ${ILMBASE_PACKAGE_PREFIX}/lib )
-MESSAGE ( "ILMBASE_PACKAGE_PREFIX = " ${ILMBASE_PACKAGE_PREFIX})
-
-SET (LIB_TYPE STATIC)
-IF (BUILD_SHARED_LIBS)
-  # User wants to build Dynamic Libraries, so change the LIB_TYPE variable to CMake keyword 'SHARED'
-  SET (LIB_TYPE SHARED)
-    IF (WIN32)
-    ADD_DEFINITIONS(-DOPENEXR_DLL)
-  ENDIF ()
-ENDIF ()
-
-IF (USE_ZLIB_WINAPI)
-  ADD_DEFINITIONS(-DZLIB_WINAPI)
-ENDIF ()
-
-# Test for GCC-style inline asm support with AVX instructions
-INCLUDE (CheckCXXSourceCompiles)
-CHECK_CXX_SOURCE_COMPILES (
-	"
-	int main()
-	{
-	 #if defined(__GNUC__) && defined(__SSE2__) 
-		 int n   = 0;
-		 int eax = 0;
-		 int edx = 0;
-		 __asm__(
-			 \"xgetbv     ;\"
-			 \"vzeroupper  \"
-			 : \"=a\"(eax), \"=d\"(edx) : \"c\"(n) : );
-	 #else
-		 #error No GCC style inline asm supported for AVX instructions
-	 #endif
-	}
-	" HAVE_GCC_INLINE_ASM_AVX)
-
-# Check if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count
-CHECK_CXX_SOURCE_COMPILES (
-    "
-    #include <unistd.h>
-    int main()
-    {
-        sysconf(_SC_NPROCESSORS_ONLN);
-    }
-    " HAVE_SYSCONF_NPROCESSORS_ONLN)
-
-
-##########################
-# OpenEXRConfig.h generation
-##########################
-IF (WIN32)
-  FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_COMPLETE_IOMANIP 1\n" )
-ELSEIF (APPLE)
-  FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_DARWIN 1\n" )
-  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_COMPLETE_IOMANIP 1\n" )
-  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#include <string.h>\n" )
-ELSE ()
-  # Linux
-  FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_LINUX_PROCFS 1\n" )
-  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_COMPLETE_IOMANIP 1\n" )
-  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_LARGE_STACK 1\n" )
-ENDIF()
-  
-IF (NAMESPACE_VERSIONING)
-    FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM 1\n")
-    FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_NAMESPACE Imf\n" )
-    FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_INTERNAL_NAMESPACE Imf_${OPENEXR_VERSION_API}\n\n" )
-ELSE ()
-    FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM 0\n")
-    FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_NAMESPACE Imf\n" )
-    FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_INTERNAL_NAMESPACE Imf\n\n" )
-ENDIF ()
-
-FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_VERSION_STRING \"${OPENEXR_VERSION}\"\n" )
-FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_PACKAGE_STRING \"OpenEXR ${OPENEXR_VERSION}\"\n" )
-
-
-FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "
-#define OPENEXR_VERSION_MAJOR ${OPENEXR_VERSION_MAJOR}
-#define OPENEXR_VERSION_MINOR ${OPENEXR_VERSION_MINOR}
-#define OPENEXR_VERSION_PATCH ${OPENEXR_VERSION_PATCH}
-")
-
-
-  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "
-// Version as a single hex number, e.g. 0x01000300 == 1.0.3
-#define OPENEXR_VERSION_HEX ((OPENEXR_VERSION_MAJOR << 24) | \\
-                             (OPENEXR_VERSION_MINOR << 16) | \\
-                             (OPENEXR_VERSION_PATCH <<  8))\n
-")
-
-IF (HAVE_GCC_INLINE_ASM_AVX)
-  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1\n" )
-ENDIF()
-  
-IF (HAVE_SYSCONF_NPROCESSORS_ONLN)
-  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1\n" )
-ENDIF()
-  
-SET (OPENEXR_LIBSUFFIX "")
-SET (ILMBASE_LIBSUFFIX "")
-IF (NAMESPACE_VERSIONING)
-  SET ( OPENEXR_LIBSUFFIX "-${OPENEXR_VERSION_API}" )
-  # assume same NAMESPACE_VERSION setting for IlmBase for now
-  SET ( ILMBASE_LIBSUFFIX "-${OPENEXR_VERSION_API}" )
-ENDIF ()
-
-##########################
-# IlmImf library
-##########################
-ADD_SUBDIRECTORY ( IlmImf )
-
-SET_TARGET_PROPERTIES ( IlmImf
-  PROPERTIES
-  VERSION 22.0.0
-  SOVERSION 22
-  OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}"
-  )
-  
-##########################
-# IlmImfUtil library
-##########################
-ADD_SUBDIRECTORY ( IlmImfUtil )
-
-SET_TARGET_PROPERTIES ( IlmImfUtil
-  PROPERTIES
-  VERSION 22.0.0
-  SOVERSION 22
-  OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}"
-  )
-  
-##########################
-# Example Code
-##########################
-ADD_SUBDIRECTORY ( IlmImfExamples )
-
-  
-##########################
-# Tests
-##########################
-if (BUILD_TESTS)
-  ADD_SUBDIRECTORY ( IlmImfTest )
-  ADD_SUBDIRECTORY ( IlmImfUtilTest )
-  ADD_SUBDIRECTORY ( IlmImfFuzzTest )
-endif ()
-
-
-##########################
-# Binaries / Utilities
-##########################
-if (BUILD_UTILS)
-  ADD_SUBDIRECTORY ( exrheader )
-  ADD_SUBDIRECTORY ( exrmaketiled )
-  ADD_SUBDIRECTORY ( exrstdattr )
-  ADD_SUBDIRECTORY ( exrmakepreview )
-  ADD_SUBDIRECTORY ( exrenvmap )
-  ADD_SUBDIRECTORY ( exrmultiview )
-  ADD_SUBDIRECTORY ( exrmultipart )
-endif ()
-
-
-##########################
-# Installation
-##########################
-
-INSTALL ( FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h
-  DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/include/OpenEXR
-  )
-
-# Documentation
-INSTALL ( FILES
-  doc/TechnicalIntroduction.pdf
-  doc/ReadingAndWritingImageFiles.pdf
-  doc/OpenEXRFileLayout.pdf
-  doc/MultiViewOpenEXR.pdf
-  doc/InterpretingDeepPixels.pdf
-  doc/TheoryDeepPixels.pdf
-  DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION}
-  )
-
-# Examples
-INSTALL ( FILES
-  IlmImfExamples/main.cpp
-  IlmImfExamples/drawImage.cpp
-  IlmImfExamples/rgbaInterfaceExamples.cpp
-  IlmImfExamples/rgbaInterfaceTiledExamples.cpp
-  IlmImfExamples/generalInterfaceExamples.cpp
-  IlmImfExamples/lowLevelIoExamples.cpp
-  IlmImfExamples/previewImageExamples.cpp
-  IlmImfExamples/generalInterfaceTiledExamples.cpp
-  IlmImfExamples/generalInterfaceTiledExamples.h
-  IlmImfExamples/drawImage.h
-  IlmImfExamples/rgbaInterfaceExamples.h
-  IlmImfExamples/generalInterfaceExamples.h
-  IlmImfExamples/rgbaInterfaceTiledExamples.h
-  IlmImfExamples/lowLevelIoExamples.h
-  IlmImfExamples/previewImageExamples.h
-  IlmImfExamples/namespaceAlias.h
-  DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION}/examples
-  )

src/build-scripts/OpenEXR-IlmImf-CMakeLists.txt

@@ -1,273 +0,0 @@
-# yue.nicholas@gmail.com
-
-SET(CMAKE_INCLUDE_CURRENT_DIR 1)
-
-if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h")
-  ADD_EXECUTABLE ( b44ExpLogTable
-    b44ExpLogTable.cpp
-  )
-  
-  TARGET_LINK_LIBRARIES ( b44ExpLogTable
-    Half
-    Iex${ILMBASE_LIBSUFFIX}
-    IlmThread${ILMBASE_LIBSUFFIX}
-    ${PTHREAD_LIB}
-  )
-  
-  ADD_CUSTOM_COMMAND (
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h
-    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/b44ExpLogTable >   ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h
-    DEPENDS b44ExpLogTable
-  )
-else ()
- message (STATUS "Skipping build of b44ExpLogTable.h")
-endif ()
-
-if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dwaLookups.h")
-  ADD_EXECUTABLE ( dwaLookups
-    dwaLookups.cpp
-  )
-  
-  TARGET_LINK_LIBRARIES ( dwaLookups
-    Half
-    Iex${ILMBASE_LIBSUFFIX}
-    IlmThread${ILMBASE_LIBSUFFIX}
-    ${PTHREAD_LIB}
-  )
-  
-  ADD_CUSTOM_COMMAND (
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dwaLookups.h
-    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/dwaLookups >   ${CMAKE_CURRENT_BINARY_DIR}/dwaLookups.h
-    DEPENDS dwaLookups
-  )
-else ()
- message (STATUS "Skipping build of dwaLookups.h")
-endif ()
-
-SET ( ILMIMF_SRCS
-  ImfAttribute.cpp
-  ImfBoxAttribute.cpp
-  ImfCRgbaFile.cpp
-  ImfChannelList.cpp
-  ImfChannelListAttribute.cpp
-  ImfFloatAttribute.cpp
-  ImfFrameBuffer.cpp
-  ImfHeader.cpp
-  ImfIO.cpp
-  ImfInputFile.cpp
-  ImfIntAttribute.cpp
-  ImfLineOrderAttribute.cpp
-  ImfMatrixAttribute.cpp
-  ImfOpaqueAttribute.cpp
-  ImfOutputFile.cpp
-  ImfRgbaFile.cpp
-  ImfStringAttribute.cpp
-  ImfVecAttribute.cpp
-  ImfHuf.cpp
-  ImfThreading.cpp
-  ImfWav.cpp
-  ImfLut.cpp
-  ImfCompressor.cpp
-  ImfRleCompressor.cpp
-  ImfZipCompressor.cpp
-  ImfPizCompressor.cpp
-  ImfB44Compressor.cpp
-  ImfDwaCompressor.cpp
-  ImfMisc.cpp
-  ImfCompressionAttribute.cpp
-  ImfDoubleAttribute.cpp
-  ImfConvert.cpp
-  ImfPreviewImage.cpp
-  ImfPreviewImageAttribute.cpp
-  ImfVersion.cpp
-  ImfChromaticities.cpp
-  ImfChromaticitiesAttribute.cpp
-  ImfKeyCode.cpp
-  ImfKeyCodeAttribute.cpp
-  ImfTimeCode.cpp
-  ImfTimeCodeAttribute.cpp
-  ImfRational.cpp
-  ImfRationalAttribute.cpp
-  ImfFramesPerSecond.cpp
-  ImfStandardAttributes.cpp
-  ImfStdIO.cpp
-  ImfEnvmap.cpp
-  ImfEnvmapAttribute.cpp
-  ImfScanLineInputFile.cpp
-  ImfTiledInputFile.cpp
-  ImfTiledMisc.cpp
-  ImfTiledOutputFile.cpp
-  ImfTiledRgbaFile.cpp
-  ImfTileDescriptionAttribute.cpp
-  ImfTileOffsets.cpp
-  ImfRgbaYca.cpp
-  ImfPxr24Compressor.cpp
-  ImfTestFile.cpp
-  ImfStringVectorAttribute.cpp
-  ImfMultiView.cpp
-  ImfAcesFile.cpp
-  ImfMultiPartOutputFile.cpp
-  ImfGenericOutputFile.cpp
-  ImfOutputPartData.cpp
-  ImfMultiPartInputFile.cpp
-  ImfGenericInputFile.cpp
-  ImfPartType.cpp
-  ImfInputPartData.cpp
-  ImfOutputPart.cpp
-  ImfTiledOutputPart.cpp
-  ImfInputPart.cpp
-  ImfTiledInputPart.cpp
-  ImfDeepScanLineInputPart.cpp
-  ImfDeepScanLineOutputPart.cpp
-  ImfDeepScanLineInputFile.cpp
-  ImfDeepScanLineOutputFile.cpp
-  ImfDeepTiledInputPart.cpp
-  ImfDeepTiledOutputPart.cpp
-  ImfDeepTiledInputFile.cpp
-  ImfDeepTiledOutputFile.cpp
-  ImfDeepFrameBuffer.cpp
-  ImfDeepCompositing.cpp
-  ImfCompositeDeepScanLine.cpp
-  ImfDeepImageStateAttribute.cpp
-  ImfFastHuf.cpp
-  ImfFloatVectorAttribute.cpp
-  ImfRle.cpp
-  ImfSystemSpecific.cpp
-  ImfZip.cpp
-)
-
-IF (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DILMIMF_EXPORTS)
-ENDIF()
-
-ADD_LIBRARY ( IlmImf ${LIB_TYPE}
-  ${ILMIMF_SRCS}
-)
-
-TARGET_LINK_LIBRARIES ( IlmImf 
-  Half 
-  Iex${ILMBASE_LIBSUFFIX}
-  Imath${ILMBASE_LIBSUFFIX}
-  IlmThread${ILMBASE_LIBSUFFIX}
-  ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
-)
-
-
-ADD_DEPENDENCIES ( IlmImf b44ExpLogTable )
-
-SET_SOURCE_FILES_PROPERTIES (
-  ImfB44Compressor.cpp
-  PROPERTIES
-  OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h
-)
-
-
-ADD_DEPENDENCIES ( IlmImf dwaLookups )
-
-SET_SOURCE_FILES_PROPERTIES (
-  ImfDwaCompressor.cpp
-  PROPERTIES
-  OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dwaLookups.h
-)
-
-# Libraries
-
-INSTALL ( TARGETS
-  IlmImf
-  DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/lib
-)
-
-# Headers
-INSTALL ( FILES
-  ImfForward.h
-  ImfExport.h
-  ImfAttribute.h
-  ImfBoxAttribute.h
-  ImfCRgbaFile.h
-  ImfChannelList.h
-  ImfChannelListAttribute.h
-  ImfCompressionAttribute.h
-  ImfDoubleAttribute.h
-  ImfFloatAttribute.h
-  ImfFrameBuffer.h
-  ImfHeader.h
-  ImfIO.h
-  ImfInputFile.h
-  ImfIntAttribute.h
-  ImfLineOrderAttribute.h
-  ImfMatrixAttribute.h
-  ImfOpaqueAttribute.h
-  ImfOutputFile.h
-  ImfRgbaFile.h
-  ImfStringAttribute.h
-  ImfVecAttribute.h
-  ImfHuf.h
-  ImfWav.h
-  ImfLut.h
-  ImfArray.h
-  ImfCompression.h
-  ImfLineOrder.h
-  ImfName.h
-  ImfPixelType.h
-  ImfVersion.h
-  ImfXdr.h
-  ImfConvert.h
-  ImfPreviewImage.h
-  ImfPreviewImageAttribute.h
-  ImfChromaticities.h
-  ImfChromaticitiesAttribute.h
-  ImfKeyCode.h
-  ImfKeyCodeAttribute.h
-  ImfTimeCode.h
-  ImfTimeCodeAttribute.h
-  ImfRational.h
-  ImfRationalAttribute.h
-  ImfFramesPerSecond.h
-  ImfStandardAttributes.h
-  ImfEnvmap.h
-  ImfEnvmapAttribute.h
-  ImfInt64.h
-  ImfRgba.h
-  ImfTileDescription.h
-  ImfTileDescriptionAttribute.h
-  ImfTiledInputFile.h
-  ImfTiledOutputFile.h
-  ImfTiledRgbaFile.h
-  ImfRgbaYca.h
-  ImfTestFile.h
-  ImfThreading.h
-  ImfB44Compressor.h
-  ImfStringVectorAttribute.h
-  ImfMultiView.h
-  ImfAcesFile.h
-  ImfMultiPartOutputFile.h
-  ImfGenericOutputFile.h
-  ImfMultiPartInputFile.h
-  ImfGenericInputFile.h
-  ImfPartType.h
-  ImfPartHelper.h
-  ImfOutputPart.h
-  ImfTiledOutputPart.h
-  ImfInputPart.h
-  ImfTiledInputPart.h
-  ImfDeepScanLineOutputFile.h
-  ImfDeepScanLineOutputPart.h
-  ImfDeepScanLineInputFile.h
-  ImfDeepScanLineInputPart.h
-  ImfDeepTiledInputFile.h
-  ImfDeepTiledInputPart.h
-  ImfDeepTiledOutputFile.h
-  ImfDeepTiledOutputPart.h
-  ImfDeepFrameBuffer.h
-  ImfDeepCompositing.h
-  ImfCompositeDeepScanLine.h
-  ImfNamespace.h
-  ImfMisc.h
-  ImfDeepImageState.h
-  ImfDeepImageStateAttribute.h
-  ImfFloatVectorAttribute.h
-  DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/include/OpenEXR
-)
-

src/build-scripts/OpenImageIO.pc.in

@@ -6,5 +6,5 @@ includedir=${prefix}/include
 Name: OpenImageIO
 Description: OpenImageIO is a library for reading and writing images.
 Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.@PROJECT_VERSION_TWEAK@
-Libs: -L${libdir} -lOpenImageIO 
-Cflags: -I${includedir}/OpenImageIO
+Libs: -L${libdir} -lOpenImageIO -lOpenImageIO_Util
+Cflags: -I${includedir}

src/build-scripts/build_OpenJPEG.bash

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Utility script to download and build OpenJPEG
+#
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Exit the whole script if any command fails.
+set -ex
+
+# Repo and branch/tag/commit of OpenJPEG to download if we don't have it yet
+OPENJPEG_REPO=${OPENJPEG_REPO:=https://github.com/uclouvain/openjpeg.git}
+OPENJPEG_VERSION=${OPENJPEG_VERSION:=v2.4.0}
+
+# Where to put OpenJPEG repo source (default to the ext area)
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+OPENJPEG_SRC_DIR=${OPENJPEG_SRC_DIR:=${LOCAL_DEPS_DIR}/OpenJPEG}
+OPENJPEG_BUILD_DIR=${OPENJPEG_BUILD_DIR:=${OPENJPEG_SRC_DIR}/build}
+OPENJPEG_INSTALL_DIR=${OPENJPEG_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
+#OPENJPEG_CONFIG_OPTS=${OPENJPEG_CONFIG_OPTS:=}
+
+pwd
+echo "OpenJPEG install dir will be: ${OPENJPEG_INSTALL_DIR}"
+
+mkdir -p ./ext
+pushd ./ext
+
+# Clone OpenJPEG project from GitHub and build
+if [[ ! -e ${OPENJPEG_SRC_DIR} ]] ; then
+    echo "git clone ${OPENJPEG_REPO} ${OPENJPEG_SRC_DIR}"
+    git clone ${OPENJPEG_REPO} ${OPENJPEG_SRC_DIR}
+fi
+cd ${OPENJPEG_SRC_DIR}
+
+echo "git checkout ${OPENJPEG_VERSION} --force"
+git checkout ${OPENJPEG_VERSION} --force
+
+mkdir -p ${OPENJPEG_BUILD_DIR} && true
+cd ${OPENJPEG_BUILD_DIR}
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=${OPENJPEG_INSTALL_DIR} \
+               -DBUILD_CODEC=OFF \
+               ${OPENJPEG_CONFIG_OPTS} ..
+    time cmake --build . --config Release --target install
+fi
+
+# ls -R ${OPENJPEG_INSTALL_DIR}
+popd
+
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export OpenJPEG_ROOT=$OPENJPEG_INSTALL_DIR
+

src/build-scripts/build_Ptex.bash

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# Utility script to download and build Ptex
+#
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Exit the whole script if any command fails.
+set -ex
+
+# Repo and branch/tag/commit of ptex to download if we don't have it yet
+: ${PTEX_REPO:=https://github.com/wdas/ptex.git}
+: ${PTEX_VERSION:=v2.4.0}
+: ${PTEX_SRC_DIR:=${PWD}/ext/ptex}
+: ${PTEX_BUILD_DIR:=${PTEX_SRC_DIR}/build}
+: ${PTEX_INSTALL_DIR:=${PWD}/ext/dist}
+
+pwd
+echo "Ptex install dir will be: ${PTEX_INSTALL_DIR}"
+
+mkdir -p ./ext
+pushd ./ext
+
+# Clone ptex project from GitHub and build
+if [[ ! -e ${PTEX_SRC_DIR} ]] ; then
+    echo "git clone ${PTEX_REPO} ${PTEX_SRC_DIR}"
+    git clone ${PTEX_REPO} ${PTEX_SRC_DIR}
+fi
+cd ${PTEX_SRC_DIR}
+echo "git checkout ${PTEX_VERSION} --force"
+git checkout ${PTEX_VERSION} --force
+
+mkdir -p ${PTEX_BUILD_DIR}
+cd ${PTEX_BUILD_DIR}
+time cmake -DCMAKE_BUILD_TYPE=Release \
+           -DCMAKE_INSTALL_PREFIX=${PTEX_INSTALL_DIR} \
+           ${PTEX_CONFIG_OPTS} ..
+time cmake --build . --config Release --target install
+
+# ls -R ${PTEX_INSTALL_DIR}
+popd
+
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export Ptex_ROOT=$PTEX_INSTALL_DIR
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PTEX_INSTALL_DIR}/lib:${PTEX_INSTALL_DIR}/lib64

src/build-scripts/build_cmake.bash

@@ -22,7 +22,7 @@ fi
 if [[ `uname` == "Linux" && `uname -m` == "aarch64" ]] ; then
     mkdir -p ${CMAKE_INSTALL_DIR} || true
     curl --location https://anaconda.org/conda-forge/cmake/3.17.0/download/linux-aarch64/cmake-3.17.0-h28c56e5_0.tar.bz2 -o cmake-3.17.0-h28c56e5_0.tar.bz2
-    tar -xjvf cmake-3.17.0-h28c56e5_0.tar.bz2 -C ${CMAKE_INSTALL_DIR}
+    tar -xjf cmake-3.17.0-h28c56e5_0.tar.bz2 -C ${CMAKE_INSTALL_DIR}
     export PATH=${CMAKE_INSTALL_DIR}/bin:$PATH
 
     # In case we ever need to build from scratch:

src/build-scripts/build_gif.bash

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Utility script to download and build giflib
+
+# Exit the whole script if any command fails.
+set -ex
+
+GIFLIB_REPO=${GIFLIB_REPO:=https://gitlab.com/giflib/giflib.git}
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+GIFLIB_BUILD_DIR=${GIFLIB_BUILD_DIR:=${LOCAL_DEPS_DIR}/giflib}
+GIFLIB_INSTALL_DIR=${GIFLIB_INSTALL_DIR:=${PWD}/ext/dist}
+GIFLIB_VERSION=${GIFLIB_VERSION:=5.2.1}
+GIFLIB_CC=${GIFLIB_CC:=gcc}
+BASEDIR=`pwd`
+pwd
+echo "giflib install dir will be: ${GIFLIB_INSTALL_DIR}"
+
+mkdir -p ${LOCAL_DEPS_DIR}
+pushd ${LOCAL_DEPS_DIR}
+
+
+# Clone giflib project and build
+if [[ ! -e giflib-${GIFLIB_VERSION} ]] ; then
+    curl --location https://downloads.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.gz -o giflib.tar.gz
+    tar xzf giflib.tar.gz
+    pushd giflib-${GIFLIB_VERSION}
+    cp Makefile Makefile.old
+    curl --location https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch -o Makefile.patch
+    patch -p0 < Makefile.patch
+    popd
+fi 
+
+
+cd giflib-${GIFLIB_VERSION}
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time make PREFIX=${GIFLIB_INSTALL_DIR} CC=${GIFLIB_CC} install
+fi
+
+popd
+
+# ls -R ${GIFLIB_INSTALL_DIR} && true
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export GIF_ROOT=$GIFLIB_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${GIFLIB_INSTALL_DIR}/lib

src/build-scripts/build_libjpeg-turbo.bash

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Utility script to download and build libjpeg-turbo
+#
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Exit the whole script if any command fails.
+set -ex
+
+# Repo and branch/tag/commit of libjpeg-turbo to download if we don't have it yet
+LIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO:=https://github.com/libjpeg-turbo/libjpeg-turbo.git}
+LIBJPEGTURBO_VERSION=${LIBJPEGTURBO_VERSION:=2.0.5}
+
+# Where to put libjpeg-turbo repo source (default to the ext area)
+LIBJPEGTURBO_SRC_DIR=${LIBJPEGTURBO_SRC_DIR:=${PWD}/ext/libjpeg-turbo}
+# Temp build area (default to a build/ subdir under source)
+LIBJPEGTURBO_BUILD_DIR=${LIBJPEGTURBO_BUILD_DIR:=${LIBJPEGTURBO_SRC_DIR}/build}
+# Install area for libjpeg-turbo (default to ext/dist)
+LIBJPEGTURBO_INSTALL_DIR=${LIBJPEGTURBO_INSTALL_DIR:=${PWD}/ext/dist}
+#LIBJPEGTURBO_CONFIG_OPTS=${LIBJPEGTURBO_CONFIG_OPTS:=}
+
+pwd
+echo "libjpeg-turbo install dir will be: ${LIBJPEGTURBO_INSTALL_DIR}"
+
+mkdir -p ./ext
+pushd ./ext
+
+# Clone libjpeg-turbo project from GitHub and build
+if [[ ! -e ${LIBJPEGTURBO_SRC_DIR} ]] ; then
+    echo "git clone ${LIBJPEGTURBO_REPO} ${LIBJPEGTURBO_SRC_DIR}"
+    git clone ${LIBJPEGTURBO_REPO} ${LIBJPEGTURBO_SRC_DIR}
+fi
+cd ${LIBJPEGTURBO_SRC_DIR}
+echo "git checkout ${LIBJPEGTURBO_VERSION} --force"
+git checkout ${LIBJPEGTURBO_VERSION} --force
+
+mkdir -p ${LIBJPEGTURBO_BUILD_DIR}
+cd ${LIBJPEGTURBO_BUILD_DIR}
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=${LIBJPEGTURBO_INSTALL_DIR} \
+               ${LIBJPEGTURBO_CONFIG_OPTS} ..
+    time cmake --build . --config Release --target install
+fi
+
+# ls -R ${LIBJPEGTURBO_INSTALL_DIR}
+popd
+
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export JPEGTurbo_ROOT=$LIBJPEGTURBO_INSTALL_DIR
+

src/build-scripts/build_libpng.bash

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# Utility script to download and build libpng
+#
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Exit the whole script if any command fails.
+set -ex
+
+# Repo and branch/tag/commit of libpng to download if we don't have it yet
+LIBPNG_REPO=${LIBPNG_REPO:=https://github.com/glennrp/libpng.git}
+LIBPNG_VERSION=${LIBPNG_VERSION:=v1.6.35}
+
+# Where to put libpng repo source (default to the ext area)
+LIBPNG_SRC_DIR=${LIBPNG_SRC_DIR:=${PWD}/ext/libpng}
+# Temp build area (default to a build/ subdir under source)
+LIBPNG_BUILD_DIR=${LIBPNG_BUILD_DIR:=${LIBPNG_SRC_DIR}/build}
+# Install area for libpng (default to ext/dist)
+LIBPNG_INSTALL_DIR=${LIBPNG_INSTALL_DIR:=${PWD}/ext/dist}
+#LIBPNG_CONFIG_OPTS=${LIBPNG_CONFIG_OPTS:=}
+
+pwd
+echo "libpng install dir will be: ${LIBPNG_INSTALL_DIR}"
+
+mkdir -p ./ext
+pushd ./ext
+
+# Clone libpng project from GitHub and build
+if [[ ! -e ${LIBPNG_SRC_DIR} ]] ; then
+    echo "git clone ${LIBPNG_REPO} ${LIBPNG_SRC_DIR}"
+    git clone ${LIBPNG_REPO} ${LIBPNG_SRC_DIR}
+fi
+cd ${LIBPNG_SRC_DIR}
+
+
+echo "git checkout ${LIBPNG_VERSION} --force"
+git checkout ${LIBPNG_VERSION} --force
+
+mkdir -p ${LIBPNG_BUILD_DIR}
+cd ${LIBPNG_BUILD_DIR}
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=${LIBPNG_INSTALL_DIR} \
+               -DPNG_EXECUTABLES=OFF \
+               -DPNG_TESTS=OFF \
+               ${LIBPNG_CONFIG_OPTS} ..
+    time cmake --build . --config Release --target install
+fi
+
+# ls -R ${LIBPNG_INSTALL_DIR}
+popd
+
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export PNG_ROOT=$LIBPNG_INSTALL_DIR
+

src/build-scripts/build_libraw.bash

@@ -7,8 +7,7 @@ set -ex
 
 # Which LibRaw to retrieve, how to build it
 LIBRAW_REPO=${LIBRAW_REPO:=https://github.com/LibRaw/LibRaw.git}
-LIBRAW_VERSION=${LIBRAW_VERSION:=0.19.5}
-LIBRAW_BRANCH=${LIBRAW_BRANCH:=${LIBRAW_VERSION}}
+LIBRAW_VERSION=${LIBRAW_VERSION:=0.20.2}
 
 # Where to install the final results
 LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
@@ -18,7 +17,7 @@ LIBRAW_INSTALL_DIR=${LIBRAW_INSTALL_DIR:=${LOCAL_DEPS_DIR}/libraw-install}
 LIBRAW_BUILD_TYPE=${LIBRAW_BUILD_TYPE:=Release}
 
 pwd
-echo "Building LibRaw ${LIBRAW_BRANCH}"
+echo "Building LibRaw ${LIBRAW_VERSION}"
 echo "  build dir will be: ${LIBRAW_BUILD_DIR}"
 echo "  install dir will be: ${LIBRAW_INSTALL_DIR}"
 echo "  build type is ${LIBRAW_BUILD_TYPE}"
@@ -34,12 +33,15 @@ mkdir -p ${LIBRAW_INSTALL_DIR} && true
 mkdir -p ${LIBRAW_BUILD_DIR} && true
 
 pushd ${LIBRAW_SOURCE_DIR}
-git checkout ${LIBRAW_BRANCH} --force
 
-aclocal
-autoreconf --install
-./configure --prefix=${LIBRAW_INSTALL_DIR}
-time make -j ${PARALLEL:=4} && make install
+git checkout ${LIBRAW_VERSION} --force
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    aclocal
+    autoreconf --install
+    ./configure --prefix=${LIBRAW_INSTALL_DIR}
+    time make -j ${PARALLEL:=4} && make install
+fi
 
 popd
 

src/build-scripts/build_libtiff.bash

@@ -8,10 +8,12 @@ set -ex
 LIBTIFF_REPO=${LIBTIFF_REPO:=https://gitlab.com/libtiff/libtiff.git}
 LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
 LIBTIFF_BUILD_DIR=${LIBTIFF_BUILD_DIR:=${LOCAL_DEPS_DIR}/libtiff}
-LIBTIFF_INSTALL_DIR=${LIBTIFF_INSTALL_DIR:=${LOCAL_DEPS_DIR}/libtiff/dist}
-LIBTIFF_VERSION=${LIBTIFF_VERSION:=4.1.0}
-LIBTIFF_BRANCH=${LIBTIFF_BRANCH:=v${LIBTIFF_VERSION}}
-LIBTIFF_CXX_FLAGS=${LIBTIFF_CXX_FLAGS:="-Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}
+LIBTIFF_INSTALL_DIR=${LIBTIFF_INSTALL_DIR:=${PWD}/ext/dist}
+LIBTIFF_VERSION=${LIBTIFF_VERSION:=v4.3.0}
+LIBTIFF_BUILD_TYPE=${LIBTIFF_BUILD_TYPE:=Release}
+if [[ `uname` == `Linux` ]] ; then
+    LIBTIFF_CXX_FLAGS=${LIBTIFF_CXX_FLAGS:="-O3 -Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}
+fi
 LIBTIFF_BUILDOPTS="${LIBTIFF_BUILDOPTS}"
 BASEDIR=`pwd`
 pwd
@@ -27,21 +29,29 @@ if [[ ! -e libtiff ]] ; then
 fi
 cd libtiff
 
-echo "git checkout ${LIBTIFF_BRANCH} --force"
-git checkout ${LIBTIFF_BRANCH} --force
+echo "git checkout ${LIBTIFF_VERSION} --force"
+git checkout ${LIBTIFF_VERSION} --force
+
 mkdir -p build
 cd build
-time cmake --config Release -DCMAKE_INSTALL_PREFIX=${LIBTIFF_INSTALL_DIR} -DCMAKE_CXX_FLAGS="${LIBTIFF_CXX_FLAGS}" ${LIBTIFF_BUILDOPTS} ..
-time cmake --build . --config Release --target install
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=${LIBTIFF_BUILD_TYPE} \
+               -DCMAKE_INSTALL_PREFIX=${LIBTIFF_INSTALL_DIR} \
+               -DCMAKE_CXX_FLAGS="${LIBTIFF_CXX_FLAGS}" \
+               ${LIBTIFF_BUILDOPTS} ..
+    time cmake --build . --target install
+fi
+
 popd
 
-ls -R ${LIBTIFF_INSTALL_DIR}
+# ls -R ${LIBTIFF_INSTALL_DIR}
 
 #echo "listing .."
 #ls ..
 
 # Set up paths. These will only affect the caller if this script is
 # run with 'source' rather than in a separate shell.
-export TIFF_ROOT=$LIBTIFF_INSTALL_DIR
+export LIBTIFF_ROOT=$LIBTIFF_INSTALL_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${LIBTIFF_INSTALL_DIR}/lib
 

src/build-scripts/build_llvm.bash

@@ -30,7 +30,7 @@ if [[ `uname` == "Linux" ]] ; then
     fi
     echo LLVMTAR = $LLVMTAR
     curl --location http://releases.llvm.org/${LLVM_VERSION}/${LLVMTAR} -o $LLVMTAR
-    ls -l $LLVMTAR
+    # ls -l $LLVMTAR
     tar xf $LLVMTAR
     rm -f $LLVMTAR
     echo "Installed ${LLVM_VERSION} in ${LLVM_INSTALL_DIR}"
@@ -38,5 +38,5 @@ if [[ `uname` == "Linux" ]] ; then
     mv clang+llvm*/* $LLVM_INSTALL_DIR
     export LLVM_DIRECTORY=$LLVM_INSTALL_DIR
     export PATH=${LLVM_INSTALL_DIR}/bin:$PATH
-    ls -a $LLVM_DIRECTORY
+    # ls -a $LLVM_DIRECTORY
 fi

src/build-scripts/build_ninja.bash

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# Exit the whole script if any command fails.
+set -ex
+
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+DOWNLOADS_DIR=${DOWNLOADS_DIR:=${LOCAL_DEPS_DIR}/downloads}
+NINJA_REPO=${NINJA_REPO:=https://github.com/ninja-build/ninja}
+NINJA_VERSION=${NINJA_VERSION:=1.10.2}
+NINJA_BRANCH=${NINJA_BRANCH:=v${NINJA_VERSION}}
+NINJA_INSTALL_DIR=${NINJA_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist/bin}
+
+if [ ! -f $DOWNLOADS_DIR/ninja-${NINJA_VERSION}.zip ]; then
+    curl --location ${NINJA_REPO}/archive/${NINJA_BRANCH}.tar.gz -o $DOWNLOADS_DIR/ninja-${NINJA_BRANCH}.tar.gz
+fi
+
+tar xf $DOWNLOADS_DIR/ninja-${NINJA_BRANCH}.tar.gz
+pushd ninja-${NINJA_VERSION}
+
+./configure.py --bootstrap
+
+mkdir -p ${NINJA_INSTALL_DIR}
+cp ninja ${NINJA_INSTALL_DIR}
+
+popd
+

src/build-scripts/build_ocio.bash

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# Utility script to download and build OpenColorIO
-
-# Exit the whole script if any command fails.
-set -ex
-
-OCIO_REPO=${OCIO_REPO:=https://github.com/AcademySoftwareFoundation/OpenColorIO.git}
-LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
-OCIO_BUILD_DIR=${OCIO_BUILD_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO}
-OCIO_INSTALL_DIR=${OCIO_INSTALL_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO/dist}
-OCIO_VERSION=${OCIO_VERSION:=1.1.1}
-OCIO_BRANCH=${OCIO_BRANCH:=v${OCIO_VERSION}}
-OCIO_CXX_FLAGS=${OCIO_CXX_FLAGS:="-Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}
-# Just need libs:
-OCIO_BUILDOPTS="-DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
-               -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF \
-               -DOCIO_BUILD_PYTHON=OFF -DOCIO_BUILD_PYGLUE=OFF \
-               -DOCIO_BUILD_JAVA=OFF \
-               -DOCIO_BUILD_STATIC=${OCIO_BUILD_STATIC:=OFF}"
-BASEDIR=`pwd`
-pwd
-echo "OpenColorIO install dir will be: ${OCIO_INSTALL_DIR}"
-
-mkdir -p ${LOCAL_DEPS_DIR}
-pushd ${LOCAL_DEPS_DIR}
-
-# Clone OpenColorIO project from GitHub and build
-if [[ ! -e OpenColorIO ]] ; then
-    echo "git clone ${OCIO_REPO} OpenColorIO"
-    git clone ${OCIO_REPO} OpenColorIO
-fi
-cd OpenColorIO
-
-echo "git checkout ${OCIO_BRANCH} --force"
-git checkout ${OCIO_BRANCH} --force
-mkdir -p build
-cd build
-time cmake --config Release -DCMAKE_INSTALL_PREFIX=${OCIO_INSTALL_DIR} -DCMAKE_CXX_FLAGS="${OCIO_CXX_FLAGS}" ${OCIO_BUILDOPTS} ..
-time cmake --build . --config Release --target install
-popd
-
-ls -R ${OCIO_INSTALL_DIR}
-
-#echo "listing .."
-#ls ..
-
-# Set up paths. These will only affect the caller if this script is
-# run with 'source' rather than in a separate shell.
-export OpenColorIO_ROOT=$OCIO_INSTALL_DIR
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OCIO_INSTALL_DIR}/lib
-

src/build-scripts/build_opencolorio.bash

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+# Utility script to download and build OpenColorIO
+
+# Exit the whole script if any command fails.
+set -ex
+
+# Which OCIO to retrieve, how to build it
+OPENCOLORIO_REPO=${OPENCOLORIO_REPO:=https://github.com/AcademySoftwareFoundation/OpenColorIO.git}
+OPENCOLORIO_VERSION=${OPENCOLORIO_VERSION:=v2.0.1}
+
+# Where to install the final results
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+OPENCOLORIO_SOURCE_DIR=${OPENCOLORIO_SOURCE_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO}
+OPENCOLORIO_BUILD_DIR=${OPENCOLORIO_BUILD_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO-build}
+OPENCOLORIO_INSTALL_DIR=${OPENCOLORIO_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
+OPENCOLORIO_CXX_FLAGS=${OPENCOLORIO_CXX_FLAGS:="-Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}
+# Just need libs:
+OPENCOLORIO_BUILDOPTS="-DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
+                       -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF \
+                       -DOCIO_BUILD_GPU_TESTS=OFF \
+                       -DOCIO_BUILD_PYTHON=OFF -DOCIO_BUILD_PYGLUE=OFF \
+                       -DOCIO_BUILD_JAVA=OFF \
+                       -DBUILD_SHARED_LIBS=${OPENCOLORIO_BUILD_SHARED_LIBS:=ON}"
+BASEDIR=`pwd`
+pwd
+echo "OpenColorIO install dir will be: ${OPENCOLORIO_INSTALL_DIR}"
+
+mkdir -p ${LOCAL_DEPS_DIR}
+pushd ${LOCAL_DEPS_DIR}
+
+# Clone OpenColorIO project from GitHub and build
+if [[ ! -e ${OPENCOLORIO_SOURCE_DIR} ]] ; then
+    echo "git clone ${OPENCOLORIO_REPO} ${OPENCOLORIO_SOURCE_DIR}"
+    git clone ${OPENCOLORIO_REPO} ${OPENCOLORIO_SOURCE_DIR}
+fi
+cd ${OPENCOLORIO_SOURCE_DIR}
+
+echo "git checkout ${OPENCOLORIO_VERSION} --force"
+git checkout ${OPENCOLORIO_VERSION} --force
+mkdir -p ${OPENCOLORIO_BUILD_DIR}
+cd ${OPENCOLORIO_BUILD_DIR}
+time cmake -DCMAKE_BUILD_TYPE=Release \
+           -DCMAKE_INSTALL_PREFIX=${OPENCOLORIO_INSTALL_DIR} \
+           -DCMAKE_CXX_FLAGS="${OPENCOLORIO_CXX_FLAGS}" \
+           ${OPENCOLORIO_BUILDOPTS} ${OPENCOLORIO_SOURCE_DIR}
+time cmake --build . --config Release --target install
+popd
+
+# ls -R ${OPENCOLORIO_INSTALL_DIR}
+
+#echo "listing .."
+#ls ..
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export OpenColorIO_ROOT=$OPENCOLORIO_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OPENCOLORIO_INSTALL_DIR}/lib
+

src/build-scripts/build_openexr.bash

@@ -6,66 +6,41 @@
 set -ex
 
 # Which OpenEXR to retrieve, how to build it
-OPENEXR_REPO=${OPENEXR_REPO:=https://github.com/openexr/openexr.git}
-OPENEXR_VERSION=${OPENEXR_VERSION:=2.4.1}
-OPENEXR_BRANCH=${OPENEXR_BRANCH:=v${OPENEXR_VERSION}}
+OPENEXR_REPO=${OPENEXR_REPO:=https://github.com/AcademySoftwareFoundation/openexr.git}
+OPENEXR_VERSION=${OPENEXR_VERSION:=v2.4.1}
 
 # Where to install the final results
 LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
 OPENEXR_SOURCE_DIR=${OPENEXR_SOURCE_DIR:=${LOCAL_DEPS_DIR}/openexr}
 OPENEXR_BUILD_DIR=${OPENEXR_BUILD_DIR:=${LOCAL_DEPS_DIR}/openexr-build}
-OPENEXR_INSTALL_DIR=${OPENEXR_INSTALL_DIR:=${LOCAL_DEPS_DIR}/openexr-install}
+OPENEXR_INSTALL_DIR=${OPENEXR_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 OPENEXR_BUILD_TYPE=${OPENEXR_BUILD_TYPE:=Release}
-CMAKE_GENERATOR=${CMAKE_GENERATOR:="Unix Makefiles"}
 OPENEXR_CMAKE_FLAGS=${OPENEXR_CMAKE_FLAGS:=""}
 OPENEXR_CXX_FLAGS=${OPENEXR_CXX_FLAGS:=""}
 BASEDIR=$PWD
 
 pwd
-echo "Building OpenEXR ${OPENEXR_BRANCH}"
-echo "EXR build dir will be: ${OPENEXR_BUILD_DIR}"
-echo "EXR install dir will be: ${OPENEXR_INSTALL_DIR}"
-echo "CMAKE_PREFIX_PATH is ${CMAKE_PREFIX_PATH}"
+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}"
-
-if [[ "$CMAKE_GENERATOR" == "" ]] ; then
-    OPENEXR_GENERATOR_CMD="-G \"$CMAKE_GENERATOR\""
-fi
+echo "CMAKE_PREFIX_PATH is ${CMAKE_PREFIX_PATH}"
 
 # Clone OpenEXR project (including IlmBase) from GitHub and build
 if [[ ! -e ${OPENEXR_SOURCE_DIR} ]] ; then
     echo "git clone ${OPENEXR_REPO} ${OPENEXR_SOURCE_DIR}"
     git clone ${OPENEXR_REPO} ${OPENEXR_SOURCE_DIR}
 fi
-
 mkdir -p ${OPENEXR_INSTALL_DIR} && true
 mkdir -p ${OPENEXR_BUILD_DIR} && true
 
 pushd ${OPENEXR_SOURCE_DIR}
-git checkout ${OPENEXR_BRANCH} --force
+git checkout ${OPENEXR_VERSION} --force
 
-if [[ ${OPENEXR_BRANCH} == "v2.2.0" ]] || [[ ${OPENEXR_BRANCH} == "v2.2.1" ]] ; then
-    mkdir -p ${OPENEXR_BUILD_DIR}/IlmBase && true
-    mkdir -p ${OPENEXR_BUILD_DIR}/OpenEXR && true
-    cd ${OPENEXR_BUILD_DIR}/IlmBase
-    cmake --config ${OPENEXR_BUILD_TYPE} ${OPENEXR_GENERATOR_CMD} \
-            -DCMAKE_INSTALL_PREFIX="${OPENEXR_INSTALL_DIR}" \
-            -DCMAKE_CXX_FLAGS="${OPENEXR_CXX_FLAGS}" \
-            ${OPENEXR_CMAKE_FLAGS} ${OPENEXR_SOURCE_DIR}/IlmBase
-    time cmake --build . --target install --config ${OPENEXR_BUILD_TYPE}
-    cd ${OPENEXR_BUILD_DIR}/OpenEXR
-    cmake --config ${OPENEXR_BUILD_TYPE} ${OPENEXR_GENERATOR_CMD} \
-            -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}\;${OPENEXR_INSTALL_DIR}" \
-            -DCMAKE_INSTALL_PREFIX="${OPENEXR_INSTALL_DIR}" \
-            -DILMBASE_PACKAGE_PREFIX="${OPENEXR_INSTALL_DIR}" \
-            -DBUILD_UTILS=0 -DBUILD_TESTS=0 \
-            -DCMAKE_CXX_FLAGS="${OPENEXR_CXX_FLAGS}" \
-            ${OPENEXR_CMAKE_FLAGS} ${OPENEXR_SOURCE_DIR}/OpenEXR
-    time cmake --build . --target install --config ${OPENEXR_BUILD_TYPE}
-elif [[ ${OPENEXR_BRANCH} == "v2.3.0" ]] ; then
+if [[ ${OPENEXR_VERSION} == "v2.3.0" ]] ; then
     # Simplified setup for 2.3+
     cd ${OPENEXR_BUILD_DIR}
-    cmake --config ${OPENEXR_BUILD_TYPE} -G "$CMAKE_GENERATOR" \
+    cmake -DCMAKE_BUILD_TYPE=${OPENEXR_BUILD_TYPE} \
             -DCMAKE_INSTALL_PREFIX="${OPENEXR_INSTALL_DIR}" \
             -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
             -DILMBASE_PACKAGE_PREFIX="${OPENEXR_INSTALL_DIR}" \
@@ -78,7 +53,7 @@ elif [[ ${OPENEXR_BRANCH} == "v2.3.0" ]] ; then
 else
     # Simplified setup for 2.4+
     cd ${OPENEXR_BUILD_DIR}
-    cmake --config ${OPENEXR_BUILD_TYPE} -G "$CMAKE_GENERATOR" \
+    cmake -DCMAKE_BUILD_TYPE=${OPENEXR_BUILD_TYPE} \
             -DCMAKE_INSTALL_PREFIX="${OPENEXR_INSTALL_DIR}" \
             -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
             -DILMBASE_PACKAGE_PREFIX="${OPENEXR_INSTALL_DIR}" \
@@ -86,6 +61,8 @@ else
             -DBUILD_TESTING=0 \
             -DPYILMBASE_ENABLE=0 \
             -DOPENEXR_VIEWERS_ENABLE=0 \
+            -DINSTALL_OPENEXR_EXAMPLES=0 \
+            -DOPENEXR_INSTALL_EXAMPLES=0 \
             -DCMAKE_INSTALL_LIBDIR=lib \
             -DCMAKE_CXX_FLAGS="${OPENEXR_CXX_FLAGS}" \
             ${OPENEXR_CMAKE_FLAGS} ${OPENEXR_SOURCE_DIR}

src/build-scripts/build_pugixml.bash

@@ -4,22 +4,22 @@
 #
 # Copyright Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/imageworks/OpenShadingLanguage
+# https://github.com/OpenImageIO/oiio
 
 # Exit the whole script if any command fails.
 set -ex
 
 # Repo and branch/tag/commit of pugixml to download if we don't have it yet
 PUGIXML_REPO=${PUGIXML_REPO:=https://github.com/zeux/pugixml.git}
-PUGIXML_VERSION=${PUGIXML_VERSION:=1.10}
-PUGIXML_BRANCH=${PUGIXML_BRANCH:=v${PUGIXML_VERSION}}
+PUGIXML_VERSION=${PUGIXML_VERSION:=v1.11.4}
 
 # Where to put pugixml repo source (default to the ext area)
 PUGIXML_SRC_DIR=${PUGIXML_SRC_DIR:=${PWD}/ext/pugixml}
 # Temp build area (default to a build/ subdir under source)
 PUGIXML_BUILD_DIR=${PUGIXML_BUILD_DIR:=${PUGIXML_SRC_DIR}/build}
 # Install area for pugixml (default to ext/dist)
-PUGIXML_INSTALL_DIR=${PUGIXML_INSTALL_DIR:=${PWD}/ext/dist}
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+PUGIXML_INSTALL_DIR=${PUGIXML_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 #PUGIXML_BUILD_OPTS=${PUGIXML_BUILD_OPTS:=}
 
 pwd
@@ -34,19 +34,23 @@ if [[ ! -e ${PUGIXML_SRC_DIR} ]] ; then
     git clone ${PUGIXML_REPO} ${PUGIXML_SRC_DIR}
 fi
 cd ${PUGIXML_SRC_DIR}
-echo "git checkout ${PUGIXML_BRANCH} --force"
-git checkout ${PUGIXML_BRANCH} --force
+
+echo "git checkout ${PUGIXML_VERSION} --force"
+git checkout ${PUGIXML_VERSION} --force
 
 mkdir -p ${PUGIXML_BUILD_DIR}
 cd ${PUGIXML_BUILD_DIR}
-time cmake --config Release \
-           -DCMAKE_BUILD_TYPE=Release \
-           -DCMAKE_INSTALL_PREFIX=${PUGIXML_INSTALL_DIR} \
-           -DBUILD_TESTS=OFF \
-           ${PUGIXML_BUILD_OPTS} ..
-time cmake --build . --config Release --target install
 
-ls -R ${PUGIXML_INSTALL_DIR}
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=${PUGIXML_INSTALL_DIR} \
+               -DBUILD_SHARED_LIBS=ON \
+               -DBUILD_TESTS=OFF \
+               ${PUGIXML_BUILD_OPTS} ..
+    time cmake --build . --config Release --target install
+fi
+
+# ls -R ${PUGIXML_INSTALL_DIR}
 popd
 
 #echo "listing .."
@@ -55,4 +59,4 @@ popd
 # Set up paths. These will only affect the caller if this script is
 # run with 'source' rather than in a separate shell.
 export pugixml_ROOT=$PUGIXML_INSTALL_DIR
-
+export LD_LIBRARY_PATH=$pugixml_ROOT/lib:$pugixml_ROOT/lib64:$LD_LIBRARY_PATH

src/build-scripts/build_pybind11.bash

@@ -7,8 +7,7 @@ set -ex
 
 # Repo and branch/tag/commit of pybind11 to download if we don't have it yet
 PYBIND11_REPO=${PYBIND11_REPO:=https://github.com/pybind/pybind11.git}
-PYBIND11_VERSION=${PYBIND11_VERSION:=2.4.3}
-PYBIND11_BRANCH=${PYBIND11_BRANCH:=v${PYBIND11_VERSION}}
+PYBIND11_VERSION=${PYBIND11_VERSION:=v2.8.1}
 
 # Where to put pybind11 repo source (default to the ext area)
 PYBIND11_SRC_DIR=${PYBIND11_SRC_DIR:=${PWD}/ext/pybind11}
@@ -35,18 +34,22 @@ if [[ ! -e ${PYBIND11_SRC_DIR} ]] ; then
     git clone ${PYBIND11_REPO} ${PYBIND11_SRC_DIR}
 fi
 cd ${PYBIND11_SRC_DIR}
-echo "git checkout ${PYBIND11_BRANCH} --force"
-git checkout ${PYBIND11_BRANCH} --force
+
+echo "git checkout ${PYBIND11_VERSION} --force"
+git checkout ${PYBIND11_VERSION} --force
 
 mkdir -p ${PYBIND11_BUILD_DIR}
 cd ${PYBIND11_BUILD_DIR}
-time cmake --config Release \
-           -DCMAKE_INSTALL_PREFIX=${PYBIND11_INSTALL_DIR} \
-           -DPYBIND11_TEST=OFF \
-           ${PYBIND11_BUILD_OPTS} ..
-time cmake --build . --config Release --target install
 
-ls -R ${PYBIND11_INSTALL_DIR}
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=${PYBIND11_INSTALL_DIR} \
+               -DPYBIND11_TEST=OFF \
+               ${PYBIND11_BUILD_OPTS} ..
+    time cmake --build . --config Release --target install
+fi
+
+# ls -R ${PYBIND11_INSTALL_DIR}
 popd
 
 #echo "listing .."

src/build-scripts/build_webp.bash

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+# Utility script to download and build webp
+#
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Exit the whole script if any command fails.
+set -ex
+
+# Repo and branch/tag/commit of webp to download if we don't have it yet
+WEBP_REPO=${WEBP_REPO:=https://github.com/webmproject/libwebp.git}
+WEBP_VERSION=${WEBP_VERSION:=v1.1.0}
+
+# Where to put webp repo source (default to the ext area)
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+WEBP_SRC_DIR=${WEBP_SRC_DIR:=${LOCAL_DEPS_DIR}/webp}
+WEBP_BUILD_DIR=${WEBP_BUILD_DIR:=${WEBP_SRC_DIR}/build}
+WEBP_INSTALL_DIR=${WEBP_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
+WEBP_BUILD_TYPE=${WEBP_BUILD_TYPE:=${CMAKE_BUILD_TYPE:-Release}}
+#WEBP_CONFIG_OPTS=${WEBP_CONFIG_OPTS:=}
+
+pwd
+echo "webp install dir will be: ${WEBP_INSTALL_DIR}"
+
+mkdir -p ./ext
+pushd ./ext
+
+# Clone webp project from GitHub and build
+if [[ ! -e ${WEBP_SRC_DIR} ]] ; then
+    echo "git clone ${WEBP_REPO} ${WEBP_SRC_DIR}"
+    git clone ${WEBP_REPO} ${WEBP_SRC_DIR}
+fi
+cd ${WEBP_SRC_DIR}
+
+echo "git checkout ${WEBP_VERSION} --force"
+git checkout ${WEBP_VERSION} --force
+
+mkdir -p ${WEBP_BUILD_DIR}
+cd ${WEBP_BUILD_DIR}
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=${WEBP_BUILD_TYPE} \
+               -DCMAKE_INSTALL_PREFIX=${WEBP_INSTALL_DIR} \
+               -DWEBP_BUILD_ANIM_UTILS=OFF \
+               -DWEBP_BUILD_CWEBP=OFF \
+               -DWEBP_BUILD_DWEBP=OFF \
+               -DWEBP_BUILD_VWEBP=OFF \
+               -DWEBP_BUILD_GIF2WEBPx=OFF \
+               -DWEBP_BUILD_IMG2WEBP=OFF \
+               -DWEBP_BUILD_EXTRAS=OFF \
+               -DBUILD_SHARED_LIBS=ON \
+               ${WEBP_CONFIG_OPTS} ..
+    time cmake --build . --target install
+fi
+
+
+# ls -R ${WEBP_INSTALL_DIR}
+popd
+
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export WebP_ROOT=$WEBP_INSTALL_DIR
+

src/build-scripts/build_zlib.bash

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+# Utility script to download and build zlib
+#
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Exit the whole script if any command fails.
+set -ex
+
+# Repo and branch/tag/commit of zlib to download if we don't have it yet
+ZLIB_REPO=${ZLIB_REPO:=https://github.com/madler/zlib.git}
+ZLIB_VERSION=${ZLIB_VERSION:=v1.2.11}
+
+# Where to put zlib repo source (default to the ext area)
+ZLIB_SRC_DIR=${ZLIB_SRC_DIR:=${PWD}/ext/zlib}
+# Temp build area (default to a build/ subdir under source)
+ZLIB_BUILD_DIR=${ZLIB_BUILD_DIR:=${ZLIB_SRC_DIR}/build}
+# Install area for zlib (default to ext/dist)
+ZLIB_INSTALL_DIR=${ZLIB_INSTALL_DIR:=${PWD}/ext/dist}
+#ZLIB_CONFIG_OPTS=${ZLIB_CONFIG_OPTS:=}
+
+pwd
+echo "zlib install dir will be: ${ZLIB_INSTALL_DIR}"
+
+mkdir -p ./ext
+pushd ./ext
+
+# Clone zlib project from GitHub and build
+if [[ ! -e ${ZLIB_SRC_DIR} ]] ; then
+    echo "git clone ${ZLIB_REPO} ${ZLIB_SRC_DIR}"
+    git clone ${ZLIB_REPO} ${ZLIB_SRC_DIR}
+fi
+cd ${ZLIB_SRC_DIR}
+
+echo "git checkout ${ZLIB_VERSION} --force"
+git checkout ${ZLIB_VERSION} --force
+
+mkdir -p ${ZLIB_BUILD_DIR} && true
+cd ${ZLIB_BUILD_DIR}
+
+
+if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
+    time cmake -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=${ZLIB_INSTALL_DIR} \
+               ${ZLIB_CONFIG_OPTS} ..
+    time cmake --build . --config Release --target install
+fi
+
+# ls -R ${ZLIB_INSTALL_DIR}
+popd
+
+
+# Set up paths. These will only affect the caller if this script is
+# run with 'source' rather than in a separate shell.
+export ZLIB_ROOT=$ZLIB_INSTALL_DIR
+

src/build-scripts/ci-build.bash

@@ -4,30 +4,16 @@
 # any command in it fails. This is crucial for CI tests.
 set -ex
 
-# This script is run when CI system first starts up.
-# It expects that ci-setenv.bash was run first, so $PLATFORM and $ARCH
-# have been set.
-
-if [[ -e src/build-scripts/ci-setenv.bash ]] ; then
-    source src/build-scripts/ci-setenv.bash
-fi
-
-if [[ ! -e build/$PLATFORM ]] ; then
-    mkdir -p build/$PLATFORM
-fi
-if [[ ! -e dist/$PLATFORM ]] ; then
-    mkdir -p dist/$PLATFORM
-fi
-
 if [[ "$USE_SIMD" != "" ]] ; then
     MY_CMAKE_FLAGS="$MY_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
 fi
-if [[ "$DEBUG" == "1" ]] ; then
-    export CMAKE_BUILD_TYPE=Debug
+
+if [[ -n "$FMT_VERSION" ]] ; then
+    MY_CMAKE_FLAGS="$MY_CMAKE_FLAGS -DBUILD_FMT_VERSION=$FMT_VERSION"
 fi
 
-pushd build/$PLATFORM
-cmake ../.. -G "$CMAKE_GENERATOR" \
+pushd build
+cmake .. -G "$CMAKE_GENERATOR" \
         -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
         -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" \
         -DCMAKE_INSTALL_PREFIX="$OpenImageIO_ROOT" \
@@ -40,17 +26,13 @@ if [[ "$BUILDTARGET" != "none" ]] ; then
     time cmake --build . --target ${BUILDTARGET:=install} --config ${CMAKE_BUILD_TYPE}
 fi
 popd
-#make $MAKEFLAGS VERBOSE=1 $BUILD_FLAGS config
-#make $MAKEFLAGS $PAR_MAKEFLAGS $BUILD_FLAGS $BUILDTARGET
 
-#echo "OpenImageIO_ROOT $OpenImageIO_ROOT"
-#ls -R -l "$OpenImageIO_ROOT"
-
-if [[ "${SKIP_TESTS:=0}" == "0" ]] ; then
-    $OpenImageIO_ROOT/bin/oiiotool --help || true
-    TESTSUITE_CLEANUP_ON_SUCCESS=1
-    echo "Parallel test " ${CTEST_PARALLEL_LEVEL}
-    make $BUILD_FLAGS test
+if [[ "${DEBUG_CI:=0}" != "0" ]] ; then
+    echo "PATH=$PATH"
+    echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+    echo "PYTHONPATH=$PYTHONPATH"
+    echo "ldd oiiotool"
+    ldd $OpenImageIO_ROOT/bin/oiiotool
 fi
 
 if [[ "$BUILDTARGET" == clang-format ]] ; then
@@ -61,7 +43,3 @@ if [[ "$BUILDTARGET" == clang-format ]] ; then
         exit 1
     fi
 fi
-
-# if [[ "$CODECOV" == 1 ]] ; then
-#     bash <(curl -s https://codecov.io/bash)
-# fi

src/build-scripts/ci-startup.bash

@@ -4,31 +4,17 @@
 # Since it sets many env variables needed by the caller, it should be run
 # with 'source', not in a separate shell.
 
-# Figure out the platform
-if [[ $TRAVIS_OS_NAME == osx || $RUNNER_OS == macOS ]] ; then
-      export ARCH=macosx
-elif [[ `uname -m` == aarch64 ]] ; then
-    export ARCH=aarch64
-elif [[ $TRAVIS_OS_NAME == linux || $RUNNER_OS == Linux || $CIRCLECI == true ]] ; then
-      export ARCH=linux64
-elif [[ $RUNNER_OS == Windows ]] ; then
-      export ARCH=windows64
-else
-    export ARCH=unknown
-fi
-export PLATFORM=$ARCH
-
-if [[ "$DEBUG" == 1 ]] ; then
-    export PLATFORM=${PLATFORM}.debug
-fi
-
-echo "Architecture is $ARCH"
-echo "Build platform name is $PLATFORM"
-
 # Environment variables we always need
+export PATH=/usr/local/bin/_ccache:/usr/lib/ccache:$PATH
 export USE_CCACHE=${USE_CCACHE:=1}
-export CCACHE_CPP2=1
-export OpenImageIO_ROOT=$PWD/dist/$PLATFORM
+export CCACHE_CPP2=
+export CCACHE_DIR=/tmp/ccache
+if [[ "${RUNNER_OS}" == "macOS" ]] ; then
+    export CCACHE_DIR=$HOME/.ccache
+fi
+mkdir -p $CCACHE_DIR
+
+export OpenImageIO_ROOT=$PWD/dist
 export DYLD_LIBRARY_PATH=$OpenImageIO_ROOT/lib:$DYLD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$OpenImageIO_ROOT/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$OpenImageIO_ROOT/lib64:$LD_LIBRARY_PATH
@@ -41,31 +27,31 @@ export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages:$P
 export BUILD_MISSING_DEPS=${BUILD_MISSING_DEPS:=1}
 export COMPILER=${COMPILER:=gcc}
 export CXX=${CXX:=g++}
-export CI=true
+export OpenImageIO_CI=true
 export USE_NINJA=${USE_NINJA:=1}
 export CMAKE_GENERATOR=${CMAKE_GENERATOR:=Ninja}
 export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:=Release}
 export CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD:=11}
 
-if [[ $TRAVIS == true && "$ARCH" == aarch64 ]] ; then
-    export PARALLEL=4
-elif [[ $TRAVIS == true ]] ; then
-    export PARALLEL=2
-elif [[ $CIRCLECI == true ]] ; then
-    export PARALLEL=4
-elif [[ $GITHUB_ACTIONS == true ]] ; then
-    export PARALLEL=4
-fi
 export PARALLEL=${PARALLEL:=4}
 export PAR_MAKEFLAGS=-j${PARALLEL}
 export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:=${PARALLEL}}
 export CTEST_PARALLEL_LEVEL=${CTEST_PARALLEL_LEVEL:=${PARALLEL}}
 
 export LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=$HOME/ext}
-export PATH=${LOCAL_DEPS_DIR}/bin:$PATH
-export LD_LIBRARY_PATH=${LOCAL_DEPS_DIR}/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=${LOCAL_DEPS_DIR}/lib:$DYLD_LIBRARY_PATH
+export PATH=${LOCAL_DEPS_DIR}/dist/bin:$PATH
+export LD_LIBRARY_PATH=${LOCAL_DEPS_DIR}/dist/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${LOCAL_DEPS_DIR}/dist/lib64:$LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=${LOCAL_DEPS_DIR}/dist/lib:$DYLD_LIBRARY_PATH
 
+export OCIO="$PWD/testsuite/common/OpenColorIO/nuke-default/config.ocio"
+export TESTSUITE_CLEANUP_ON_SUCCESS=${TESTSUITE_CLEANUP_ON_SUCCESS:=1}
+
+mkdir -p build dist
+
+echo "HOME = $HOME"
+echo "PWD = $PWD"
+echo "LOCAL_DEPS_DIR = $LOCAL_DEPS_DIR"
 echo "uname -a: " `uname -a`
 echo "uname -m: " `uname -m`
 echo "uname -s: " `uname -s`
@@ -76,6 +62,9 @@ env | sort
 
 if [[ `uname -s` == "Linux" ]] ; then
     head -40 /proc/cpuinfo
-elif [[ $ARCH == macosx ]] ; then
+elif [[ "${RUNNER_OS}" == "macOS" ]] ; then
     sysctl machdep.cpu.features
 fi
+
+# Save the env for use by other stages
+src/build-scripts/save-env.bash

src/build-scripts/ci-test.bash

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# 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
+
+$OpenImageIO_ROOT/bin/oiiotool --help || true
+
+echo "Parallel test " ${CTEST_PARALLEL_LEVEL}
+pushd build
+time ctest -C ${CMAKE_BUILD_TYPE} -E broken --force-new-ctest-process \
+    --output-on-failure --timeout ${CTEST_TEST_TIMEOUT:=180} ${CTEST_ARGS}
+popd
+
+
+# if [[ "$CODECOV" == 1 ]] ; then
+#     bash <(curl -s https://codecov.io/bash)
+# fi

src/build-scripts/gh-installdeps-centos.bash

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-#
-
-set -ex
-
-echo "Which g++ " `which g++`
-g++ --version && true
-ls /usr/bin/g++* && true
-/usr/bin/g++ --version && true
-
-export PATH=/opt/rh/devtoolset-6/root/usr/bin:/usr/local/bin:$PATH
-#ls /opt/rh/devtoolset-6/root/usr/bin && true
-#ls /usr/local/bin
-
-ls /etc/yum.repos.d
-
-sudo yum install -y giflib giflib-devel && true
-sudo yum install -y opencv opencv-devel && true
-sudo yum install -y Field3D Field3D-devel && true
-
-#sudo rpm -v --import http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro && true
-#sudo rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm && true
-sudo yum install -y ffmpeg ffmpeg-devel && true
-
-
-
-if [[ "$CXX" == "clang++" ]] ; then
-    source src/build-scripts/build_llvm.bash
-fi
-
-
-src/build-scripts/install_test_images.bash
-
-source src/build-scripts/build_pybind11.bash
-
-if [[ "$OPENEXR_BRANCH" || "$OPENEXR_VERSION" ]] ; then
-    source src/build-scripts/build_openexr.bash
-fi
-
-if [[ "$LIBTIFF_BRANCH" || "$LIBTIFF_VERSION" ]] ; then
-    source src/build-scripts/build_libtiff.bash
-fi
-
-if [[ "$OCIO_BRANCH" || "$OCIO_VERSION" ]] ; then
-    # Temporary (?) fix: GH ninja having problems, fall back to make
-    CMAKE_GENERATOR="Unix Makefiles" \
-    source src/build-scripts/build_ocio.bash
-fi

src/build-scripts/gh-installdeps.bash

@@ -3,96 +3,136 @@
 
 set -ex
 
-#dpkg --list
 
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-time sudo apt-get update
+#
+# Install system packages when those are acceptable for dependencies.
+#
+if [[ "$ASWF_ORG" != ""  ]] ; then
+    # Using ASWF CentOS container
 
-time sudo apt-get -q install -y \
-    git \
-    cmake \
-    ninja-build \
-    g++ \
-    ccache \
-    libboost-dev libboost-thread-dev \
-    libboost-filesystem-dev libboost-regex-dev \
-    libtiff-dev \
-    libilmbase-dev libopenexr-dev \
-    python-dev python-numpy \
-    libgif-dev \
-    libpng-dev \
-    libraw-dev \
-    libwebp-dev \
-    libfreetype6-dev \
-    libavcodec-dev libavformat-dev libswscale-dev libavutil-dev \
-    locales \
-    libopencolorio-dev \
-    wget \
-    libtbb-dev \
-    libopenvdb-dev \
-    libopencv-dev \
-    ptex-base \
-    dcmtk \
-    libsquish-dev \
-    qt5-default \
-    libhdf5-dev
+    export PATH=/opt/rh/devtoolset-6/root/usr/bin:/usr/local/bin:$PATH
 
-# Disable libheif on CI for now... seems to make crashes in CI tests.
-# Works fine for me in real life. Investigate.
-#if [[ "$USE_LIBHEIF" != "0" ]] ; then
-#    sudo add-apt-repository ppa:strukturag/libde265
-#    sudo add-apt-repository ppa:strukturag/libheif
-#    time sudo apt-get -q install -y libheif-dev
-#fi
+    #ls /etc/yum.repos.d
 
-export CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu:$CMAKE_PREFIX_PATH
+    sudo yum install -y giflib giflib-devel && true
+    sudo yum install -y opencv opencv-devel && true
+    sudo yum install -y ffmpeg ffmpeg-devel && true
+    if [[ "${EXTRA_DEP_PACKAGES}" != "" ]] ; then
+        time sudo yum install -y ${EXTRA_DEP_PACKAGES}
+    fi
+else
+    # Using native Ubuntu runner
+
+    sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+    time sudo apt-get update
+
+    time sudo apt-get -q install -y \
+        git cmake ninja-build ccache g++ \
+        libboost-dev libboost-thread-dev libboost-filesystem-dev \
+        libilmbase-dev libopenexr-dev \
+        libtbb-dev \
+        libtiff-dev libgif-dev libpng-dev libraw-dev libwebp-dev \
+        libavcodec-dev libavformat-dev libswscale-dev libavutil-dev \
+        dcmtk libsquish-dev libopenvdb-dev \
+        libfreetype6-dev \
+        locales wget \
+        libopencolorio-dev \
+        libopencv-dev \
+        qt5-default \
+        libhdf5-dev
+    if [[ "${EXTRA_DEP_PACKAGES}" != "" ]] ; then
+        time sudo apt-get -q install -y ${EXTRA_DEP_PACKAGES}
+    fi
+
+    # Nonstandard python versions
+    if [[ "${PYTHON_VERSION}" == "3.9" ]] ; then
+        time sudo apt-get -q install -y python3.9-dev python3-numpy
+        pip3 --version
+        pip3 install numpy
+    elif [[ "$PYTHON_VERSION" == "2.7" ]] ; then
+        time sudo apt-get -q install -y python-dev python-numpy
+    else
+        pip3 install numpy
+    fi
+
+    if [[ "$USE_LIBHEIF" != "0" ]] ; then
+       sudo add-apt-repository ppa:strukturag/libde265
+       sudo add-apt-repository ppa:strukturag/libheif
+       time sudo apt-get -q install -y libheif-dev
+    fi
+
+    export CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu:$CMAKE_PREFIX_PATH
+
+    if [[ "$CXX" == "g++-6" ]] ; then
+        time sudo apt-get install -y g++-6
+    elif [[ "$CXX" == "g++-7" ]] ; then
+        time sudo apt-get install -y g++-7
+    elif [[ "$CXX" == "g++-8" ]] ; then
+        time sudo apt-get install -y g++-8
+    elif [[ "$CXX" == "g++-9" ]] ; then
+        time sudo apt-get install -y g++-9
+    elif [[ "$CXX" == "g++-10" ]] ; then
+        time sudo apt-get install -y g++-10
+    elif [[ "$CXX" == "g++-11" ]] ; then
+        time sudo apt-get install -y g++-11
+    fi
 
-if [[ "$CXX" == "g++-4.8" ]] ; then
-    time sudo apt-get install -y g++-4.8
-elif [[ "$CXX" == "g++-6" ]] ; then
-    time sudo apt-get install -y g++-6
-elif [[ "$CXX" == "g++-7" ]] ; then
-    time sudo apt-get install -y g++-7
-elif [[ "$CXX" == "g++-8" ]] ; then
-    time sudo apt-get install -y g++-8
-elif [[ "$CXX" == "g++-9" ]] ; then
-    time sudo apt-get install -y g++-9
-elif [[ "$CXX" == "g++-10" ]] ; then
-    time sudo apt-get install -y g++-10
 fi
 
-# time sudo apt-get install -y clang
-# time sudo apt-get install -y llvm
-#time sudo apt-get install -y libopenjpeg-dev
-#time sudo apt-get install -y libjpeg-turbo8-dev
-echo "Which python3 " `which python3`
-python3 --version && true
+cmake --version
 
-#dpkg --list
 
-if [[ "$CXX" == "clang++" ]] ; then
+#
+# If we're using clang to compile on native Ubuntu, we need to install it.
+# If on an ASWF CentOS docker container, it already is installed.
+#
+if [[ "$CXX" == "clang++" && "$ASWF_ORG" == "" ]] ; then
     source src/build-scripts/build_llvm.bash
 fi
 
 
+
+#
+# Packages we need to build from scratch.
+#
+
+source src/build-scripts/build_pybind11.bash
+
+if [[ "$OPENEXR_VERSION" != "" ]] ; then
+    source src/build-scripts/build_openexr.bash
+fi
+
+if [[ "$WEBP_VERSION" != "" ]] ; then
+    source src/build-scripts/build_webp.bash
+fi
+
+if [[ "$LIBTIFF_VERSION" != "" ]] ; then
+    source src/build-scripts/build_libtiff.bash
+fi
+
+if [[ "$LIBRAW_VERSION" != "" ]] ; then
+    source src/build-scripts/build_libraw.bash
+fi
+
+if [[ "$OPENJPEG_VERSION" != "" ]] ; then
+    source src/build-scripts/build_OpenJPEG.bash
+fi
+
+if [[ "$PUGIXML_VERSION" != "" ]] ; then
+    source src/build-scripts/build_pugixml.bash
+    export MY_CMAKE_FLAGS+=" -DUSE_EXTERNAL_PUGIXML=1 "
+fi
+
+if [[ "$OPENCOLORIO_VERSION" != "" ]] ; then
+    source src/build-scripts/build_opencolorio.bash
+fi
+
+if [[ "$PTEX_VERSION" != "" ]] ; then
+    source src/build-scripts/build_Ptex.bash
+fi
+
 src/build-scripts/install_test_images.bash
 
-CXX="ccache $CXX" source src/build-scripts/build_pybind11.bash
 
-if [[ "$OPENEXR_BRANCH" || "$OPENEXR_VERSION" ]] ; then
-    CXX="ccache $CXX" source src/build-scripts/build_openexr.bash
-fi
-
-if [[ "$LIBTIFF_BRANCH" || "$LIBTIFF_VERSION" ]] ; then
-    CXX="ccache $CXX" source src/build-scripts/build_libtiff.bash
-fi
-
-if [[ "$LIBRAW_BRANCH" || "$LIBRAW_VERSION" ]] ; then
-    CXX="ccache $CXX" source src/build-scripts/build_libraw.bash
-fi
-
-if [[ "$OCIO_BRANCH" || "$OCIO_VERSION" ]] ; then
-    # Temporary (?) fix: GH ninja having problems, fall back to make
-    CMAKE_GENERATOR="Unix Makefiles" \
-    source src/build-scripts/build_ocio.bash
-fi
+# Save the env for use by other stages
+src/build-scripts/save-env.bash

src/build-scripts/gh-win-installdeps.bash

@@ -2,95 +2,127 @@
 
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
-
-if [[ ! -e build/$PLATFORM ]] ; then
-    mkdir -p build/$PLATFORM
-fi
-if [[ ! -e dist/$PLATFORM ]] ; then
-    mkdir -p dist/$PLATFORM
-fi
+# https://github.com/OpenImageIO/oiio
 
 # DEP_DIR="$PWD/ext/dist"
 DEP_DIR="$PWD/dist/$PLATFORM"
 mkdir -p "$DEP_DIR"
+mkdir -p ext && true
 INT_DIR="build/$PLATFORM"
 VCPKG_INSTALLATION_ROOT=/c/vcpkg
 
 export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:=.}
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$DEP_DIR"
-export BOOST_ROOT=${BOOST_ROOT_1_72_0}
-export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$BOOST_ROOT"
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
-export PATH="$PATH:$DEP_DIR/bin:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin:/bin"
+export PATH="$PATH:$DEP_DIR/bin:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin:/bin:$PWD/ext/dist/bin:$PWD/ext/dist/lib"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
 
 # export MY_CMAKE_FLAGS="$MY_CMAKE_FLAGS -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
 # export OPENEXR_CMAKE_FLAGS="$OPENEXR_CMAKE_FLAGS -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
 
-ls -l "C:/Program Files (x86)/Microsoft Visual Studio/*/Enterprise/VC/Tools/MSVC" && true
-ls -l "C:/Program Files (x86)/Microsoft Visual Studio" && true
+#ls -l "C:/Program Files (x86)/Microsoft Visual Studio/*/Enterprise/VC/Tools/MSVC" && true
+#ls -l "C:/Program Files (x86)/Microsoft Visual Studio" && true
 
+
+if [[ "$PYTHON_VERSION" == "3.6" ]] ; then
+    export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.6.8/x64"
+else
+    export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.7.9/x64"
+    export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.7.9/x64/python.exe"
+    export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages
+fi
+pip install numpy
+
+
+########################################################################
+# Dependency method #1: Use vcpkg (disabled)
+#
+# Currently we are not using this, but here it is for reference:
+#
+echo "All pre-installed VCPkg installs:"
 vcpkg list
-vcpkg update
+echo "---------------"
+# vcpkg update
+# 
 
-# vcpkg install zlib:x64-windows
+time vcpkg install boost-asio:x64-windows
+time vcpkg install boost-container:x64-windows
+time vcpkg install boost-filesystem:x64-windows
+time vcpkg install boost-math:x64-windows
+time vcpkg install boost-stacktrace:x64-windows
+time vcpkg install boost-system:x64-windows
+time vcpkg install boost-thread:x64-windows
+
+# # vcpkg install zlib:x64-windows
 vcpkg install tiff:x64-windows
-vcpkg install libpng:x64-windows
-vcpkg install giflib:x64-windows
+# vcpkg install libpng:x64-windows
+# vcpkg install giflib:x64-windows
 vcpkg install freetype:x64-windows
-# vcpkg install openexr:x64-windows
-# vcpkg install libjpeg-turbo:x64-windows
-
-vcpkg install libraw:x64-windows
-vcpkg install openjpeg:x64-windows
-vcpkg install libsquish:x64-windows
-# vcpkg install ffmpeg:x64-windows   # takes FOREVER!
-# vcpkg install webp:x64-windows  # No such vcpkg package?a
-
-echo "$VCPKG_INSTALLATION_ROOT"
-ls "$VCPKG_INSTALLATION_ROOT"
-echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
-ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
-echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
-ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
-echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
-ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
-
+# # vcpkg install openexr:x64-windows
+vcpkg install libjpeg-turbo:x64-windows
+# 
+# vcpkg install libraw:x64-windows
+# vcpkg install openjpeg:x64-windows
+# vcpkg install libsquish:x64-windows
+# # vcpkg install ffmpeg:x64-windows   # takes FOREVER!
+# # vcpkg install webp:x64-windows  # No such vcpkg package?a
+# 
+# #echo "$VCPKG_INSTALLATION_ROOT"
+# #ls "$VCPKG_INSTALLATION_ROOT"
+# #echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
+# #ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
+# #echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
+# #ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
+# #echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
+# #ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
+# 
+# # export PATH="$PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
+# export PATH="$DEP_DIR/lib:$DEP_DIR/bin:$PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
+export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
+# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib:$DEP_DIR/lib:$DEP_DIR/bin"
+# 
 echo "All VCPkg installs:"
 vcpkg list
+#
+########################################################################
 
-# curl --location https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.1-win64-shared.zip -o ffmpeg-libs.zip
-# unzip ffmpeg-libs.zip
-curl --location https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2.1-win64-dev.zip -o ffmpeg-dev.zip
-unzip ffmpeg-dev.zip
-ls
-ls -R *ffmpeg*
-FFmpeg_ROOT=$PWD/ffmpeg-4.2.1-win64-dev
+
+########################################################################
+# Dependency method #2: Build from source ourselves
+#
+#
+
+# src/build-scripts/build_zlib.bash
+# export ZLIB_ROOT=$PWD/ext/dist
+
+# src/build-scripts/build_libpng.bash
+# export PNG_ROOT=$PWD/ext/dist
+
+# We're currently getting libtiff from vcpkg
+#src/build-scripts/build_libtiff.bash
+#export TIFF_ROOT=$PWD/ext/dist
+
+# We're currently getting jpeg from vcpkg
+# LIBJPEGTURBO_CONFIG_OPTS=-DWITH_SIMD=OFF
+# # ^^ because we're too lazy to build nasm
+# src/build-scripts/build_libjpeg-turbo.bash
+# export JPEGTurbo_ROOT=$PWD/ext/dist
+
+source src/build-scripts/build_pybind11.bash
+#export pybind11_ROOT=$PWD/ext/dist
+
+
+# curl --location https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2.1-win64-dev.zip -o ffmpeg-dev.zip
+# unzip ffmpeg-dev.zip
+# FFmpeg_ROOT=$PWD/ffmpeg-4.2.1-win64-dev
 
 echo "CMAKE_PREFIX_PATH = $CMAKE_PREFIX_PATH"
 
-mkdir ext
-
-# ZLib
-pushd ext
-git clone -b v1.2.11 https://github.com/madler/zlib.git
-cd zlib
-mkdir -p $INT_DIR
-cd $INT_DIR
-cmake ../.. -G "$CMAKE_GENERATOR" -DCMAKE_CONFIGURATION_TYPES="$CMAKE_BUILD_TYPE" -DCMAKE_PREFIX_PATH="$DEP_DIR" -DCMAKE_INSTALL_PREFIX="$DEP_DIR"
-cmake --build . --config $CMAKE_BUILD_TYPE --target install
-popd
-export MY_CMAKE_FLAGS="$MY_CMAKE_FLAGS -DZLIB_LIBRARY=$DEP_DIR/lib/zlib.lib"
-export OPENEXR_CMAKE_FLAGS="$OPENEXR_CMAKE_FLAGS -DZLIB_LIBRARY=$DEP_DIR/lib/zlib.lib"
-
-source src/build-scripts/build_pybind11.bash
 
 OPENEXR_CXX_FLAGS=" /W1 /EHsc /DWIN32=1 "
 #OPENEXR_BUILD_TYPE=$CMAKE_BUILD_TYPE
 OPENEXR_INSTALL_DIR=$DEP_DIR
-OPENEXR_BRANCH=v2.4.0
 source src/build-scripts/build_openexr.bash
 export PATH="$OPENEXR_INSTALL_DIR/bin:$OPENEXR_INSTALL_DIR/lib:$PATH"
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PATH
@@ -102,22 +134,13 @@ echo "DEP_DIR $DEP_DIR :"
 ls -R -l "$DEP_DIR"
 
 
-# export PATH="$PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
-export PATH="$DEP_DIR/lib:$DEP_DIR/bin:$PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib:$DEP_DIR/lib:$DEP_DIR/bin"
-
 src/build-scripts/install_test_images.bash
 
-ls /c/hostedtoolcache/windows/Python
-echo "/c/hostedtoolcache/windows/Python/3.6.8/x64"
-ls /c/hostedtoolcache/windows/Python/3.6.8/x64
-
 
 # source src/build-scripts/build_openexr.bash
 # export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$ILMBASE_ROOT;$OPENEXR_ROOT"
-# source src/build-scripts/build_ocio.bash
+# source src/build-scripts/build_opencolorio.bash
 
 
-if [[ "$PYTHON_VERSION" == "3.6" ]] ; then
-    export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.6.8/x64"
-fi
+# Save the env for use by other stages
+src/build-scripts/save-env.bash

src/build-scripts/install_homebrew_deps.bash

@@ -16,62 +16,47 @@ if [[ `which brew` == "" ]] ; then
 fi
 
 
-brew update >/dev/null
+#brew update >/dev/null
 echo ""
 echo "Before my brew installs:"
 brew list --versions
 
-if [[ "$BUILDTARGET" == "clang-format" ]] ; then
-    # If we are running for the sake of clang-format only, just install the
-    # bare minimum packages and return.
-    brew install --display-times ilmbase openexr llvm clang-format libtiff libpng boost ninja giflib
-    brew install --display-times python pybind11 && true
-    brew upgrade --display-times python && true
-    brew link --overwrite python
-    brew upgrade --display-times cmake && true
-else
-    # All cases except for clang-format target, we need the dependencies.
-    brew install --display-times gcc ccache cmake ninja boost && true
-    brew link --overwrite gcc
-    brew install --display-times python && true
-    brew upgrade --display-times python && true
-    brew link --overwrite python
-    brew upgrade --display-times cmake && true
-    brew install --display-times libtiff ilmbase openexr opencolorio
-    brew install --display-times libpng giflib webp jpeg-turbo openjpeg
-    brew install --display-times freetype libraw dcmtk pybind11 numpy && true
-    brew install --display-times ffmpeg libheif libsquish
-    brew install --display-times openvdb tbb
-    brew install --display-times opencv qt ptex
-    brew install --display-times field3d && true
-fi
-
-if [[ "$LINKSTATIC" == "1" ]] ; then
-    brew install --display-times little-cms2 tinyxml szip
-    brew install --display-times homebrew/dupes/bzip2
-    brew install --display-times yaml-cpp --with-static-lib
-fi
-if [[ "$CLANG_TIDY" != "" ]] ; then
-    # If we are running for the sake of clang-tidy only, we will need
-    # a modern clang version not just the xcode one.
-    brew install --display-times llvm
-fi
+# All cases except for clang-format target, we need the dependencies.
+brew install --display-times -q gcc ccache cmake ninja boost || true
+brew link --overwrite gcc
+brew unlink python@2.7 || true
+brew unlink python@3.9 || true
+brew unlink python@3.8 || true
+brew link --overwrite --force python@${PYTHON_VERSION} || true
+#brew upgrade --display-times -q cmake || true
+#brew install --display-times -q libtiff
+brew install --display-times -q imath openexr opencolorio
+#brew install --display-times -q libpng giflib webp
+brew install --display-times -q jpeg-turbo openjpeg
+brew install --display-times -q freetype libraw dcmtk pybind11 numpy || true
+brew install --display-times -q ffmpeg libheif libsquish ptex || true
+brew install --display-times -q tbb || true
+brew install --display-times -q openvdb || true
+brew install --display-times -q opencv || true
+brew install --display-times -q qt@5
 
 echo ""
 echo "After brew installs:"
 brew list --versions
 
 # Needed on some systems
-pip install numpy
+if [[ $PYTHON_VERSION != "2.7" ]] ; then
+    pip3 install numpy
+else
+    pip install numpy
+fi
 
 # Set up paths. These will only affect the caller if this script is
 # run with 'source' rather than in a separate shell.
-export PATH=/usr/local/opt/qt5/bin:$PATH ;
-export PATH=/usr/local/opt/python/libexec/bin:$PATH ;
-export PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH ;
-export PATH=/usr/local/opt/llvm/bin:$PATH ;
+export PATH=/usr/local/opt/qt5/bin:$PATH
+export PATH=/usr/local/opt/python/libexec/bin:$PATH
+export PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
+#export PATH=/usr/local/opt/llvm/bin:$PATH
 
-# If field3d and hdf5 get even slightly out of sync, hdf5 will throw fits.
-# This is unnecessary, so we disable the step to make CI more likely to
-# pass in cases where they don't exactly match on the Travis/GH instances.
-export HDF5_DISABLE_VERSION_CHECK=1
+# Save the env for use by other stages
+src/build-scripts/save-env.bash

src/build-scripts/install_test_images.bash

@@ -4,11 +4,17 @@ if [[ ! -e ../oiio-images ]] ; then
     git clone https://github.com/OpenImageIO/oiio-images.git ../oiio-images
 fi
 
-if [[ ! -e ../libtiffpic ]] ; then
-    curl -o pics-3.8.0.tar.gz https://download.osgeo.org/libtiff/pics-3.8.0.tar.gz
-    tar xf pics-3.8.0.tar.gz -C ..
-fi
+# if [[ ! -e ../libtiffpic ]] ; then
+#     curl -o pics-3.8.0.tar.gz https://download.osgeo.org/libtiff/pics-3.8.0.tar.gz
+#     tar xf pics-3.8.0.tar.gz -C ..
+# fi
 
 if [[ ! -e ../openexr-images ]] ; then
     git clone https://github.com/openexr/openexr-images.git ../openexr-images
 fi
+
+# if [[ ! -e ../bmpsuite ]] ; then
+#     mkdir ../bmpsuite
+#     curl -o bmpsuite.zip http://entropymine.com/jason/bmpsuite/bmpsuite.zip
+#     unzip bmpsuite.zip -d ../bmpsuite
+# fi

src/build-scripts/save-env.bash

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Save the env for use by other stages. Exclude things that we know aren't
+# needed.
+printenv \
+    | sort \
+    | grep -v ASWF_ \
+    | grep -v GITHUB_ \
+    | grep -v NVIDIA_ \
+    | grep -v RUNNER_ \
+    | grep -v _= \
+    | fgrep -v "\*" \
+    >> $GITHUB_ENV
+
+
+echo "save-env: GITHUB_ENV=${GITHUB_ENV}"
+cat $GITHUB_ENV
+echo "---------"
+

src/cineon.imageio/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 add_oiio_plugin (cineoninput.cpp
                  libcineon/Cineon.cpp libcineon/OutStream.cpp libcineon/Codec.cpp

src/cineon.imageio/cineoninput.cpp

@@ -1,6 +1,6 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
 
 #include <cmath>
 
@@ -79,13 +79,13 @@ CineonInput::open(const std::string& name, ImageSpec& newspec)
     // open the image
     m_stream = new InStream();
     if (!m_stream->Open(name.c_str())) {
-        errorf("Could not open file \"%s\"", name);
+        errorfmt("Could not open file \"{}\"", name);
         return false;
     }
 
     m_cin.SetInStream(m_stream);
     if (!m_cin.ReadHeader()) {
-        errorf("Could not read header");
+        error("Could not read header");
         return false;
     }
 
@@ -101,7 +101,7 @@ CineonInput::open(const std::string& name, ImageSpec& newspec)
     case 2: typedesc = TypeDesc::UINT16; break;
     case 3:
     case 4: typedesc = TypeDesc::UINT32; break;
-    default: errorf("Unsupported bit depth %d", maxbits); return false;
+    default: errorfmt("Unsupported bit depth {}", maxbits); return false;
     }
     m_spec = ImageSpec(m_cin.header.Width(), m_cin.header.Height(),
                        m_cin.header.NumberOfElements(), typedesc);
@@ -184,7 +184,7 @@ CineonInput::open(const std::string& name, ImageSpec& newspec)
         if (!std::isinf(m_cin.header.Gamma()) && m_cin.header.Gamma() != 0.0f)
             // actual gamma value is read later on
             m_spec.attribute("oiio:ColorSpace",
-                             Strutil::sprintf("GammaCorrected%.2g", g));
+                             Strutil::sprintf("Gamma%.2g", g));
         break;
     }
 
@@ -223,40 +223,40 @@ CineonInput::open(const std::string& name, ImageSpec& newspec)
 // per-file attribs
 #define CINEON_SET_ATTRIB_S(x, n, s) m_spec.attribute(s, m_cin.header.x(n))
 #define CINEON_SET_ATTRIB(x, n) CINEON_SET_ATTRIB_S(x, n, "cineon:" #x)
-#define CINEON_SET_ATTRIB_BYTE(x)                                              \
-    if (m_cin.header.x() != 0xFF)                                              \
+#define CINEON_SET_ATTRIB_BYTE(x) \
+    if (m_cin.header.x() != 0xFF) \
     CINEON_SET_ATTRIB(x, )
-#define CINEON_SET_ATTRIB_INT(x)                                               \
-    if (static_cast<unsigned int>(m_cin.header.x()) != 0xFFFFFFFF)             \
+#define CINEON_SET_ATTRIB_INT(x)                                   \
+    if (static_cast<unsigned int>(m_cin.header.x()) != 0xFFFFFFFF) \
     CINEON_SET_ATTRIB(x, )
-#define CINEON_SET_ATTRIB_FLOAT(x)                                             \
-    if (!std::isinf(m_cin.header.x()))                                         \
+#define CINEON_SET_ATTRIB_FLOAT(x)     \
+    if (!std::isinf(m_cin.header.x())) \
     CINEON_SET_ATTRIB(x, )
-#define CINEON_SET_ATTRIB_COORDS(x)                                            \
-    m_cin.header.x(floats);                                                    \
-    if (!std::isinf(floats[0]) && !std::isinf(floats[1])                       \
-        && !(floats[0] == 0. && floats[1] == 0.))                              \
+#define CINEON_SET_ATTRIB_COORDS(x)                      \
+    m_cin.header.x(floats);                              \
+    if (!std::isinf(floats[0]) && !std::isinf(floats[1]) \
+        && !(floats[0] == 0. && floats[1] == 0.))        \
     m_spec.attribute("cineon:" #x, TypeDesc(TypeDesc::FLOAT, 2), &floats[0])
-#define CINEON_SET_ATTRIB_STR(X, x)                                            \
-    if (m_cin.header.x[0] && m_cin.header.x[0] != char(-1))                    \
+#define CINEON_SET_ATTRIB_STR(X, x)                         \
+    if (m_cin.header.x[0] && m_cin.header.x[0] != char(-1)) \
     m_spec.attribute("cineon:" #X, m_cin.header.x)
 
 // per-element attribs
-#define CINEON_SET_ATTRIB_N(x, a, t, c)                                        \
-    for (int i = 0; i < m_cin.header.NumberOfElements(); i++) {                \
-        c(x) a[i] = m_cin.header.x(i);                                         \
-    }                                                                          \
-    m_spec.attribute("cineon:" #x,                                             \
-                     TypeDesc(TypeDesc::t, m_cin.header.NumberOfElements()),   \
+#define CINEON_SET_ATTRIB_N(x, a, t, c)                                      \
+    for (int i = 0; i < m_cin.header.NumberOfElements(); i++) {              \
+        c(x) a[i] = m_cin.header.x(i);                                       \
+    }                                                                        \
+    m_spec.attribute("cineon:" #x,                                           \
+                     TypeDesc(TypeDesc::t, m_cin.header.NumberOfElements()), \
                      &a)
 #define CINEON_CHECK_ATTRIB_FLOAT(x) if (!std::isinf(m_cin.header.x(i)))
-#define CINEON_SET_ATTRIB_FLOAT_N(x)                                           \
+#define CINEON_SET_ATTRIB_FLOAT_N(x) \
     CINEON_SET_ATTRIB_N(x, floats, FLOAT, CINEON_CHECK_ATTRIB_FLOAT)
 #define CINEON_CHECK_ATTRIB_INT(x) if (m_cin.header.x(i) != 0xFFFFFFFF)
-#define CINEON_SET_ATTRIB_INT_N(x)                                             \
+#define CINEON_SET_ATTRIB_INT_N(x) \
     CINEON_SET_ATTRIB_N(x, ints, UINT32, CINEON_CHECK_ATTRIB_INT)
 #define CINEON_CHECK_ATTRIB_BYTE(x) if (m_cin.header.x(i) != 0xFF)
-#define CINEON_SET_ATTRIB_BYTE_N(x)                                            \
+#define CINEON_SET_ATTRIB_BYTE_N(x) \
     CINEON_SET_ATTRIB_N(x, ints, UINT32, CINEON_CHECK_ATTRIB_BYTE)
 
     CINEON_SET_ATTRIB_STR(Version, version);
@@ -369,7 +369,7 @@ bool
 CineonInput::read_native_scanline(int subimage, int miplevel, int y, int /*z*/,
                                   void* data)
 {
-    lock_guard lock(m_mutex);
+    lock_guard lock(*this);
     if (!seek_subimage(subimage, miplevel))
         return false;
 

src/cineon.imageio/libcineon/CineonHeader.cpp

@@ -41,6 +41,7 @@
 #include <limits>
 
 #include <OpenImageIO/strutil.h>
+#include <OpenImageIO/sysutil.h>
 
 #include "CineonHeader.h"
 #include "EndianSwap.h"
@@ -540,7 +541,6 @@ void cineon::IndustryHeader::SetFilmEdgeCode(const char *edge)
 
 void cineon::GenericHeader::SetCreationTimeDate(const long sec)
 {
-	struct tm *tm_time;
 	char str[32];
 
 #ifdef _WIN32
@@ -548,8 +548,9 @@ void cineon::GenericHeader::SetCreationTimeDate(const long sec)
 #endif
 
 	const time_t t = time_t(sec);
-	tm_time = ::localtime(&t);
-	::strftime(str, 32, "%Y:%m:%d:%H:%M:%S%Z", tm_time);
+    struct tm localtm;
+    OIIO::Sysutil::get_local_time(&t, &localtm);
+    ::strftime(str, 32, "%Y:%m:%d:%H:%M:%S%Z", &localtm);
 	OIIO::Strutil::safe_strcpy(this->creationDate, str, 11);
 	OIIO::Strutil::safe_strcpy(this->creationTime, str + 11, 12);
 }
@@ -557,7 +558,6 @@ void cineon::GenericHeader::SetCreationTimeDate(const long sec)
 
 void cineon::GenericHeader::SetSourceTimeDate(const long sec)
 {
-	struct tm *tm_time;
 	char str[32];
 
 #ifdef _WIN32
@@ -565,8 +565,9 @@ void cineon::GenericHeader::SetSourceTimeDate(const long sec)
 #endif
 
 	const time_t t = time_t(sec);
-	tm_time = ::localtime(&t);
-	::strftime(str, 32, "%Y:%m:%d:%H:%M:%S%Z", tm_time);
+    struct tm localtm;
+    OIIO::Sysutil::get_local_time(&t, &localtm);
+    ::strftime(str, 32, "%Y:%m:%d:%H:%M:%S%Z", &localtm);
 	OIIO::Strutil::safe_strcpy(this->sourceDate, str, 11);
 	OIIO::Strutil::safe_strcpy(this->sourceTime, str + 11, 12);
 }

src/cineon.imageio/libcineon/WriterInternal.h

@@ -83,12 +83,13 @@ namespace cineon
 	void RleCompress(IB *src, IB *dst, const int bufsize, const int len, BufferAccess &access)
 	{
 		IB ch;
-		int count;
+		// int count;
 		int i;
 		int index = bufsize - 1;
 		bool start = true;
 		//bool match = true;
 
+#if 0  /* This seems to not be used */
 		// for each data type, have maximum length of rle datum
 		// subtract one so it the LSBit can be used to state
 		int maxCount;
@@ -102,13 +103,13 @@ namespace cineon
 			maxCount = 0xffff - 1;
 		else
 			maxCount = 1000000;		// high number for floats, doubles
-
+#endif
 
 		for (i = len - 1; i >= 0; i--)
 		{
 			if (start)
 			{
-				count = 1;
+				// count = 1;
 				start = false;
 				ch = src[i];
 				dst[index--] = ch;

src/cmake/Config.cmake.in

@@ -3,13 +3,38 @@
 include(CMakeFindDependencyMacro)
 
 # add here all the find_dependency() whenever switching to config based dependencies
-# e.g. if switching to Boost::Boost instead of using ${Boost_LIBRARY_DIRS} the add:
-# find_dependency(Boost @Boost_VERSION@)
+if (NOT @OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH@ AND NOT OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH)
+    if (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 3.0)
+        find_dependency(Imath @Imath_VERSION@
+                        HINTS @Imath_DIR@)
+    elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONFIG@)
+        find_dependency(IlmBase @OpenEXR_VERSION@
+                        HINTS @IlmBase_DIR@ @OpenEXR_DIR@)
+        find_dependency(OpenEXR @OpenEXR_VERSION@
+                        HINTS @OpenEXR_DIR@)
+        find_dependency(ZLIB @ZLIB_VERSION@)  # Because OpenEXR doesn't do it
+        find_dependency(Threads)  # Because OpenEXR doesn't do it
+    endif ()
+endif ()
 
-set_and_check (@PROJECT_NAME@_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-set_and_check (@PROJECT_NAME@_INCLUDES    "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-set_and_check (@PROJECT_NAME@_LIB_DIR     "@CMAKE_INSTALL_FULL_LIBDIR@")
-set (@PROJECT_NAME@_PLUGIN_SEARCH_PATH         "@PLUGIN_SEARCH_PATH_NATIVE@")
+# Compute the installation prefix relative to this file
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+# There's no guarantee that CMAKE_INSTALL_XXXDIR is a relative path so we extract the final component to handle asbolute paths
+get_filename_component(_INCLUDE_DIR_NAME "@CMAKE_INSTALL_INCLUDEDIR@" NAME)
+get_filename_component(_LIB_DIR_NAME "@CMAKE_INSTALL_LIBDIR@" NAME)
+
+set_and_check (@PROJECT_NAME@_INCLUDE_DIR "${_IMPORT_PREFIX}/${_INCLUDE_DIR_NAME}")
+set_and_check (@PROJECT_NAME@_INCLUDES    "${_IMPORT_PREFIX}/${_INCLUDE_DIR_NAME}")
+set_and_check (@PROJECT_NAME@_LIB_DIR     "${_IMPORT_PREFIX}/${_LIB_DIR_NAME}")
+set (@PROJECT_NAME@_PLUGIN_SEARCH_PATH    "@PLUGIN_SEARCH_PATH_NATIVE@")
+
+if (NOT @FOUND_OPENEXR_WITH_CONFIG@)
+    list (APPEND @PROJECT_NAME@_INCLUDES ${IMATH_INCLUDES} ${OPENEXR_INCLUDES})
+endif ()
+
+set (OIIO_USING_IMATH_VERSION_MAJOR @Imath_VERSION_MAJOR@)
+set (OIIO_USING_IMATH_VERSION_MINOR @Imath_VERSION_MINOR@)
 
 #...logic to determine installedPrefix from the own location...
 #set (@PROJECT_NAME@_CONFIG_DIR  "${installedPrefix}/@CONFIG_INSTALL_DIR@")
@@ -17,3 +42,6 @@ set (@PROJECT_NAME@_PLUGIN_SEARCH_PATH         "@PLUGIN_SEARCH_PATH_NATIVE@")
 include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 
 check_required_components ("@PROJECT_NAME@")
+
+# Set a CMake variable that says if this OpenImageIO build has OCIO support
+set (@PROJECT_NAME@_HAS_OpenColorIO @OPENCOLORIO_FOUND@)

src/cmake/add_oiio_plugin.cmake

@@ -0,0 +1,80 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+
+# Macro to add a build target for an IO plugin.
+#
+# Usage:
+#
+# add_oiio_plugin ( source1 [source2 ...]
+#                   [ NAME targetname ... ]
+#                   [ SRC source1 ... ]
+#                   [ INCLUDE_DIRS include_dir1 ... ]
+#                   [ LINK_LIBRARIES external_lib1 ... ]
+#                   [ DEFINITIONS -DFOO=bar ... ])
+#
+# The plugin name can be specified with NAME, otherwise is inferred from the
+# subdirectory name. The source files of the binary can be specified with
+# SRC, otherwise are inferred to be all the .cpp files within the
+# subdirectory. Optional compile DEFINITIONS, private INCLUDE_DIRS, and
+# private LINK_LIBRARIES may also be specified. The source is automatically
+# linked against OpenImageIO.
+#
+# The plugin may be disabled individually using any of the usual
+# check_is_enabled() conventions (e.g. -DENABLE_<format>=OFF).
+#
+# What goes on under the covers is quite different depending on whether
+# EMBEDPLUGINS is 0 or 1. If EMBEDPLUGINS is 0 (in which case this is
+# expected to be called *after* the OpenImageIO target is declared), it will
+# create a new target to build the full plugin. On the other hand, if
+# EMBEDPLUGINS is 1 (in which case this should be called *before* the
+# OpenImageIO target is declared), it will merely append the required
+# definitions, includes, and libraries to lists format_plugin_blah that will
+# be handed off too the setup of the later OpenImageIO target.
+#
+macro (add_oiio_plugin)
+    cmake_parse_arguments (_plugin "" "NAME" "SRC;INCLUDE_DIRS;LINK_LIBRARIES;DEFINITIONS" ${ARGN})
+       # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
+    get_filename_component (_plugin_name ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
+    if (NOT _plugin_NAME)
+        # If NAME is not supplied, infer target name (and therefore the
+        # executable name) from the directory name.
+        get_filename_component (_plugin_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+    endif ()
+    # if (NOT _plugin_SRC)
+    #     # If SRC is not supplied, assume local cpp files are its source.
+    #     file (GLOB _plugin_SRC *.cpp)
+    # endif ()
+    check_is_enabled (${_plugin_name} _enable_plugin)
+    if (_enable_plugin)
+        if (EMBEDPLUGINS)
+            # Add each source file to the libOpenImageIO_srcs, but it takes some
+            # bending over backwards to change it in the parent scope.
+            set (_plugin_all_source ${libOpenImageIO_srcs})
+            foreach (_plugin_source_file ${_plugin_UNPARSED_ARGUMENTS} )
+                list (APPEND _plugin_all_source "${CMAKE_CURRENT_SOURCE_DIR}/${_plugin_source_file}")
+            endforeach ()
+            set (libOpenImageIO_srcs "${_plugin_all_source}" PARENT_SCOPE)
+            set (format_plugin_definitions ${format_plugin_definitions} ${_plugin_DEFINITIONS} PARENT_SCOPE)
+            set (format_plugin_include_dirs ${format_plugin_include_dirs} ${_plugin_INCLUDE_DIRS} PARENT_SCOPE)
+            set (format_plugin_libs ${format_plugin_libs} ${_plugin_LINK_LIBRARIES} PARENT_SCOPE)
+        else ()
+            # Get the name of the current directory and use it as the target name.
+            get_filename_component (_plugin_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+            add_library (${_plugin_name} MODULE ${_plugin_UNPARSED_ARGUMENTS})
+            target_compile_definitions (${_plugin_name} PRIVATE
+                                        ${_plugin_DEFINITIONS}
+                                        OpenImageIO_EXPORTS)
+            target_include_directories (${_plugin_name} PRIVATE ${_plugin_INCLUDE_DIRS})
+            target_link_libraries (${_plugin_name} PUBLIC OpenImageIO
+                                                   PRIVATE ${_plugin_LINK_LIBRARIES})
+            set_target_properties (${_plugin_name} PROPERTIES PREFIX "" FOLDER "Plugins")
+            install_targets (${_plugin_name})
+        endif ()
+    else ()
+        message (STATUS "${ColorRed}Disabling ${_plugin_name} ${ColorReset}")
+        string (TOUPPER ${_plugin_name} _plugin_name_upper)
+        set (format_plugin_definitions ${format_plugin_definitions} DISABLE_${_plugin_name_upper} PARENT_SCOPE)
+    endif ()
+endmacro ()

src/cmake/check_is_enabled.cmake

@@ -1,11 +1,11 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 # Is the named package "enabled" via our disabling convention? If either
 # USE_pkgname (or the all-uppercase USE_PKGNAME, or ENABLE_pkgname, or
 # ENABLE_PKGNAME) exists as either a CMake or environment variable, is
-# nonempty by contains a non-true/nonnzero value, store false in the
+# nonempty by contains a non-true/nonzero value, store false in the
 # variable named by <enablevar>, otherwise store true.
 function (check_is_enabled pkgname enablevar)
     string (TOUPPER ${pkgname} pkgname_upper)

src/cmake/checked_find_package.cmake

@@ -0,0 +1,202 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+
+set (REQUIRED_DEPS "" CACHE STRING
+     "Additional dependencies to consider required (semicolon-separated list, or ALL)")
+set (OPTIONAL_DEPS "" CACHE STRING
+     "Additional dependencies to consider optional (semicolon-separated list, or ALL)")
+option (ALWAYS_PREFER_CONFIG "Prefer a dependency's exported config file if it's available" OFF)
+
+
+# Utility function to list the names and values of all variables matching
+# the pattern (case-insensitive)
+function (dump_matching_variables pattern)
+    string (TOLOWER ${pattern} _pattern_lower)
+    get_cmake_property(_allvars VARIABLES)
+    list (SORT _allvars)
+    foreach (_var IN LISTS _allvars)
+        string (TOLOWER ${_var} _var_lower)
+        if (_var_lower MATCHES ${_pattern_lower})
+            message (STATUS "    ${_var} = ${${_var}}")
+        endif ()
+    endforeach ()
+endfunction ()
+
+
+
+# checked_find_package(Pkgname ...) is a wrapper for find_package, with the
+# following extra features:
+#   * If either `USE_Pkgname` or the all-uppercase `USE_PKGNAME` (or
+#     `ENABLE_Pkgname` or `ENABLE_PKGNAME`) exists as either a CMake or
+#     environment variable, is nonempty by contains a non-true/nonzero
+#     value, do not search for or use the package. The optional ENABLE <var>
+#     arguments allow you to override the name of the enabling variable. In
+#     other words, support for the dependency is presumed to be ON, unless
+#     turned off explicitly from one of these sources.
+#   * Print a message if the package is enabled but not found. This is based
+#     on ${Pkgname}_FOUND or $PKGNAME_FOUND.
+#   * Optional DEFINITIONS <string>... are passed to add_definitions if the
+#     package is found.
+#   * Optional SETVARIABLES <id>... is a list of CMake variables to set to
+#     TRUE if the package is found (they will not be set or changed if the
+#     package is not found).
+#   * Optional PRINT <list> is a list of variables that will be printed
+#     if the package is found, if VERBOSE is on.
+#   * Optional DEPS <list> is a list of hard dependencies; for each one, if
+#     dep_FOUND is not true, disable this package with an error message.
+#   * Optional ISDEPOF <downstream> names another package for which the
+#     present package is only needed because it's a dependency, and
+#     therefore if <downstream> is disabled, we don't bother with this
+#     package either.
+#   * Optional VERSION_MIN and VERSION_MAX, if supplied, give minimum and
+#     maximum versions that will be accepted. The min is inclusive, the max
+#     is exclusive (i.e., check for min <= version < max). Note that this is
+#     not the same as providing a version number to find_package, which
+#     checks compatibility, not minimum. Sometimes we really do just want to
+#     say a minimum or a range. (N.B. When our minimum CMake >= 3.19, the
+#     built-in way to do this is with version ranges passed to
+#     find_package.)
+#   * Optional RECOMMEND_MIN, if supplied, gives a minimum recommended
+#     version, accepting but warning if it is below this number (even
+#     if above the true minimum version accepted). The warning message
+#     can give an optional explanation, passed as RECOMMEND_MIN_REASON.
+#   * Optional PREFER_CONFIG, if supplied, tries to use an exported config
+#     file from the package before using a FindPackage.cmake module.
+#   * Optional DEBUG turns on extra debugging information related to how
+#     this package is found.
+#
+# N.B. This needs to be a macro, not a function, because the find modules
+# will set(blah val PARENT_SCOPE) and we need that to be the global scope,
+# not merely the scope for this function.
+macro (checked_find_package pkgname)
+    cmake_parse_arguments(_pkg   # prefix
+        # noValueKeywords:
+        "REQUIRED;PREFER_CONFIG;DEBUG"
+        # singleValueKeywords:
+        "ENABLE;ISDEPOF;VERSION_MIN;VERSION_MAX;RECOMMEND_MIN;RECOMMEND_MIN_REASON"
+        # multiValueKeywords:
+        "DEFINITIONS;PRINT;DEPS;SETVARIABLES"
+        # argsToParse:
+        ${ARGN})
+    string (TOLOWER ${pkgname} pkgname_lower)
+    string (TOUPPER ${pkgname} pkgname_upper)
+    set (_pkg_VERBOSE ${VERBOSE})
+    if (_pkg_DEBUG)
+        set (_pkg_VERBOSE ON)
+    endif ()
+    if (NOT _pkg_VERBOSE)
+        set (${pkgname}_FIND_QUIETLY true)
+        set (${pkgname_upper}_FIND_QUIETLY true)
+    endif ()
+    if ("${pkgname}" IN_LIST REQUIRED_DEPS OR "ALL" IN_LIST REQUIRED_DEPS)
+        set (_pkg_REQUIRED 1)
+    endif ()
+    if ("${pkgname}" IN_LIST OPTIONAL_DEPS OR "ALL" IN_LIST OPTIONAL_DEPS)
+        set (_pkg_REQUIRED 0)
+    endif ()
+    set (_quietskip false)
+    check_is_enabled (${pkgname} _enable)
+    set (_disablereason "")
+    foreach (_dep ${_pkg_DEPS})
+        if (_enable AND NOT ${_dep}_FOUND)
+            set (_enable false)
+            set (ENABLE_${pkgname} OFF PARENT_SCOPE)
+            set (_disablereason "(because ${_dep} was not found)")
+        endif ()
+    endforeach ()
+    if (_pkg_ISDEPOF)
+        check_is_enabled (${_pkg_ISDEPOF} _dep_enabled)
+        if (NOT _dep_enabled)
+            set (_enable false)
+            set (_quietskip true)
+        endif ()
+    endif ()
+    set (_config_status "")
+    if (_enable OR _pkg_REQUIRED)
+        if (${pkgname}_FOUND OR ${pkgname_upper}_FOUND)
+            # was already found
+        elseif (_pkg_PREFER_CONFIG OR ALWAYS_PREFER_CONFIG)
+            find_package (${pkgname} CONFIG ${_pkg_UNPARSED_ARGUMENTS})
+            if (${pkgname}_FOUND OR ${pkgname_upper}_FOUND)
+                set (_config_status "from CONFIG")
+            endif ()
+        endif ()
+        if (NOT (${pkgname}_FOUND OR ${pkgname_upper}_FOUND))
+            find_package (${pkgname} ${_pkg_UNPARSED_ARGUMENTS})
+        endif()
+        if ((${pkgname}_FOUND OR ${pkgname_upper}_FOUND)
+              AND ${pkgname}_VERSION
+              AND (_pkg_VERSION_MIN OR _pkg_VERSION_MAX))
+            if ((_pkg_VERSION_MIN AND ${pkgname}_VERSION VERSION_LESS _pkg_VERSION_MIN)
+                  OR (_pkg_VERSION_MAX AND ${pkgname}_VERSION VERSION_GREATER _pkg_VERSION_MAX))
+                message (STATUS "${ColorRed}${pkgname} ${${pkgname}_VERSION} is outside the required range ${_pkg_VERSION_MIN}...${_pkg_VERSION_MAX} ${ColorReset}")
+                unset (${pkgname}_FOUND)
+                unset (${pkgname}_VERSION)
+                unset (${pkgname_upper}_FOUND)
+                unset (${pkgname_upper}_VERSION)
+            endif ()
+        endif ()
+        if (${pkgname}_FOUND OR ${pkgname_upper}_FOUND)
+            foreach (_vervar ${pkgname_upper}_VERSION ${pkgname}_VERSION_STRING
+                             ${pkgname_upper}_VERSION_STRING)
+                if (NOT ${pkgname}_VERSION AND ${_vervar})
+                    set (${pkgname}_VERSION ${${_vervar}})
+                endif ()
+            endforeach ()
+            message (STATUS "${ColorGreen}Found ${pkgname} ${${pkgname}_VERSION} ${_config_status}${ColorReset}")
+            add_definitions (${_pkg_DEFINITIONS})
+            foreach (_v IN LISTS _pkg_SETVARIABLES)
+                set (${_v} TRUE)
+            endforeach ()
+            if (_pkg_RECOMMEND_MIN)
+                if (${${pkgname}_VERSION} VERSION_LESS ${_pkg_RECOMMEND_MIN})
+                    message (STATUS "${ColorYellow}Recommend ${pkgname} >= ${_pkg_RECOMMEND_MIN} ${_pkg_RECOMMEND_MIN_REASON} ${ColorReset}")
+                endif ()
+            endif ()
+        else ()
+            message (STATUS "${ColorRed}${pkgname} library not found ${ColorReset}")
+            if (${pkgname}_ROOT)
+                message (STATUS "${ColorRed}    ${pkgname}_ROOT was: ${${pkgname}_ROOT} ${ColorReset}")
+            elseif ($ENV{${pkgname}_ROOT})
+                message (STATUS "${ColorRed}    ENV ${pkgname}_ROOT was: ${${pkgname}_ROOT} ${ColorReset}")
+            else ()
+                message (STATUS "${ColorRed}    Try setting ${pkgname}_ROOT ? ${ColorReset}")
+            endif ()
+            if (EXISTS "${PROJECT_SOURCE_DIR}/src/build-scripts/build_${pkgname}.bash")
+                message (STATUS "${ColorRed}    Maybe this will help:  src/build-scripts/build_${pkgname}.bash ${ColorReset}")
+            elseif (EXISTS "${PROJECT_SOURCE_DIR}/src/build-scripts/build_${pkgname_upper}.bash")
+                message (STATUS "${ColorRed}    Maybe this will help:  src/build-scripts/build_${pkgname_upper}.bash ${ColorReset}")
+            elseif (EXISTS "${PROJECT_SOURCE_DIR}/src/build-scripts/build_${pkgname_lower}.bash")
+                    message (STATUS "${ColorRed}    Maybe this will help:  src/build-scripts/build_${pkgname_lower}.bash ${ColorReset}")
+            elseif (EXISTS "${PROJECT_SOURCE_DIR}/src/build-scripts/build_lib${pkgname_lower}.bash")
+                    message (STATUS "${ColorRed}    Maybe this will help:  src/build-scripts/build_lib${pkgname_lower}.bash ${ColorReset}")
+            endif ()
+            if (_pkg_REQUIRED)
+                message (FATAL_ERROR "${ColorRed}${pkgname} is required, aborting.${ColorReset}")
+            endif ()
+        endif()
+        if (_pkg_VERBOSE AND (${pkgname}_FOUND OR ${pkgname_upper}_FOUND OR _pkg_DEBUG))
+            if (_pkg_DEBUG)
+                dump_matching_variables (${pkgname})
+            endif ()
+            set (_vars_to_print ${pkgname}_INCLUDES ${pkgname_upper}_INCLUDES
+                                ${pkgname}_INCLUDE_DIR ${pkgname_upper}_INCLUDE_DIR
+                                ${pkgname}_INCLUDE_DIRS ${pkgname_upper}_INCLUDE_DIRS
+                                ${pkgname}_LIBRARIES ${pkgname_upper}_LIBRARIES
+                                ${_pkg_PRINT})
+            list (REMOVE_DUPLICATES _vars_to_print)
+            foreach (_v IN LISTS _vars_to_print)
+                if (NOT "${${_v}}" STREQUAL "")
+                    message (STATUS "    ${_v} = ${${_v}}")
+                endif ()
+            endforeach ()
+        endif ()
+    else ()
+        if (NOT _quietskip)
+            message (STATUS "${ColorRed}Not using ${pkgname} -- disabled ${_disablereason} ${ColorReset}")
+        endif ()
+    endif ()
+endmacro()
+

src/cmake/colors.cmake

@@ -1,6 +1,6 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 
 # Define color codes for pretty terminal output

src/cmake/compiler.cmake

@@ -1,6 +1,6 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 ###########################################################################
 #
@@ -27,11 +27,13 @@ message (STATUS "CMAKE_CXX_COMPILER_ID  = ${CMAKE_CXX_COMPILER_ID}")
 ###########################################################################
 # C++ language standard
 #
-set (CMAKE_CXX_STANDARD 11 CACHE STRING
-     "C++ standard to prefer (11, 14, 17, 20, etc.)")
+set (CMAKE_CXX_STANDARD 14 CACHE STRING
+     "C++ standard to build with (14, 17, 20, etc.)")
+set (DOWNSTREAM_CXX_STANDARD 14 CACHE STRING
+     "C++ minimum standard to impose on downstream clients")
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
-message (STATUS "Building for C++${CMAKE_CXX_STANDARD}")
+message (STATUS "Building with C++${CMAKE_CXX_STANDARD}, downstream minimum C++${DOWNSTREAM_CXX_STANDARD}")
 
 
 ###########################################################################
@@ -80,18 +82,22 @@ endif ()
 ###########################################################################
 # Turn on more detailed warnings and optionally consider warnings as errors
 #
-option (STOP_ON_WARNING "Stop building if there are any compiler warnings" ON)
+if (${PROJECT_NAME}_SUPPORTED_RELEASE)
+    option (STOP_ON_WARNING "Stop building if there are any compiler warnings" OFF)
+else ()
+    option (STOP_ON_WARNING "Stop building if there are any compiler warnings" ON)
+endif()
 option (EXTRA_WARNINGS "Enable lots of extra pedantic warnings" OFF)
 if (NOT MSVC)
     add_compile_options ("-Wall")
     if (EXTRA_WARNINGS)
         add_compile_options ("-Wextra")
     endif ()
-    if (STOP_ON_WARNING OR DEFINED ENV{CI})
+    if (STOP_ON_WARNING OR DEFINED ENV{${PROJECT_NAME}_CI})
         add_compile_options ("-Werror")
-        # N.B. Force CI builds (Travis defines $CI) to use -Werror, even if
-        # STOP_ON_WARNING has been switched off by default, which we may do
-        # in release branches.
+        # N.B. Force CI builds to use -Werror, even if STOP_ON_WARNING has
+        # been switched off by default, which we may do in release
+        # branches.
     endif ()
 endif ()
 
@@ -111,12 +117,12 @@ set (CXX_VISIBILITY_PRESET "hidden" CACHE STRING "Symbol visibility (hidden or d
 option (VISIBILITY_INLINES_HIDDEN "Hide symbol visibility of inline functions" ON)
 set (VISIBILITY_MAP_FILE "${PROJECT_SOURCE_DIR}/src/build-scripts/hidesymbols.map" CACHE FILEPATH "Visibility map file")
 set (C_VISIBILITY_PRESET ${CXX_VISIBILITY_PRESET})
-if (${CXX_VISIBILITY_PRESET} STREQUAL "hidden" AND
+if (${CXX_VISIBILITY_PRESET} STREQUAL "hidden" AND VISIBILITY_MAP_FILE AND
     (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) AND
     (CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU"))
     # Linux/FreeBSD/Hurd: also hide all the symbols of dependent libraries
     # to prevent clashes if an app using this project is linked against
-    # other verions of our dependencies.
+    # other versions of our dependencies.
     set (VISIBILITY_MAP_COMMAND "-Wl,--version-script=${VISIBILITY_MAP_FILE}")
 endif ()
 
@@ -143,7 +149,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_APPLECLANG)
         add_compile_options ("-Wno-unused-local-typedefs")
     endif ()
     if (CLANG_VERSION_STRING VERSION_GREATER_EQUAL 3.9)
-        # Don't warn about using unknown preprocessor symbols in #if'set
+        # Don't warn about using unknown preprocessor symbols in `#if`
         add_compile_options ("-Wno-expansion-to-defined")
     endif ()
 endif ()
@@ -185,25 +191,47 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
 endif ()
 
 
+# We will use this for ccache and timing
+set (MY_RULE_LAUNCH "")
+
+
 ###########################################################################
 # Use ccache if found
 #
 # This can really speed up compilation by caching object files that have
-# been compiled previously with idential arguments and inputs. Putting this
+# been compiled previously with identical arguments and inputs. Putting this
 # logic here makes it work even if the user is unaware of ccache. If it's
-# not found on the system, it will simply be silnetly not used.
+# not found on the system, it will simply be silently not used.
 option (USE_CCACHE "Use ccache if found" ON)
 find_program (CCACHE_FOUND ccache)
 if (CCACHE_FOUND AND USE_CCACHE)
     if (CMAKE_COMPILER_IS_CLANG AND USE_QT AND (NOT DEFINED ENV{CCACHE_CPP2}))
         message (STATUS "Ignoring ccache because clang + Qt + env CCACHE_CPP2 is not set")
     else ()
-        set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+        set (MY_RULE_LAUNCH ccache)
     endif ()
 endif ()
 
 
+###########################################################################
+# Build time debugging aid: time all compile & link commands
+#
+# Note, though, that this is not especially helpful when doing a parallel
+# build. If you wish to time individual compile commands, it's best to also
+# set `-j 1` or CMAKE_BUILD_PARALLEL_LEVEL to 1.
+option (TIME_COMMANDS "Time each compile and link command" OFF)
+if (TIME_COMMANDS)
+    set (MY_RULE_LAUNCH "${CMAKE_COMMAND} -E time ${MY_RULE_LAUNCH}")
+endif ()
+
+
+# Note: This must be after any option that alters MY_RULE_LAUNCH
+if (MY_RULE_LAUNCH)
+    set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${MY_RULE_LAUNCH})
+    set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ${MY_RULE_LAUNCH})
+endif ()
+
+
 ###########################################################################
 # Option to force use of libc++ (the LLVM project's alternate C++ standard
 # library). Currently this only has an effect if using clang as the
@@ -236,8 +264,8 @@ endif ()
 ###########################################################################
 # SIMD and machine architecture options.
 #
-# The USE_SIMD optinon may be set to a comma-separated list of machine /
-# instruction set optinos, such as "avx3,f16c". The list will be parsed and
+# The USE_SIMD option may be set to a comma-separated list of machine /
+# instruction set options, such as "avx3,f16c". The list will be parsed and
 # the proper compiler directives added to generate code for those ISA
 # capabilities.
 #
@@ -280,25 +308,6 @@ include (CMakePushCheckState)
 include (CheckCXXSourceRuns)
 include (CheckLibraryExists)
 
-###########################################################################
-# Find out if it's safe for us to use std::regex or if we need boost.regex.
-# This is primarily about gcc 4.8 having a broken regex implementation.
-# This will be obsolete once our minimum supported gcc is >= 4.9.
-#
-cmake_push_check_state ()
-check_cxx_source_runs("
-      #include <regex>
-      int main() {
-          std::string r = std::regex_replace(std::string(\"abc\"), std::regex(\"b\"), \" \");
-          return r == \"a c\" ? 0 : -1;
-      }"
-      USE_STD_REGEX)
-cmake_pop_check_state ()
-if (USE_STD_REGEX)
-    add_definitions (-DUSE_STD_REGEX)
-else ()
-    add_definitions (-DUSE_BOOST_REGEX)
-endif ()
 
 ###########################################################################
 # Check if we need libatomic on this platform.  We shouldn't on mainstream
@@ -432,43 +441,45 @@ endif ()
 # correct any deviations. If clang-format is found on the system, a
 # "clang-format" build target will trigger a reformatting.
 #
-set (CLANG_FORMAT_EXE_HINT "" CACHE PATH "clang-format executable's directory (will search if not specified")
-set (CLANG_FORMAT_INCLUDES "src/*.h" "src/*.cpp"
-    CACHE STRING "Glob patterns to include for clang-format")
-set (CLANG_FORMAT_EXCLUDES "*pugixml*" "*SHA1*" "*/farmhash.cpp"
-                           "src/dpx.imageio/libdpx/*"
-                           "src/cineon.imageio/libcineon/*"
-                           "src/dds.imageio/squish/*"
-                           "src/gif.imageio/gif.h"
-                           "src/hdr.imageio/rgbe.cpp"
-                           "src/libutil/stb_sprintf.h"
-     CACHE STRING "Glob patterns to exclude for clang-format")
-find_program (CLANG_FORMAT_EXE
-              NAMES clang-format bin/clang-format
-              HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT
-                    ENV LLVM_DIRECTORY
-              NO_DEFAULT_PATH
-              DOC "Path to clang-format executable")
-find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format)
-if (CLANG_FORMAT_EXE)
-    message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}")
-    # Start with the list of files to include when formatting...
-    file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES})
-    # ... then process any list of excludes we are given
-    foreach (_pat ${CLANG_FORMAT_EXCLUDES})
-        file (GLOB_RECURSE _excl ${_pat})
-        list (REMOVE_ITEM FILES_TO_FORMAT ${_excl})
-    endforeach ()
-    #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}")
-    file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format
-          DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-    add_custom_target (clang-format
-        COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} )
-else ()
-    message (STATUS "clang-format not found.")
+# Note: skip all of this checking, setup, and cmake-format target if this
+# is being built as a subproject.
+if (PROJECT_IS_TOP_LEVEL)
+    set (CLANG_FORMAT_EXE_HINT "" CACHE PATH "clang-format executable's directory (will search if not specified")
+    set (CLANG_FORMAT_INCLUDES "src/*.h" "src/*.cpp"
+        CACHE STRING "Glob patterns to include for clang-format")
+    set (CLANG_FORMAT_EXCLUDES "*pugixml*" "*SHA1*" "*/farmhash.cpp"
+                               "src/dpx.imageio/libdpx/*"
+                               "src/cineon.imageio/libcineon/*"
+                               "src/dds.imageio/squish/*"
+                               "src/gif.imageio/gif.h"
+                               "src/libutil/stb_sprintf.h"
+         CACHE STRING "Glob patterns to exclude for clang-format")
+    find_program (CLANG_FORMAT_EXE
+                  NAMES clang-format bin/clang-format
+                  HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT
+                        ENV LLVM_DIRECTORY
+                  NO_DEFAULT_PATH
+                  DOC "Path to clang-format executable")
+    find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format)
+    if (CLANG_FORMAT_EXE)
+        message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}")
+        # Start with the list of files to include when formatting...
+        file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES})
+        # ... then process any list of excludes we are given
+        foreach (_pat ${CLANG_FORMAT_EXCLUDES})
+            file (GLOB_RECURSE _excl ${_pat})
+            list (REMOVE_ITEM FILES_TO_FORMAT ${_excl})
+        endforeach ()
+        #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}")
+        file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format
+              DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+        add_custom_target (clang-format
+            COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} )
+    else ()
+        message (STATUS "clang-format not found.")
+    endif ()
 endif ()
 
-
 ###########################################################################
 # Another way to sneak in custom compiler and DSO linking flags.
 #
@@ -527,9 +538,10 @@ endif ()
 
 ###########################################################################
 # Any extra logic to be run only for CI builds goes here.
+# We expect our own CI runs to define env variable ${PROJECT_NAME}_CI
 #
-if (DEFINED ENV{TRAVIS} OR DEFINED ENV{APPVEYOR} OR DEFINED ENV{CI} OR DEFINED ENV{GITHUB_ACTIONS})
-    add_definitions ("-D${PROJ_NAME}_CI=1" "-DBUILD_CI=1")
+if (DEFINED ENV{${PROJECT_NAME}_CI})
+    add_definitions (-D${PROJ_NAME}_CI=1 -DBUILD_CI=1)
     if (APPLE)
         # Keep Mono framework from being incorrectly searched for include
         # files on GitHub Actions CI.

src/cmake/externalpackages.cmake

@@ -1,6 +1,6 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 ###########################################################################
 # Find external dependencies
@@ -25,153 +25,50 @@ set (OIIO_LOCAL_DEPS_PATH "${CMAKE_SOURCE_DIR}/ext/dist" CACHE STRING
      "Local area for dependencies added to CMAKE_PREFIX_PATH")
 list (APPEND CMAKE_PREFIX_PATH ${CMAKE_SOURCE_DIR}/ext/dist)
 
-set (REQUIED_DEPS "" CACHE STRING
-     "Additional dependencies to consider required (semicolon-separated list, or ALL)")
-set (OPTIONAL_DEPS "" CACHE STRING
-     "Additional dependencies to consider optional (semicolon-separated list, or ALL)")
-
-
-# checked_find_package(pkgname ..) is a wrapper for find_package, with the
-# following extra features:
-#   * If either `USE_pkgname` or the all-uppercase `USE_PKGNAME` (or
-#     `ENABLE_pkgname` or `ENABLE_PKGNAME`) exists as either a CMake or
-#     environment variable, is nonempty by contains a non-true/nonnzero
-#     value, do not search for or use the package. The optional ENABLE <var>
-#     arguments allow you to override the name of the enabling variable. In
-#     other words, support for the dependency is presumed to be ON, unless
-#     turned off explicitly from one of these sources.
-#   * Print a message if the package is enabled but not found. This is based
-#     on ${pkgname}_FOUND or $PKGNNAME_FOUND.
-#   * Optional DEFINITIONS <string> are passed to add_definitions if the
-#     package is found.
-#   * Optional PRINT <list> is a list of variables that will be printed
-#     if the package is found, if VERBOSE is on.
-#   * Optional DEPS <list> is a list of hard dependencies; for each one, if
-#     dep_FOUND is not true, disable this package with an error message.
-#   * Optional ISDEPOF <downstream> names another package for which the
-#     present package is only needed because it's a dependency, and
-#     therefore if <downstream> is disabled, we don't bother with this
-#     package either.
-#
-# N.B. This needs to be a macro, not a function, because the find modules
-# will set(blah val PARENT_SCOPE) and we need that to be the global scope,
-# not merely the scope for this function.
-macro (checked_find_package pkgname)
-    cmake_parse_arguments(_pkg "REQUIRED" "ENABLE;ISDEPOF" "DEFINITIONS;PRINT;DEPS" ${ARGN})
-        # Arguments: <prefix> noValueKeywords singleValueKeywords multiValueKeywords argsToParse
-    string (TOUPPER ${pkgname} pkgname_upper)
-    if (NOT VERBOSE)
-        set (${pkgname}_FIND_QUIETLY true)
-        set (${pkgname_upper}_FIND_QUIETLY true)
-    endif ()
-    if ("${pkgname}" IN_LIST REQUIRED_DEPS OR "ALL" IN_LIST REQUIRED_DEPS)
-        set (_pkg_REQUIRED 1)
-    endif ()
-    if ("${pkgname}" IN_LIST OPTIONAL_DEPS OR "ALL" IN_LIST OPTIONAL_DEPS)
-        set (_pkg_REQUIRED 0)
-    endif ()
-    set (_quietskip false)
-    check_is_enabled (${pkgname} _enable)
-    set (_disablereason "")
-    foreach (_dep ${_pkg_DEPS})
-        if (_enable AND NOT ${_dep}_FOUND)
-            set (_enable false)
-            set (ENABLE_${pkgname} OFF PARENT_SCOPE)
-            set (_disablereason "(because ${_dep} was not found)")
-        endif ()
-    endforeach ()
-    if (_pkg_ISDEPOF)
-        check_is_enabled (${_pkg_ISDEPOF} _dep_enabled)
-        if (NOT _dep_enabled)
-            set (_enable false)
-            set (_quietskip true)
-        endif ()
-    endif ()
-    if (_enable OR _pkg_REQUIRED)
-        find_package (${pkgname} ${_pkg_UNPARSED_ARGUMENTS})
-        if (${pkgname}_FOUND OR ${pkgname_upper}_FOUND)
-            foreach (_vervar ${pkgname_upper}_VERSION ${pkgname}_VERSION_STRING
-                             ${pkgname_upper}_VERSION_STRING)
-                if (NOT ${pkgname}_VERSION AND ${_vervar})
-                    set (${pkgname}_VERSION ${${_vervar}})
-                endif ()
-            endforeach ()
-            message (STATUS "${ColorGreen}Found ${pkgname} ${${pkgname}_VERSION} ${ColorReset}")
-            if (VERBOSE)
-                set (_vars_to_print ${pkgname}_INCLUDES ${pkgname_upper}_INCLUDES
-                                    ${pkgname}_INCLUDE_DIR ${pkgname_upper}_INCLUDE_DIR
-                                    ${pkgname}_INCLUDE_DIRS ${pkgname_upper}_INCLUDE_DIRS
-                                    ${pkgname}_LIBRARIES ${pkgname_upper}_LIBRARIES
-                                    ${_pkg_PRINT})
-                list (REMOVE_DUPLICATES _vars_to_print)
-                foreach (_v IN LISTS _vars_to_print)
-                    if (NOT "${${_v}}" STREQUAL "")
-                        message (STATUS "    ${_v} = ${${_v}}")
-                    endif ()
-                endforeach ()
-            endif ()
-            add_definitions (${_pkg_DEFINITIONS})
-        else ()
-            message (STATUS "${ColorRed}${pkgname} library not found ${ColorReset}")
-            if (${pkgname}_ROOT)
-                message (STATUS "${ColorRed}    ${pkgname}_ROOT was: ${${pkgname}_ROOT} ${ColorReset}")
-            elseif ($ENV{${pkgname}_ROOT})
-                message (STATUS "${ColorRed}    ENV ${pkgname}_ROOT was: ${${pkgname}_ROOT} ${ColorReset}")
-            else ()
-                message (STATUS "${ColorRed}    Try setting ${pkgname}_ROOT ? ${ColorReset}")
-            endif ()
-            if (EXISTS "${PROJECT_SOURCE_DIR}/src/build-scripts/build_${pkgname}.bash")
-                message (STATUS "${ColorRed}    Maybe this will help:  src/build-scripts/build_${pkgname}.bash ${ColorReset}")
-            endif ()
-            if (_pkg_REQUIRED)
-                message (FATAL_ERROR "${ColorRed}${pkgname} is required, aborting.${ColorReset}")
-            endif ()
-        endif()
-    else ()
-        if (NOT _quietskip)
-            message (STATUS "${ColorRed}Not using ${pkgname} -- disabled ${_disablereason} ${ColorReset}")
-        endif ()
-    endif ()
-endmacro()
-
-
-
-
 include (ExternalProject)
 
 option (BUILD_MISSING_DEPS "Try to download and build any missing dependencies" OFF)
 
+include (FindThreads)
+
 
 ###########################################################################
 # Boost setup
-if (LINKSTATIC)
-    set (Boost_USE_STATIC_LIBS ON)
-    if (MSVC)
-        add_definitions (-DBOOST_ALL_NO_LIB=1)
-    endif ()
-else ()
-    if (MSVC)
+if (MSVC)
+    # Disable automatic linking using pragma comment(lib,...) of boost libraries upon including of a header
+    add_definitions (-DBOOST_ALL_NO_LIB=1)
+endif ()
+
+# If the build system hasn't been specifically told how to link Boost, link it the same way as other
+# OIIO dependencies:
+if (NOT DEFINED Boost_USE_STATIC_LIBS)
+    set (Boost_USE_STATIC_LIBS "${LINKSTATIC}")
+endif ()
+
+if (MSVC)
+    # Not linking Boost as static libraries: either an explicit setting or LINKSTATIC is FALSE:
+    if (NOT Boost_USE_STATIC_LIBS)
         add_definitions (-DBOOST_ALL_DYN_LINK=1)
     endif ()
 endif ()
+
 if (BOOST_CUSTOM)
     set (Boost_FOUND true)
     # N.B. For a custom version, the caller had better set up the variables
     # Boost_VERSION, Boost_INCLUDE_DIRS, Boost_LIBRARY_DIRS, Boost_LIBRARIES.
 else ()
     set (Boost_COMPONENTS filesystem system thread)
-    if (NOT USE_STD_REGEX)
-        list (APPEND Boost_COMPONENTS regex)
-    endif ()
     # The FindBoost.cmake interface is broken if it uses boost's installed
     # cmake output (e.g. boost 1.70.0, cmake <= 3.14). Specifically it fails
     # to set the expected variables printed below. So until that's fixed
     # force FindBoost.cmake to use the original brute force path.
     set (Boost_NO_BOOST_CMAKE ON)
-    checked_find_package (Boost 1.53 REQUIRED
-                       COMPONENTS ${Boost_COMPONENTS}
-                       PRINT Boost_INCLUDE_DIRS Boost_LIBRARIES
-                      )
+    checked_find_package (Boost REQUIRED
+                          VERSION_MIN 1.53
+                          COMPONENTS ${Boost_COMPONENTS}
+                          RECOMMEND_MIN 1.66
+                          RECOMMEND_MIN_REASON "Boost 1.66 is the oldest version our CI tests against"
+                          PRINT Boost_INCLUDE_DIRS Boost_LIBRARIES )
 endif ()
 
 # On Linux, Boost 1.55 and higher seems to need to link against -lrt
@@ -192,26 +89,59 @@ link_directories ("${Boost_LIBRARY_DIRS}")
 # that we will not complete the build if they are not found.
 
 checked_find_package (ZLIB REQUIRED)  # Needed by several packages
-checked_find_package (TIFF 3.0 REQUIRED)
+checked_find_package (TIFF REQUIRED
+                      VERSION_MIN 3.9
+                      RECOMMEND_MIN 4.0
+                      RECOMMEND_MIN_REASON "to support >4GB files")
 
 # IlmBase & OpenEXR
-checked_find_package (OpenEXR 2.0 REQUIRED)
-# We use Imath so commonly, may as well include it everywhere.
-include_directories ("${OPENEXR_INCLUDES}" "${ILMBASE_INCLUDES}"
-                     "${ILMBASE_INCLUDES}/OpenEXR")
-if (CMAKE_COMPILER_IS_CLANG AND OPENEXR_VERSION VERSION_LESS 2.3)
-    # clang C++ >= 11 doesn't like 'register' keyword in old exr headers
-    add_compile_options (-Wno-deprecated-register)
-endif ()
+checked_find_package (OpenEXR REQUIRED
+                      VERSION_MIN 2.3
+                      RECOMMEND_MIN 2.4
+                      PRINT IMATH_INCLUDES OPENEXR_INCLUDES)
+# Force Imath includes to be before everything else to ensure that we have
+# the right Imath/OpenEXR version, not some older version in the system
+# library. This shoudn't be necessary, except for the common case of people
+# building against Imath/OpenEXR 3.x when there is still a system-level
+# install version of 2.x.
+include_directories(BEFORE ${IMATH_INCLUDES} ${OPENEXR_INCLUDES})
 if (MSVC AND NOT LINKSTATIC)
     add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?
 endif ()
-
+if (OPENEXR_VERSION VERSION_GREATER_EQUAL 3.0)
+    set (OIIO_USING_IMATH 3)
+else ()
+    set (OIIO_USING_IMATH 2)
+endif ()
+set (OPENIMAGEIO_IMATH_TARGETS
+            # For OpenEXR/Imath 3.x:
+            $<TARGET_NAME_IF_EXISTS:Imath::Imath>
+            $<TARGET_NAME_IF_EXISTS:Imath::Half>
+            # For OpenEXR >= 2.4/2.5 with reliable exported targets
+            $<TARGET_NAME_IF_EXISTS:IlmBase::Imath>
+            $<TARGET_NAME_IF_EXISTS:IlmBase::Half>
+            $<TARGET_NAME_IF_EXISTS:IlmBase::Iex>
+            # For OpenEXR <= 2.3:
+            ${ILMBASE_LIBRARIES} )
+set (OPENIMAGEIO_OPENEXR_TARGETS
+            # For OpenEXR/Imath 3.x:
+            $<TARGET_NAME_IF_EXISTS:OpenEXR::OpenEXR>
+            # For OpenEXR >= 2.4/2.5 with reliable exported targets
+            $<TARGET_NAME_IF_EXISTS:OpenEXR::IlmImf>
+            $<TARGET_NAME_IF_EXISTS:IlmBase::IlmThread>
+            $<TARGET_NAME_IF_EXISTS:IlmBase::Iex>
+            # For OpenEXR <= 2.3:
+            ${OPENEXR_LIBRARIES} )
+set (OPENIMAGEIO_IMATH_DEPENDENCY_VISIBILITY "PUBLIC" CACHE STRING
+     "Should we expose Imath library dependency as PUBLIC or PRIVATE")
+set (OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH OFF CACHE BOOL
+     "Exclude find_dependency(Imath) from the exported OpenImageIOConfig.cmake")
 
 # JPEG -- prefer Turbo-JPEG to regular libjpeg
 checked_find_package (JPEGTurbo
                       DEFINITIONS -DUSE_JPEG_TURBO=1
-                      PRINT       JPEG_INCLUDES JPEG_LIBRARIES)
+                      PRINT       JPEG_INCLUDES JPEG_INCLUDE_DIRS
+                                  JPEG_LIBRARIES JPEG_VERSION)
 if (NOT JPEG_FOUND) # Try to find the non-turbo version
     checked_find_package (JPEG REQUIRED)
 endif ()
@@ -222,9 +152,14 @@ endif ()
 option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
 if (USE_EXTERNAL_PUGIXML)
     checked_find_package (pugixml REQUIRED
+                          VERSION_MIN 1.8
                           DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1)
+else ()
+    message (STATUS "Using internal PugiXML")
 endif()
 
+# From pythonutils.cmake
+find_python()
 
 
 ###########################################################################
@@ -241,34 +176,71 @@ endif ()
 checked_find_package (Freetype
                    DEFINITIONS  -DUSE_FREETYPE=1 )
 
-checked_find_package (HDF5
-                   ISDEPOF      Field3D)
 checked_find_package (OpenColorIO
-                   DEFINITIONS  -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1)
-checked_find_package (OpenCV
+                      DEFINITIONS  -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1
+                      # PREFER_CONFIG
+                      )
+if (NOT OPENCOLORIO_FOUND)
+    set (OPENCOLORIO_FOUND 0)
+endif ()
+checked_find_package (OpenCV 3.0
                    DEFINITIONS  -DUSE_OPENCV=1)
 
 # Intel TBB
 set (TBB_USE_DEBUG_BUILD OFF)
 checked_find_package (TBB 2017
-                   DEFINITIONS  -DUSE_TBB=1
-                   ISDEPOF      OpenVDB)
+                      DEFINITIONS  -DUSE_TBB=1
+                      PREFER_CONFIG)
+
+checked_find_package (DCMTK VERSION_MIN 3.6.1)  # For DICOM images
+checked_find_package (FFmpeg VERSION_MIN 3.0)
+checked_find_package (GIF
+                      VERSION_MIN 4
+                      RECOMMEND_MIN 5.0
+                      RECOMMEND_MIN_REASON "for stability and thread safety")
+
+# For HEIF/HEIC/AVIF formats
+checked_find_package (Libheif VERSION_MIN 1.3
+                      RECOMMEND_MIN 1.7
+                      RECOMMEND_MIN_REASON "for AVIF support")
+if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11)
+    message (WARNING "Libheif 1.10 on Apple is known to be broken, disabling libheif support")
+    set (Libheif_FOUND 0)
+endif ()
 
-checked_find_package (DCMTK 3.6.1)  # For DICOM images
-checked_find_package (FFmpeg 2.6)
-checked_find_package (Field3D
-                   DEPS         HDF5
-                   DEFINITIONS  -DUSE_FIELD3D=1)
-checked_find_package (GIF 4)
-checked_find_package (Libheif 1.3)  # For HEIF/HEIC format
 checked_find_package (LibRaw
-                    PRINT LibRaw_r_LIBRARIES)
-checked_find_package (OpenJpeg 2.0)
-checked_find_package (OpenVDB 5.0
-                   DEPS         TBB
-                   DEFINITIONS  -DUSE_OPENVDB=1)
-checked_find_package (PTex)
-checked_find_package (Webp)
+                      RECOMMEND_MIN 0.18
+                      RECOMMEND_MIN_REASON "for ACES support and better camera metadata"
+                      PRINT LibRaw_r_LIBRARIES)
+if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VERSION_GREATER_EQUAL 17)
+    message (STATUS "${ColorYellow}WARNING When building for C++17, LibRaw should be 0.20 or higher (found ${LibRaw_VERSION}). You may get errors, depending on the compiler.${ColorReset}")
+    # Currently, we issue the above warning and let them take their chances.
+    # If we wish to disable the LibRaw<0.20/C++17 combination that may fail,
+    # just uncomment the following two lines.
+    # set (LibRaw_FOUND 0)
+    # set (LIBRAW_FOUND 0)
+endif ()
+
+checked_find_package (OpenJPEG VERSION_MIN 2.0
+                      RECOMMEND_MIN 2.2
+                      RECOMMEND_MIN_REASON "for multithreading support")
+# Note: Recent OpenJPEG versions have exported cmake configs, but we don't
+# find them reliable at all, so we stick to our FindOpenJPEG.cmake module.
+
+checked_find_package (OpenVDB
+                      VERSION_MIN 5.0
+                      DEPS         TBB
+                      DEFINITIONS  -DUSE_OPENVDB=1)
+
+checked_find_package (Ptex PREFER_CONFIG)
+if (NOT Ptex_FOUND OR NOT Ptex_VERSION)
+    # Fallback for inadequate Ptex exported configs. This will eventually
+    # disappear when we can 100% trust Ptex's exports.
+    unset (Ptex_FOUND)
+    checked_find_package (Ptex)
+endif ()
+
+checked_find_package (WebP)
 
 option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)
 checked_find_package (R3DSDK)  # RED camera
@@ -348,7 +320,7 @@ endif ()
 
 option (BUILD_FMT_FORCE "Force local download/build of fmt even if installed" OFF)
 option (BUILD_MISSING_FMT "Local download/build of fmt if not installed" ON)
-set (BUILD_FMT_VERSION "6.1.2" CACHE STRING "Preferred fmtlib/fmt version, when downloading/building our own")
+set (BUILD_FMT_VERSION "8.0.0" CACHE STRING "Preferred fmtlib/fmt version, when downloading/building our own")
 
 macro (find_or_download_fmt)
     # If we weren't told to force our own download/build of fmt, look

src/cmake/fancy_add_executable.cmake

@@ -0,0 +1,61 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Macro to add an executable build target. The executable name can be
+# specified with NAME, otherwise is inferred from the subdirectory name. The
+# source files of the binary can be specified with SRC, otherwise are
+# inferred to be all the .cpp files within the subdirectory. Optional
+# compile DEFINITIONS, private INCLUDE_DIRS, and private LINK_LIBRARIES may
+# also be specified.
+#
+# The executable may be disabled individually using any of the usual
+# check_is_enabled() conventions (e.g. -DENABLE_<executable>=OFF).
+#
+# If -DENABLE_INSTALL_<executable>=OFF was specified, the target will be built
+# (in the build area) but will not be installed.
+#
+# Usage:
+#
+#   fancy_add_executable ([ NAME targetname ... ]
+#                         [ SRC source1 ... ]
+#                         [ INCLUDE_DIRS include_dir1 ... ]
+#                         [ DEFINITIONS -DFOO=bar ... ])
+#                         [ LINK_LIBRARIES external_lib1 ... ]
+#
+macro (fancy_add_executable)
+    cmake_parse_arguments (_target "" "NAME" "SRC;INCLUDE_DIRS;SYSTEM_INCLUDE_DIRS;LINK_LIBRARIES;DEFINITIONS" ${ARGN})
+       # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
+    if (NOT _target_NAME)
+        # If NAME is not supplied, infer target name (and therefore the
+        # executable name) from the directory name.
+        get_filename_component (_target_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+    endif ()
+    if (NOT _target_SRC)
+        # If SRC is not supplied, assume local cpp files are its source.
+        file (GLOB _target_SRC *.cpp)
+    endif ()
+    check_is_enabled (${_target_NAME} _target_NAME_enabled)
+    if (_target_NAME_enabled)
+        add_executable (${_target_NAME} ${_target_SRC})
+        if (_target_INCLUDE_DIRS)
+            target_include_directories (${_target_NAME} PRIVATE ${_target_INCLUDE_DIRS})
+        endif ()
+        if (_target_SYSTEM_INCLUDE_DIRS)
+            target_include_directories (${_target_NAME} SYSTEM PRIVATE ${_target_SYSTEM_INCLUDE_DIRS})
+        endif ()
+        if (_target_DEFINITIONS)
+            target_compile_definitions (${_target_NAME} PRIVATE ${_target_DEFINITIONS})
+        endif ()
+        if (_target_LINK_LIBRARIES)
+            target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES})
+        endif ()
+        set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools")
+        check_is_enabled (INSTALL_${_target_NAME} _target_NAME_INSTALL_enabled)
+        if (_target_NAME_INSTALL_enabled)
+            install_targets (${_target_NAME})
+        endif ()
+    else ()
+        message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}")
+    endif ()
+endmacro ()

src/cmake/modules/FindFFmpeg.cmake

@@ -18,7 +18,7 @@
 # Modifications:
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 if (FFMPEG_INCLUDES AND FFMPEG_LIBRARIES)
     set (FFmpeg_FOUND TRUE)
@@ -39,6 +39,7 @@ else ()
     HINTS ${_FFMPEG_AVCODEC_INCLUDE_DIRS}
     PATH_SUFFIXES ffmpeg libav
   )
+  set (FFMPEG_INCLUDES ${FFMPEG_AVCODEC_INCLUDE_DIR})
 
   find_library(FFMPEG_LIBAVCODEC
     NAMES avcodec
@@ -55,15 +56,61 @@ else ()
   find_library(FFMPEG_LIBSWSCALE
     NAMES swscale
     HINTS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} )
+endif ()
 
-  include (FindPackageHandleStandardArgs)
-  find_package_handle_standard_args (FFmpeg
+if (FFMPEG_INCLUDES)
+  file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+       REGEX "^#define LIBAVCODEC_VERSION_MAJOR .*$")
+  string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR ${TMP})
+  file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+       REGEX "^#define LIBAVCODEC_VERSION_MINOR .*$")
+  string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MINOR ${TMP})
+  file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+       REGEX "^#define LIBAVCODEC_VERSION_MICRO .*$")
+  string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO ${TMP})
+  set (LIBAVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}")
+  if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
+      set (FFMPEG_VERSION 5.0)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.134.100)
+      set (FFMPEG_VERSION 4.4)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.91.100)
+      set (FFMPEG_VERSION 4.3)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.54.100)
+      set (FFMPEG_VERSION 4.2)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.35.100)
+      set (FFMPEG_VERSION 4.1)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.18.100)
+      set (FFMPEG_VERSION 4.0)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.107.100)
+      set (FFMPEG_VERSION 3.4)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.89.100)
+      set (FFMPEG_VERSION 3.3)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.64.100)
+      set (FFMPEG_VERSION 3.2)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.48.100)
+      set (FFMPEG_VERSION 3.1)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.24.100)
+      set (FFMPEG_VERSION 3.0)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 56.60.100)
+      set (FFMPEG_VERSION 2.8)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 56.41.100)
+      set (FFMPEG_VERSION 2.7)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 56.26.100)
+      set (FFMPEG_VERSION 2.6)
+  else ()
+      set (FFMPEG_VERSION 1.0)
+  endif ()
+  set (FFmpeg_VERSION ${FFMPEG_VERSION})
+endif ()
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (FFmpeg
     REQUIRED_VARS   FFMPEG_LIBAVCODEC
                     FFMPEG_LIBAVFORMAT
                     FFMPEG_AVCODEC_INCLUDE_DIR
-    )
+  )
 
-  if (FFmpeg_FOUND)
+if (FFmpeg_FOUND)
     set(FFMPEG_INCLUDE_DIR ${FFMPEG_AVCODEC_INCLUDE_DIR})
     set(FFMPEG_INCLUDES ${FFMPEG_AVCODEC_INCLUDE_DIR})
     set(FFMPEG_LIBRARIES
@@ -72,10 +119,9 @@ else ()
       ${FFMPEG_LIBAVUTIL}
       ${FFMPEG_LIBSWSCALE}
     )
-  endif ()
-
 endif ()
 
+
 mark_as_advanced (
     FFMPEG_INCLUDES FFMPEG_LIBRARIES
     )

src/cmake/modules/FindField3D.cmake

@@ -1,47 +0,0 @@
-# Module to find Field3D
-#
-# This module will first look into the directories defined by the variables:
-#   - Field3D_ROOT, FIELD3D_INCLUDE_PATH, FIELD3D_LIBRARY_PATH
-#
-# This module defines the following variables:
-#
-# Field3D_FOUND            True if Field3D was found.
-# FIELD3D_INCLUDES         Where to find Field3D headers
-# FIELD3D_LIBRARIES        List of libraries to link against when using Field3D
-# FIELD3D_VERSION          Version of Field3D (e.g., 3.6.2)
-
-include (FindPackageHandleStandardArgs)
-
-find_path (FIELD3D_INCLUDE_DIR Field3D/Field.h
-           HINTS
-               ${FIELD3D_INCLUDE_PATH}
-               ENV FIELD3D_INCLUDE_PATH
-           DOC "The directory where Field3D headers reside")
-
-find_library (FIELD3D_LIBRARY Field3D
-              HINTS
-                  ${FIELD3D_LIBRARY_PATH}
-                  ENV FIELD3D_LIBRARY_PATH
-              DOC "The Field3D libraries")
-
-find_package_handle_standard_args (Field3D
-    REQUIRED_VARS   FIELD3D_INCLUDE_DIR FIELD3D_LIBRARY
-    )
-
-if (Field3D_FOUND)
-    set (FIELD3D_INCLUDES ${FIELD3D_INCLUDE_DIR})
-    set (FIELD3D_LIBRARIES ${FIELD3D_LIBRARY})
-
-    if (NOT TARGET Field3D::Field3D)
-        add_library(Field3D::Field3D UNKNOWN IMPORTED)
-        set_target_properties(Field3D::Field3D PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${FIELD3D_INCLUDES}")
-        set_property(TARGET Field3D::Field3D APPEND PROPERTY
-            IMPORTED_LOCATION "${FIELD3D_LIBRARIES}")
-    endif ()
-endif ()
-
-mark_as_advanced (
-    FIELD3D_INCLUDE_DIR
-    FIELD3D_LIBRARY
-    )

src/cmake/modules/FindJPEGTurbo.cmake

@@ -29,6 +29,12 @@ endif ()
 if (JPEG_INCLUDE_DIR AND JPEG_LIBRARY)
   set (JPEG_INCLUDE_DIRS ${JPEG_INCLUDE_DIR} CACHE PATH "JPEG include dirs")
   set (JPEG_LIBRARIES ${JPEG_LIBRARY} CACHE STRING "JPEG libraries")
+  file(STRINGS "${JPEG_INCLUDE_DIR}/jconfig.h"
+                jpeg_lib_version REGEX "^#define[\t ]+JPEG_LIB_VERSION[\t ]+.*")
+  if (jpeg_lib_version)
+      string(REGEX REPLACE "^#define[\t ]+JPEG_LIB_VERSION[\t ]+([0-9]+).*"
+              "\\1" JPEG_VERSION "${jpeg_lib_version}")
+  endif ()
 endif ()
 
 # handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if
@@ -37,6 +43,12 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(JPEG DEFAULT_MSG JPEG_LIBRARIES JPEG_INCLUDE_D
 
 if (JPEG_FOUND)
     set (JPEGTURBO_FOUND true)
+
+    # Use an intermediary target named "JPEG::JPEG" to match libjpeg's export
+    if(NOT TARGET JPEG::JPEG)
+      add_library(JPEG::JPEG INTERFACE IMPORTED)
+      target_link_libraries(JPEG::JPEG INTERFACE ${JPEG_LIBRARY})
+    endif()
 endif ()
 
 mark_as_advanced(JPEG_LIBRARIES JPEG_INCLUDE_DIRS )

src/cmake/modules/FindLibRaw.cmake

@@ -87,6 +87,15 @@ MARK_AS_ADVANCED(LibRaw_VERSION_STRING
 if (LINKSTATIC)
     # Necessary?
     find_package (Jasper)
+    if (JASPER_FOUND)
+        set (LibRaw_r_LIBRARIES ${LibRaw_r_LIBRARIES} ${JASPER_LIBRARIES})
+    endif()
     find_library (LCMS2_LIBRARIES NAMES lcms2)
-    set (LibRaw_r_LIBRARIES ${LibRaw_r_LIBRARIES} ${JASPER_LIBRARIES} ${LCMS2_LIBRARIES})
+    if (LCMS2_LIBRARIES)
+        set (LibRaw_r_LIBRARIES ${LibRaw_r_LIBRARIES} ${LCMS2_LIBRARIES})
+    endif()
+    if (MSVC)
+        set (LibRaw_r_DEFINITIONS ${LibRaw_r_DEFINITIONS} -DLIBRAW_NODLL)
+        set (LibRaw_DEFINITIONS ${LibRaw_DEFINITIONS} -DLIBRAW_NODLL)
+    endif()
 endif ()

src/cmake/modules/FindLibsquish.cmake

@@ -11,6 +11,7 @@
 # LIBSQUISH_VERSION          Version of Libsquish (e.g., 3.6.2)
 
 include (FindPackageHandleStandardArgs)
+include (SelectLibraryConfigurations)
 
 find_path (LIBSQUISH_INCLUDE_DIR squish.h
            HINTS
@@ -18,11 +19,11 @@ find_path (LIBSQUISH_INCLUDE_DIR squish.h
                ENV LIBSQUISH_INCLUDE_PATH
            DOC "The directory where Libsquish headers reside")
 
-find_library (LIBSQUISH_LIBRARY squish
-              HINTS
-                  ${LIBSQUISH_LIBRARY_PATH}
-                  ENV LIBSQUISH_LIBRARY_PATH
-              DOC "The Libsquish libraries")
+find_library (LIBSQUISH_LIBRARY_RELEASE squish
+              HINTS ${LIBSQUISH_LIBRARY_PATH} ENV LIBSQUISH_LIBRARY_PATH)
+find_library (LIBSQUISH_LIBRARY_DEBUG squishd
+              HINTS ${LIBSQUISH_LIBRARY_PATH} ENV LIBSQUISH_LIBRARY_PATH)
+select_library_configurations(LIBSQUISH)
 
 find_package_handle_standard_args (Libsquish
     REQUIRED_VARS
@@ -32,15 +33,33 @@ find_package_handle_standard_args (Libsquish
 
 if (Libsquish_FOUND)
     set (LIBSQUISH_INCLUDES ${LIBSQUISH_INCLUDE_DIR})
-    set (LIBSQUISH_LIBRARIES ${LIBSQUISH_LIBRARY})
+    if (NOT LIBSQUISH_LIBRARIES)
+        set (LIBSQUISH_LIBRARIES ${LIBSQUISH_LIBRARY})
+    endif ()
 
     if (NOT TARGET Libsquish::Libsquish)
         add_library(Libsquish::Libsquish UNKNOWN IMPORTED)
         set_target_properties(Libsquish::Libsquish PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${LIBSQUISH_INCLUDES}")
 
-        set_property(TARGET Libsquish::Libsquish APPEND PROPERTY
-            IMPORTED_LOCATION "${LIBSQUISH_LIBRARIES}")
+        if (LIBSQUISH_LIBRARY_RELEASE)
+            set_property(TARGET Libsquish::Libsquish APPEND PROPERTY
+              IMPORTED_CONFIGURATIONS RELEASE)
+            set_target_properties(Libsquish::Libsquish PROPERTIES
+              IMPORTED_LOCATION_RELEASE "${LIBSQUISH_LIBRARY_RELEASE}")
+        endif ()
+
+        if (LIBSQUISH_LIBRARY_DEBUG)
+            set_property(TARGET Libsquish::Libsquish APPEND PROPERTY
+              IMPORTED_CONFIGURATIONS DEBUG)
+            set_target_properties(Libsquish::Libsquish PROPERTIES
+              IMPORTED_LOCATION_DEBUG "${LIBSQUISH_LIBRARY_DEBUG}")
+        endif ()
+
+        if (NOT LIBSQUISH_LIBRARY_RELEASE AND NOT LIBSQUISH_LIBRARY_DEBUG)
+            set_property(TARGET Libsquish::Libsquish APPEND PROPERTY
+              IMPORTED_LOCATION "${LIBSQUISH_LIBRARY}")
+        endif ()
     endif ()
 endif ()
 

src/cmake/modules/FindOpenCV.cmake

@@ -36,8 +36,10 @@ if (EXISTS "${_ocv_version_file}")
     string (REGEX MATCHALL "[0-9]+" CV_VERSION_REVISION ${TMP})
     if (CV_VERSION_EPOCH)
         set (OpenCV_VERSION "${CV_VERSION_EPOCH}.${CV_VERSION_MAJOR}.${CV_VERSION_MINOR}")
+        string(REPLACE "." "" OpenCV_VERSION_SUFFIX "${OpenCV_VERSION}")
     else ()
         set (OpenCV_VERSION "${CV_VERSION_MAJOR}.${CV_VERSION_MINOR}.${CV_VERSION_REVISION}")
+        string(REPLACE "." "" OpenCV_VERSION_SUFFIX "${OpenCV_VERSION}")
     endif ()
 endif ()
 
@@ -49,13 +51,7 @@ set (libdirs "${PROJECT_SOURCE_DIR}/lib"
              /usr/local/opt/opencv3/lib
              )
 
-if (NOT ${OpenCV_VERSION} VERSION_LESS 4.0.0)
-    set (opencv_components opencv_core opencv_imgproc opencv_videoio)
-elseif (NOT ${OpenCV_VERSION} VERSION_LESS 3.0.0)
-    set (opencv_components opencv_videoio opencv_imgproc opencv_core)
-else (NOT ${OpenCV_VERSION} VERSION_LESS 2.0.0)
-    set (opencv_components opencv_highgui opencv_imgproc opencv_core)
-endif ()
+set (opencv_components opencv_core opencv_imgproc opencv_videoio opencv_core${OpenCV_VERSION_SUFFIX} opencv_imgproc${OpenCV_VERSION_SUFFIX} opencv_videoio${OpenCV_VERSION_SUFFIX})
 foreach (component ${opencv_components})
     find_library (${component}_lib
                   NAMES ${component}
@@ -73,6 +69,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS (OpenCV
 if (OPENCV_FOUND)
     set (OpenCV_INCLUDES ${OpenCV_INCLUDE_DIR})
     set (OpenCV_LIBRARIES ${OpenCV_LIBS})
+    foreach (component ${opencv_components})
+        list (APPEND OpenCV_${component}_LIBRARIES ${${component}_lib})
+    endforeach ()
 endif ()
 
 MARK_AS_ADVANCED (OpenCV_INCLUDE_DIR OpenCV_LIBS)

src/cmake/modules/FindOpenColorIO.cmake

@@ -1,14 +1,44 @@
 # Module to find OpenColorIO
 #
 # This module will first look into the directories hinted by the variables:
-#   - OpenColorIO_ROOT, OPENCOLORIO_INCLUDE_PATH, OPENCOLORIO_LIBRARY_PATH
+#   - OpenColorIO_ROOT
 #
-# This module defines the following variables:
+# This module defines the following targets:
+#
+#   - OpenColorIO::OpenColorIO
+#
+# Old style CMake, this module also defines the following variables:
 #
 # OPENCOLORIO_FOUND       - True if OpenColorIO was found.
 # OPENCOLORIO_INCLUDES    - where to find OpenColorIO.h
 # OPENCOLORIO_LIBRARIES   - list of libraries to link against when using OpenColorIO
 # OPENCOLORIO_DEFINITIONS - Definitions needed when using OpenColorIO
+#
+# Hints and overrides:
+#
+#   - OPENCOLORIO_INTERFACE_LINK_LIBRARIES - override for interface link
+#     libraries on the OpenColorIO::OpenColorIO target.
+#   - OPENCOLORIO_NO_CONFIG - if ON, this module will be used even if an
+#     OCIO >= 2.1 cmake config is found. If OFF (the default), a config file
+#     will be perferred if found.
+#
+# OpenColorIO 2.1 exports proper cmake config files on its own.
+# Once OCIO 2.1 is our new minimum, this FindOpenColorIO.cmake will
+# eventually be deprecated and disappear.
+#
+
+if (NOT OPENCOLORIO_NO_CONFIG)
+    find_package(OpenColorIO CONFIG)
+endif ()
+
+if (TARGET OpenColorIO::OpenColorIO)
+    if (OPENCOLORIO_INTERFACE_LINK_LIBRARIES)
+        set_target_properties(OpenColorIO::OpenColorIO PROPERTIES
+            INTERFACE_LINK_LIBRARIES "${OPENCOLORIO_INTERFACE_LINK_LIBRARIES}")
+    endif ()
+
+else ()
+# vvvv the rest is if no OCIO exported config file is found
 
 include (FindPackageHandleStandardArgs)
 include (FindPackageMessage)
@@ -23,8 +53,23 @@ find_path (OPENCOLORIO_INCLUDE_DIR
         /opt/local/include
     DOC "The directory where OpenColorIO/OpenColorIO.h resides")
 
+if (EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h")
+    # Search twice, because this symbol changed between OCIO 1.x and 2.x
+    file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" TMP
+         REGEX "^#define OCIO_VERSION_STR[ \t].*$")
+    if (NOT TMP)
+        file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" TMP
+             REGEX "^#define OCIO_VERSION[ \t].*$")
+    endif ()
+    string (REGEX MATCHALL "([0-9]+)\\.([0-9]+)\\.[0-9]+" OPENCOLORIO_VERSION ${TMP})
+    set (OPENCOLORIO_VERSION_MAJOR ${CMAKE_MATCH_1})
+    set (OPENCOLORIO_VERSION_MINOR ${CMAKE_MATCH_2})
+endif ()
+
 find_library (OPENCOLORIO_LIBRARY
-    NAMES OCIO OpenColorIO
+    NAMES
+        OpenColorIO
+        OpenColorIO_${OPENCOLORIO_VERSION_MAJOR}_${OPENCOLORIO_VERSION_MINOR}
     HINTS
         ${OPENCOLORIO_LIBRARY_PATH}
         ENV OPENCOLORIO_LIBRARY_PATH
@@ -35,19 +80,13 @@ find_library (OPENCOLORIO_LIBRARY
         /opt/local/lib
     DOC "The OCIO library")
 
-if (EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h")
-    file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" TMP
-         REGEX "^#define OCIO_VERSION[ \t].*$")
-    string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENCOLORIO_VERSION ${TMP})
-endif ()
-
 find_package_handle_standard_args (OpenColorIO
     REQUIRED_VARS   OPENCOLORIO_INCLUDE_DIR OPENCOLORIO_LIBRARY
     FOUND_VAR       OPENCOLORIO_FOUND
     VERSION_VAR     OPENCOLORIO_VERSION
     )
 
-if (OPENCOLORIO_FOUND)
+if (OpenColorIO_FOUND)
     set (OPENCOLORIO_INCLUDES ${OPENCOLORIO_INCLUDE_DIR})
     set (OPENCOLORIO_LIBRARIES ${OPENCOLORIO_LIBRARY})
     set (OPENCOLORIO_DEFINITIONS "")
@@ -58,11 +97,20 @@ if (OPENCOLORIO_FOUND)
 
         set_property(TARGET OpenColorIO::OpenColorIO APPEND PROPERTY
             IMPORTED_LOCATION "${OPENCOLORIO_LIBRARIES}")
-        if (LINKSTATIC)
+        if (OPENCOLORIO_INTERFACE_LINK_LIBRARIES)
             set_target_properties(OpenColorIO::OpenColorIO PROPERTIES
-                INTERFACE_COMPILE_DEFINITIONS "-DOpenColorIO_STATIC")
+                INTERFACE_LINK_LIBRARIES "${OPENCOLORIO_INTERFACE_LINK_LIBRARIES}")
+        endif ()
+        if (LINKSTATIC)
+            target_compile_definitions(OpenColorIO::OpenColorIO
+                INTERFACE "-DOpenColorIO_STATIC")
         endif()
     endif ()
+    if (NOT TARGET OpenColorIO::OpenColorIOHeaders)
+        add_library(OpenColorIO::OpenColorIOHeaders INTERFACE IMPORTED)
+        set_target_properties(OpenColorIO::OpenColorIOHeaders PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${OPENCOLORIO_INCLUDES}")
+    endif ()
 endif ()
 
 if (OpenColorIO_FOUND AND LINKSTATIC)
@@ -82,3 +130,4 @@ if (OpenColorIO_FOUND AND LINKSTATIC)
     endif ()
 endif ()
 
+endif()

src/cmake/modules/FindOpenEXR.cmake

@@ -1,15 +1,118 @@
-# Module to find OpenEXR.
+# Module to find OpenEXR and Imath.
+#
+# I'm afraid this is a mess, due to needing to support a wide range of
+# OpenEXR versions.
+#
+# For OpenEXR & Imath 3.0, this will establish the following imported
+# targets:
+#
+#    Imath::Imath
+#    Imath::Half
+#    OpenEXR::OpenEXR
+#    OpenEXR::Iex
+#    OpenEXR::IlmThread
+#
+# For OpenEXR 2.4 & 2.5, it will establish the following imported targets:
+#
+#    IlmBase::Imath
+#    IlmBase::Half
+#    IlmBase::Iex
+#    IlmBase::IlmThread
+#    OpenEXR::IlmImf
+#
+# For all versions -- but for OpenEXR < 2.4 the only thing this sets --
+# are the following CMake variables:
 #
-# This module will set
 #   OPENEXR_FOUND          true, if found
-#   OPENEXR_INCLUDES       directory where headers are found
+#   OPENEXR_INCLUDES       directory where OpenEXR headers are found
 #   OPENEXR_LIBRARIES      libraries for OpenEXR + IlmBase
-#   ILMBASE_LIBRARIES      libraries just IlmBase
 #   OPENEXR_VERSION        OpenEXR version (accurate for >= 2.0.0,
 #                              otherwise will just guess 1.6.1)
+#   IMATH_INCLUDES         directory where Imath headers are found
+#   ILMBASE_INCLUDES       directory where IlmBase headers are found
+#   ILMBASE_LIBRARIES      libraries just IlmBase
 #
 #
 
+# First, try to fine just the right config files
+find_package(Imath CONFIG)
+if (NOT TARGET Imath::Imath)
+    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
+    find_package(IlmBase CONFIG)
+endif ()
+find_package(OpenEXR CONFIG)
+
+if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath)
+    # OpenEXR 3.x if both of these targets are found
+    set (FOUND_OPENEXR_WITH_CONFIG 1)
+    if (NOT OpenEXR_FIND_QUIETLY)
+        message (STATUS "Found CONFIG for OpenEXR 3 (OpenEXR_VERSION=${OpenEXR_VERSION})")
+    endif ()
+
+    # Mimic old style variables
+    set (OPENEXR_VERSION ${OpenEXR_VERSION})
+    get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(ILMBASE_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+    get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+    get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex INTERFACE_LINK_LIBRARIES)
+    get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread INTERFACE_LINK_LIBRARIES)
+    set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY})
+    set (ILMBASE_FOUND true)
+
+    get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR INTERFACE_LINK_LIBRARIES)
+    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES})
+    set (OPENEXR_FOUND true)
+
+    # Link with pthreads if required
+    find_package (Threads)
+    if (CMAKE_USE_PTHREADS_INIT)
+        list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+    endif ()
+
+elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
+        (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION VERSION_GREATER_EQUAL 2.4))
+    # OpenEXR 2.4 or 2.5 with exported config
+    set (FOUND_OPENEXR_WITH_CONFIG 1)
+    if (NOT OpenEXR_FIND_QUIETLY)
+        message (STATUS "Found CONFIG for OpenEXR 2 (OpenEXR_VERSION=${OpenEXR_VERSION})")
+    endif ()
+
+    # Mimic old style variables
+    get_target_property(ILMBASE_INCLUDES IlmBase::IlmBaseConfig INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(IMATH_INCLUDES IlmBase::IlmBaseConfig INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(ILMBASE_Imath_LIBRARY IlmBase::Imath INTERFACE_LINK_LIBRARIES)
+    get_target_property(ILMBASE_IMATH_LIBRARY IlmBase::Imath INTERFACE_LINK_LIBRARIES)
+    get_target_property(ILMBASE_HALF_LIBRARY IlmBase::Half INTERFACE_LINK_LIBRARIES)
+    get_target_property(OPENEXR_IEX_LIBRARY IlmBase::Iex INTERFACE_LINK_LIBRARIES)
+    get_target_property(OPENEXR_ILMTHREAD_LIBRARY IlmBase::IlmThread INTERFACE_LINK_LIBRARIES)
+    set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY} ${ILMBASE_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY})
+    set (ILMBASE_FOUND true)
+
+    get_target_property(OPENEXR_INCLUDES OpenEXR::IlmImfConfig INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::IlmImf INTERFACE_LINK_LIBRARIES)
+    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES})
+    set (OPENEXR_FOUND true)
+
+    # Link with pthreads if required
+    find_package (Threads)
+    if (CMAKE_USE_PTHREADS_INIT)
+        list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+    endif ()
+
+    # Correct for how old OpenEXR config exports set the directory one
+    # level lower than we prefer it.
+    string(REGEX REPLACE "include/OpenEXR$" "include" ILMBASE_INCLUDES "${ILMBASE_INCLUDES}")
+    string(REGEX REPLACE "include/OpenEXR$" "include" IMATH_INCLUDES "${IMATH_INCLUDES}")
+    string(REGEX REPLACE "include/OpenEXR$" "include" OPENEXR_INCLUDES "${OPENEXR_INCLUDES}")
+
+else ()
+    # OpenEXR 2.x older versions without a config or whose configs we don't
+    # trust.
+
+    set (FOUND_OPENEXR_WITH_CONFIG 0)
+
 # Other standard issue macros
 include (FindPackageHandleStandardArgs)
 include (SelectLibraryConfigurations)
@@ -63,21 +166,23 @@ find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
 # Try to figure out version number
 if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
     set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
-    string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
-    string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
+    set (OpenEXR_VERSION "${_OPENEXR_VERSION}")
+    string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OpenEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
+    string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OpenEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
 elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
     # Must be at least 2.0
     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
-    string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
+    string (REGEX MATCHALL "[0-9]+[.0-9]+" OpenEXR_VERSION ${TMP})
     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_MAJOR .*$")
-    string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MAJOR ${TMP})
+    string (REGEX MATCHALL "[0-9]+" OpenEXR_VERSION_MAJOR ${TMP})
     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_MINOR .*$")
-    string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MINOR ${TMP})
+    string (REGEX MATCHALL "[0-9]+" OpenEXR_VERSION_MINOR ${TMP})
 else ()
     # Assume an old one, predates 2.x that had versions
     set (OPENEXR_VERSION 1.6.1)
-    set (OPENEXR_MAJOR 1)
-    set (OPENEXR_MINOR 6)
+    set (OpenEXR_VERSION 1.6.1)
+    set (OpenEXR_VERSION_MAJOR 1)
+    set (OpenEXR_VERSION_MINOR 6)
 endif ()
 
 
@@ -119,9 +224,9 @@ foreach (COMPONENT ${_openexr_components})
     string (TOUPPER ${COMPONENT} UPPERCOMPONENT)
     # First try with the version embedded
     find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY
-                  NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}
+                  NAMES ${COMPONENT}-${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}
                         ${COMPONENT}
-                        ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d
+                        ${COMPONENT}-${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}_d
                         ${COMPONENT}_d
                   HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
                         ${GENERIC_LIBRARY_PATHS} )
@@ -131,17 +236,23 @@ find_package_handle_standard_args (OpenEXR
     REQUIRED_VARS ILMBASE_INCLUDE_PATH OPENEXR_INCLUDE_PATH
                   OPENEXR_IMATH_LIBRARY OPENEXR_ILMIMF_LIBRARY
                   OPENEXR_IEX_LIBRARY OPENEXR_HALF_LIBRARY
-    VERSION_VAR   OPENEXR_VERSION
     )
 
 if (OPENEXR_FOUND)
+    set (OPENEXR_VERSION_MAJOR ${OpenEXR_VERSION_MAJOR})
+    set (OPENEXR_VERSION_MINOR ${OpenEXR_VERSION_MINOR})
+    set (Imath_VERSION_MAJOR ${OpenEXR_VERSION_MAJOR})
+    set (Imath_VERSION_MINOR ${OpenEXR_VERSION_MINOR})
     set (ILMBASE_FOUND TRUE)
     set (ILMBASE_INCLUDES ${ILMBASE_INCLUDE_PATH})
+    set (IMATH_INCLUDES ${ILMBASE_INCLUDE_PATH})
     set (OPENEXR_INCLUDES ${OPENEXR_INCLUDE_PATH})
     set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH})
+    set (IMATH_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH})
     set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH})
     set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase")
     set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
+    set (FINDOPENEXR_FALLBACK TRUE)
 endif ()
 
 mark_as_advanced(
@@ -153,3 +264,5 @@ mark_as_advanced(
 
 # Restore the original CMAKE_FIND_LIBRARY_SUFFIXES
 set (CMAKE_FIND_LIBRARY_SUFFIXES ${_openexr_orig_suffixes})
+
+endif ()

src/cmake/modules/FindOpenImageIO.cmake

@@ -1,127 +0,0 @@
-###########################################################################
-# OpenImageIO   https://www.openimageio.org
-# Copyright 2008-present Contributors to the OpenImageIO project.
-# SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
-#
-# For an up-to-date version of this file, see:
-#   https://github.com/OpenImageIO/oiio/blob/master/src/cmake/Modules/FindOpenImageIO.cmake
-#
-###########################################################################
-#
-# CMake module to find OpenImageIO
-#
-# This module will set
-#   OpenImageIO_FOUND          True, if found
-#   OPENIMAGEIO_INCLUDES       directory where headers are found
-#   OPENIMAGEIO_LIBRARIES      libraries for OIIO
-#   OPENIMAGEIO_LIBRARY_DIRS   library dirs for OIIO
-#   OPENIMAGEIO_VERSION        Version ("major.minor.patch.tweak")
-#   OPENIMAGEIO_VERSION_MAJOR  Version major number
-#   OPENIMAGEIO_VERSION_MINOR  Version minor number
-#   OPENIMAGEIO_VERSION_PATCH  Version minor patch
-#   OPENIMAGEIO_VERSION_TWEAK  Version minor tweak
-#   OIIOTOOL_BIN               Path to oiiotool executable
-#
-# Imported targets:
-#   OpenImageIO::OpenImageIO   The libOpenImageIO library.
-#   OpenImageIO::oiiotool      The oiiotool executable.
-#
-# Special inputs:
-#   OpenImageIO_ROOT - if using CMake >= 3.12, will automatically search
-#                          this area for OIIO components.
-#   OPENIMAGEIO_ROOT_DIR - custom "prefix" location of OIIO installation
-#                          (expecting bin, lib, include subdirectories)
-#                          This is deprecated, but will work for a while.
-#   OpenImageIO_FIND_QUIETLY - if set, print minimal console output
-#   OIIO_LIBNAME_SUFFIX - if set, optional nonstandard library suffix
-#
-###########################################################################
-#
-# NOTE: This file is deprecated.
-#
-# In OIIO 2.1+, we generate OpenImageIOConfig.cmake files that are now the
-# preferred way for downstream projecs to find an installed OIIO. There
-# should be no need to copy this FindOpenImageIO.cmake file into downstream
-# projects, *unless* they need to work with a range of OIIO vesions that
-# may include <2.1, which would lack the generated config files.
-#
-###########################################################################
-
-
-# If 'OPENIMAGE_HOME' not set, use the env variable of that name if available
-if (NOT OPENIMAGEIO_ROOT_DIR AND NOT $ENV{OPENIMAGEIO_ROOT_DIR} STREQUAL "")
-    set (OPENIMAGEIO_ROOT_DIR $ENV{OPENIMAGEIO_ROOT_DIR})
-endif ()
-
-
-find_library ( OPENIMAGEIO_LIBRARY
-               NAMES OpenImageIO${OIIO_LIBNAME_SUFFIX}
-               HINTS ${OPENIMAGEIO_ROOT_DIR}
-               PATH_SUFFIXES lib64 lib )
-find_path ( OPENIMAGEIO_INCLUDE_DIR
-            NAMES OpenImageIO/imageio.h
-            HINTS ${OPENIMAGEIO_ROOT_DIR} )
-find_program ( OIIOTOOL_BIN
-               NAMES oiiotool
-               HINTS ${OPENIMAGEIO_ROOT_DIR} )
-
-# Try to figure out version number
-set (OIIO_VERSION_HEADER "${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/oiioversion.h")
-if (EXISTS "${OIIO_VERSION_HEADER}")
-    file (STRINGS "${OIIO_VERSION_HEADER}" TMP REGEX "^#define OIIO_VERSION_MAJOR .*$")
-    string (REGEX MATCHALL "[0-9]+" OPENIMAGEIO_VERSION_MAJOR ${TMP})
-    file (STRINGS "${OIIO_VERSION_HEADER}" TMP REGEX "^#define OIIO_VERSION_MINOR .*$")
-    string (REGEX MATCHALL "[0-9]+" OPENIMAGEIO_VERSION_MINOR ${TMP})
-    file (STRINGS "${OIIO_VERSION_HEADER}" TMP REGEX "^#define OIIO_VERSION_PATCH .*$")
-    string (REGEX MATCHALL "[0-9]+" OPENIMAGEIO_VERSION_PATCH ${TMP})
-    file (STRINGS "${OIIO_VERSION_HEADER}" TMP REGEX "^#define OIIO_VERSION_TWEAK .*$")
-    if (TMP)
-        string (REGEX MATCHALL "[0-9]+" OPENIMAGEIO_VERSION_TWEAK ${TMP})
-    else ()
-        set (OPENIMAGEIO_VERSION_TWEAK 0)
-    endif ()
-    set (OPENIMAGEIO_VERSION "${OPENIMAGEIO_VERSION_MAJOR}.${OPENIMAGEIO_VERSION_MINOR}.${OPENIMAGEIO_VERSION_PATCH}.${OPENIMAGEIO_VERSION_TWEAK}")
-endif ()
-
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (OpenImageIO
-    FOUND_VAR     OpenImageIO_FOUND
-    REQUIRED_VARS OPENIMAGEIO_INCLUDE_DIR OPENIMAGEIO_LIBRARY
-                  OPENIMAGEIO_VERSION
-    VERSION_VAR   OPENIMAGEIO_VERSION
-    )
-set (OPENIMAGEIO_FOUND ${OpenImageIO_FOUND})  # Old name
-
-if (OpenImageIO_FOUND)
-    set (OPENIMAGEIO_INCLUDES ${OPENIMAGEIO_INCLUDE_DIR})
-    set (OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
-    get_filename_component (OPENIMAGEIO_LIBRARY_DIRS "${OPENIMAGEIO_LIBRARY}" DIRECTORY)
-    if (NOT OpenImageIO_FIND_QUIETLY)
-        message ( STATUS "OpenImageIO includes     = ${OPENIMAGEIO_INCLUDE_DIR}" )
-        message ( STATUS "OpenImageIO libraries    = ${OPENIMAGEIO_LIBRARIES}" )
-        message ( STATUS "OpenImageIO library_dirs = ${OPENIMAGEIO_LIBRARY_DIRS}" )
-        message ( STATUS "OpenImageIO oiiotool     = ${OIIOTOOL_BIN}" )
-    endif ()
-
-    if (NOT TARGET OpenImageIO::OpenImageIO)
-        add_library(OpenImageIO::OpenImageIO UNKNOWN IMPORTED)
-        set_target_properties(OpenImageIO::OpenImageIO PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${OPENIMAGEIO_INCLUDES}")
-
-        set_property(TARGET OpenImageIO::OpenImageIO APPEND PROPERTY
-            IMPORTED_LOCATION "${OPENIMAGEIO_LIBRARIES}")
-    endif ()
-
-    if (NOT TARGET OpenImageIO::oiiotool AND EXISTS "${OIIOTOOL_BIN}")
-        add_executable(OpenImageIO::oiiotool IMPORTED)
-        set_target_properties(OpenImageIO::oiiotool PROPERTIES
-            IMPORTED_LOCATION "${OIIOTOOL_BIN}")
-    endif ()
-endif ()
-
-mark_as_advanced (
-    OPENIMAGEIO_INCLUDE_DIR
-    OPENIMAGEIO_LIBRARY
-    )

src/cmake/modules/FindOpenJPEG.cmake

@@ -1,7 +1,7 @@
 # Module to find OpenJpeg.
 #
 # This module will first look into the directories defined by the variables:
-#   - OpenJpeg_ROOT
+#   - OpenJPEG_ROOT
 #
 # This module defines the following variables:
 #
@@ -17,7 +17,8 @@ macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
   string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
   find_path(${tmp_varname} ${includefile}
     PATHS ${${libpath_var}}
-    NO_DEFAULT_PATH
+    PATH_SUFFIXES openjpeg openjpeg-2.0 openjpeg-2.1 openjpeg-2.2
+                  openjpeg-2.3 openjpeg-2.4 openjpeg-2.5
   )
   if (${tmp_varname})
     mark_as_advanced (${tmp_varname})
@@ -31,12 +32,10 @@ macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
   find_library(${tmp_prefix}_LIBRARY_RELEASE
     NAMES ${libname}
     PATHS ${${libpath_var}}
-    NO_DEFAULT_PATH
   )
   find_library(${tmp_prefix}_LIBRARY_DEBUG
     NAMES ${libname}d ${libname}_d ${libname}debug ${libname}_debug
     PATHS ${${libpath_var}}
-    NO_DEFAULT_PATH
   )
   # Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
   select_library_configurations (${tmp_prefix})
@@ -56,22 +55,9 @@ endmacro ()
 
 # Generic search paths
 set (OpenJpeg_include_paths
-     /usr/local/include/openjpeg-2.3
-     /usr/local/include/openjpeg-2.2
-     /usr/local/include/openjpeg-2.1
-     /usr/local/include/openjpeg-2.0
-     /usr/local/include/openjpeg
-     /usr/local/include
-     /usr/include/openjpeg-2.3
-     /usr/include/openjpeg-2.2
-     /usr/include/openjpeg-2.1
-     /usr/include/openjpeg
      /usr/include
      /opt/local/include
-     /opt/local/include/openjpeg-2.3
-     /opt/local/include/openjpeg-2.2
-     /opt/local/include/openjpeg-2.1
-     /opt/local/include/openjpeg-2.0)
+    )
 
 set (OpenJpeg_library_paths
   /usr/lib
@@ -80,23 +66,6 @@ set (OpenJpeg_library_paths
   /sw/lib
   /opt/local/lib)
 
-if (OpenJpeg_ROOT)
-  set (OpenJpeg_library_paths
-       ${OpenJpeg_ROOT}/lib
-       ${OpenJpeg_ROOT}/lib64
-       ${OpenJpeg_ROOT}/bin
-       ${OpenJpeg_library_paths}
-      )
-  set (OpenJpeg_include_paths
-       ${OpenJpeg_ROOT}/include/openjpeg-2.3
-       ${OpenJpeg_ROOT}/include/openjpeg-2.2
-       ${OpenJpeg_ROOT}/include/openjpeg-2.1
-       ${OpenJpeg_ROOT}/include/openjpeg-2.0
-       ${OpenJpeg_ROOT}/include/openjpeg
-       ${OpenJpeg_ROOT}/include
-       ${OpenJpeg_include_paths}
-      )
-endif()
 
 
 # Locate the header files
@@ -149,7 +118,7 @@ else ()
 endif ()
 
 # Use the standard function to handle OPENJPEG_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (OpenJpeg
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (OpenJPEG
   VERSION_VAR OPENJPEG_VERSION
   REQUIRED_VARS OPENJPEG_INCLUDE_DIR ${OpenJpeg_libvars})
 

src/cmake/modules/FindOpenVDB.cmake

@@ -79,11 +79,11 @@ if (OpenVDB_FOUND)
     set(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY})
     set(OPENVDB_INCLUDES ${OPENVDB_INCLUDE_DIR})
 
-    if (NOT TARGET OpenVDB::OpenVDB)
-        add_library(OpenVDB::OpenVDB UNKNOWN IMPORTED)
-        set_target_properties(OpenVDB::OpenVDB PROPERTIES
+    if (NOT TARGET OpenVDB::openvdb)
+        add_library(OpenVDB::openvdb UNKNOWN IMPORTED)
+        set_target_properties(OpenVDB::openvdb PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${OPENVDB_INCLUDES}")
-        set_property(TARGET OpenVDB::OpenVDB APPEND PROPERTY
+        set_property(TARGET OpenVDB::openvdb APPEND PROPERTY
             IMPORTED_LOCATION "${OPENVDB_LIBRARIES}")
     endif ()
 endif ()

src/cmake/modules/FindPtex.cmake

@@ -92,13 +92,13 @@ if (PTEX_INCLUDE_DIR AND EXISTS "${PTEX_INCLUDE_DIR}/PtexVersion.h" )
     file(STRINGS "${PTEX_INCLUDE_DIR}/PtexVersion.h" TMP REGEX "^#define PtexAPIVersion.*$")
     string(REGEX MATCHALL "[0-9]+" API ${TMP})
     
-    file(STRINGS "${PTEX_INCLUDE_DIR}/PtexVersion.h" TMP REGEX "^#define PtexFileMajorVersion.*$")
+    file(STRINGS "${PTEX_INCLUDE_DIR}/PtexVersion.h" TMP REGEX "^#define PtexLibraryMajorVersion.*$")
     string(REGEX MATCHALL "[0-9]+" MAJOR ${TMP})
 
-    file(STRINGS "${PTEX_INCLUDE_DIR}/PtexVersion.h" TMP REGEX "^#define PtexFileMinorVersion.*$")
+    file(STRINGS "${PTEX_INCLUDE_DIR}/PtexVersion.h" TMP REGEX "^#define PtexLibraryMinorVersion.*$")
     string(REGEX MATCHALL "[0-9]+" MINOR ${TMP})
 
-    set(PTEX_VERSION ${API}.${MAJOR}.${MINOR})
+    set(PTEX_VERSION ${MAJOR}.${MINOR})
 
 elseif (PTEX_INCLUDE_DIR AND EXISTS "${PTEX_INCLUDE_DIR}/Ptexture.h" )
 
@@ -111,13 +111,13 @@ elseif (PTEX_INCLUDE_DIR AND EXISTS "${PTEX_INCLUDE_DIR}/Ptexture.h" )
     file(STRINGS "${PTEX_INCLUDE_DIR}/Ptexture.h" TMP REGEX "^#define PtexFileMinorVersion.*$")
     string(REGEX MATCHALL "[0-9]+" MINOR ${TMP})
 
-    set(PTEX_VERSION ${API}.${MAJOR}.${MINOR})
+    set(PTEX_VERSION ${MAJOR}.${MINOR})
 
 endif()
 
 include(FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(PTex
+find_package_handle_standard_args(Ptex
     REQUIRED_VARS
         PTEX_INCLUDE_DIR
         PTEX_LIBRARY
@@ -126,7 +126,19 @@ find_package_handle_standard_args(PTex
 )
 
 if (PTEX_FOUND)
+    set(Ptex_FOUND TRUE)
     set(PTEX_LIBRARIES ${PTEX_LIBRARY})
+    set(PTEX_INCLUDES ${PTEX_INCLUDE_DIR})
+    set(Ptex_VERSION ${PTEX_VERSION})
+    if (NOT TARGET Ptex::Ptex_dynamic)
+        add_library(Ptex::Ptex_dynamic UNKNOWN IMPORTED)
+        set_target_properties(Ptex::Ptex_dynamic PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${PTEX_INCLUDES}")
+        if (PTEX_LIBRARIES)
+            set_property(TARGET Ptex::Ptex_dynamic APPEND PROPERTY
+                IMPORTED_LOCATION "${PTEX_LIBRARIES}")
+        endif ()
+    endif ()
 else ()
     set (PTEX_INCLUDE_DIR "")
 endif()

src/cmake/modules/FindTBB.cmake

@@ -74,7 +74,7 @@
 #                           tbbmalloc, tbbmalloc_debug, tbb_preview, or 
 #                           tbb_preview_debug.
 #
-# The following varibles should be used to build and link with TBB:
+# The following variables should be used to build and link with TBB:
 #
 # * TBB_INCLUDE_DIRS - The include directory for TBB.
 # * TBB_LIBRARIES    - The libraries to link against to use TBB.
@@ -134,7 +134,7 @@ if(NOT TBB_FOUND)
   # Find the TBB include dir
   ##################################
   
-  find_path(TBB_INCLUDE_DIRS tbb/tbb.h
+  find_path(TBB_INCLUDE_DIRS tbb/tbb_stddef.h
       HINTS ${TBB_INCLUDE_DIR} ${TBB_SEARCH_DIR}
       PATHS ${TBB_DEFAULT_SEARCH_DIR})
   
@@ -208,7 +208,25 @@ if(NOT TBB_FOUND)
       REQUIRED_VARS TBB_INCLUDE_DIRS TBB_LIBRARIES
       HANDLE_COMPONENTS
       VERSION_VAR TBB_VERSION)
-  
-  mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARIES)
 
+  mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARIES)
+  set(_tbb_version_file)
+
+  # Add targets
+  if (TBB_FOUND)
+    if (NOT TARGET TBB::tbb)
+        add_library(TBB::tbb UNKNOWN IMPORTED)
+        set_target_properties(TBB::tbb PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIRS})
+        set_property(TARGET TBB::tbb APPEND PROPERTY
+            IMPORTED_LOCATION ${TBB_tbb_LIBRARY})
+    endif ()
+    if (NOT TARGET TBB::tbbmalloc)
+        add_library(TBB::tbbmalloc UNKNOWN IMPORTED)
+        set_target_properties(TBB::tbbmalloc PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIRS})
+        set_property(TARGET TBB::tbbmalloc APPEND PROPERTY
+            IMPORTED_LOCATION ${TBB_tbbmalloc_LIBRARY})
+    endif ()
+  endif()
 endif()

src/cmake/modules/FindWebP.cmake

@@ -0,0 +1,63 @@
+# Module to find Webp
+#
+# This module will first look into the directories defined by the variables:
+#   - Webp_ROOT, WEBP_INCLUDE_PATH, WEBP_LIBRARY_PATH
+#
+# This module defines the following variables:
+#
+# WebP_FOUND            True if Webp was found.
+# WEBP_INCLUDES         Where to find Webp headers
+# WEBP_LIBRARIES        List of libraries to link against when using Webp
+#
+# This doesn't work, because the webp headers don't seem to include any
+# definitions giving the version:
+# WEBP_VERSION          Version of Webp (e.g., 3.6.2)
+
+include (FindPackageHandleStandardArgs)
+
+find_path (WEBP_INCLUDE_DIR webp/encode.h
+           HINTS
+               ${WEBP_INCLUDE_PATH}
+               ENV WEBP_INCLUDE_PATH
+           DOC "The directory where Webp headers reside")
+
+find_library (WEBP_LIBRARY webp
+              HINTS
+                  ${WEBP_LIBRARY_PATH}
+                  ENV WEBP_LIBRARY_PATH)
+find_library (WEBPDEMUX_LIBRARY webpdemux
+              HINTS
+                  ${WEBP_LIBRARY_PATH}
+                  ENV WEBP_LIBRARY_PATH)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (WebP
+    REQUIRED_VARS   WEBP_INCLUDE_DIR
+                    WEBP_LIBRARY WEBPDEMUX_LIBRARY
+    )
+
+if (WebP_FOUND)
+    set (WEBP_INCLUDES "${WEBP_INCLUDE_DIR}")
+    set (WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY})
+
+    if (NOT TARGET WebP::WebP)
+        add_library(WebP::WebP UNKNOWN IMPORTED)
+        set_target_properties(WebP::WebP PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES ${WEBP_INCLUDES})
+        set_property(TARGET WebP::WebP APPEND PROPERTY
+            IMPORTED_LOCATION ${WEBP_LIBRARY})
+    endif ()
+    if (NOT TARGET WebP::WebPDemux)
+        add_library(WebP::WebPDemux UNKNOWN IMPORTED)
+        set_target_properties(WebP::WebPDemux PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES ${WEBP_INCLUDES})
+        set_property(TARGET WebP::WebPDemux APPEND PROPERTY
+            IMPORTED_LOCATION ${WEBPDEMUX_LIBRARY})
+    endif ()
+endif ()
+
+mark_as_advanced (
+    WEBP_INCLUDE_DIR
+    WEBP_LIBRARY
+    WEBPDEMUX_LIBRARY
+    )

src/cmake/modules/FindWebp.cmake

@@ -1,49 +0,0 @@
-# Module to find Webp
-#
-# This module will first look into the directories defined by the variables:
-#   - Webp_ROOT, WEBP_INCLUDE_PATH, WEBP_LIBRARY_PATH
-#
-# This module defines the following variables:
-#
-# Webp_FOUND            True if Webp was found.
-# WEBP_INCLUDES         Where to find Webp headers
-# WEBP_LIBRARIES        List of libraries to link against when using Webp
-# WEBP_VERSION          Version of Webp (e.g., 3.6.2)
-
-include (FindPackageHandleStandardArgs)
-
-find_path (WEBP_INCLUDE_DIR webp/encode.h
-           HINTS
-               ${WEBP_INCLUDE_PATH}
-               ENV WEBP_INCLUDE_PATH
-           DOC "The directory where Webp headers reside")
-
-find_library (WEBP_LIBRARY webp
-              HINTS
-                  ${WEBP_LIBRARY_PATH}
-                  ENV WEBP_LIBRARY_PATH
-              DOC "The directory where Webp libraries reside")
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Webp
-    REQUIRED_VARS   WEBP_INCLUDE_DIR
-                    WEBP_LIBRARY
-    )
-
-if (Webp_FOUND)
-    set (WEBP_INCLUDES "${WEBP_INCLUDE_DIR}")
-    set (WEBP_LIBRARIES "${WEBP_LIBRARY}")
-
-    if (NOT TARGET Webp::Webp)
-        add_library(Webp::Webp UNKNOWN IMPORTED)
-        set_target_properties(Webp::Webp PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${WEBP_INCLUDES}")
-        set_property(TARGET Webp::Webp APPEND PROPERTY
-            IMPORTED_LOCATION "${WEBP_LIBRARIES}")
-    endif ()
-endif ()
-
-mark_as_advanced (
-    WEBP_INCLUDE_DIR
-    WEBP_LIBRARY
-    )

src/cmake/modules/Findpugixml.cmake

@@ -0,0 +1,79 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+# Find the pugixml XML parsing library.
+#
+# Sets the usual variables expected for find_package scripts:
+#
+# PUGIXML_INCLUDES - header location
+# PUGIXML_LIBRARIES - library to link against
+# PUGIXML_FOUND - true if pugixml was found.
+
+# First try the config files and hope they're good enough
+find_package (pugixml CONFIG)
+
+if (TARGET pugixml::pugixml)
+    # New pugixml (>= 1.11) has nice config files we can rely on and makes a
+    # pugixml::pugixml target.
+    if (VERBOSE)
+        message (STATUS "Found CONFIG for pugixml (>=1.11)")
+    endif ()
+
+    set (PUGIXML_FOUND true)
+    set (pugixml_FOUND true)
+    get_target_property(PUGIXML_INCLUDES pugixml::pugixml INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(PUGIXML_LIBRARIES pugixml::pugixml INTERFACE_LINK_LIBRARIES)
+
+# elseif (TARGET pugixml)
+#     # But older pugixml (<= 1.10) has mediocre config files that are not
+#     # reliable in practice. They also only define a "pugixml" target but
+#     # not "pugixml::pugixml". So just fall through to the "no config" case
+#     # below, and figure everything out by hand.
+
+else ()
+    # If no config file is found for PugiXML, do it the old fashioned way.
+    find_path (PUGIXML_INCLUDE_DIR
+               NAMES pugixml.hpp
+               PATH_SUFFIXES pugixml-1.8 pugixml-1.9 pugixml-1.10)
+    set (pugixml_required_vars PUGIXML_INCLUDE_DIR)
+    find_library (PUGIXML_LIBRARY
+                  NAMES pugixml
+                  PATH_SUFFIXES pugixml-1.8 pugixml-1.9 pugixml-1.10)
+
+    if (PUGIXML_INCLUDE_DIR)
+        file (STRINGS "${PUGIXML_INCLUDE_DIR}/pugixml.hpp" TMP REGEX "define PUGIXML_VERSION .*$")
+        string (REGEX MATCHALL "[0-9]+" PUGIXML_CODED_VERSION ${TMP})
+        if (PUGIXML_CODED_VERSION VERSION_GREATER_EQUAL 1000)
+            math (EXPR PUGIXML_VERSION_MAJOR "${PUGIXML_CODED_VERSION} / 1000")
+            math (EXPR PUGIXML_VERSION_MINOR "(${PUGIXML_CODED_VERSION} % 1000) / 10")
+        else ()
+            math (EXPR PUGIXML_VERSION_MAJOR "${PUGIXML_CODED_VERSION} / 100")
+            math (EXPR PUGIXML_VERSION_MINOR "(${PUGIXML_CODED_VERSION} % 100) / 10")
+        endif ()
+        set (PUGIXML_VERSION ${PUGIXML_VERSION_MAJOR}.${PUGIXML_VERSION_MINOR})
+    endif ()
+
+    # Support the REQUIRED and QUIET arguments, and set PUGIXML_FOUND if found.
+    include (FindPackageHandleStandardArgs)
+    find_package_handle_standard_args (pugixml DEFAULT_MSG 
+                                       PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
+
+    if (PUGIXML_FOUND OR pugixml_FOUND)
+        set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR})
+        set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARY})
+
+        if (NOT TARGET pugixml::pugixml)
+            add_library(pugixml::pugixml UNKNOWN IMPORTED)
+            set_target_properties(pugixml::pugixml PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${PUGIXML_INCLUDES}")
+            if (PUGIXML_LIBRARIES)
+                set_property(TARGET pugixml::pugixml APPEND PROPERTY
+                    IMPORTED_LOCATION "${PUGIXML_LIBRARIES}")
+            endif ()
+        endif ()
+    endif ()
+
+    mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
+
+endif()

src/cmake/oiio_macros.cmake

@@ -1,257 +0,0 @@
-# Copyright 2008-present Contributors to the OpenImageIO project.
-# SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
-
-
-# Macro to add a build target for an IO plugin.
-#
-# Usage:
-#
-# add_oiio_plugin ( source1 [source2 ...]
-#                   [ NAME targetname ... ]
-#                   [ SRC source1 ... ]
-#                   [ INCLUDE_DIRS include_dir1 ... ]
-#                   [ LINK_LIBRARIES external_lib1 ... ]
-#                   [ DEFINITIONS -DFOO=bar ... ])
-#
-# The plugin name can be specified with NAME, otherwise is inferred from the
-# subdirectory name. The source files of the binary can be specifeied with
-# SRC, otherwise are inferred to be all the .cpp files within the
-# subdirectory. Optional compile DEFINITIONS, private INCLUDE_DIRS, and
-# priviate LINK_LIBRARIES may also be specified. The source is automatically
-# linked against OpenImageIO.
-#
-# The plugin may be disabled individually using any of the usual
-# check_is_enabled() conventions (e.g. -DENABLE_<format>=OFF).
-#
-# What goes on under the covers is quite different depending on whether
-# EMBEDPLUGINS is 0 or 1. If EMBEDPLUGINS is 0 (in which case this is
-# expected to be called *after* the OpenImageIO target is declared), it will
-# create a new target to build the full plugin. On the other hand, if
-# EMBEDPLUGINS is 1 (in which case this should be called *before* the
-# OpenImageIO target is declared), it will merely append the required
-# definitions, includs, and libraries to lists format_plugin_blah that will
-# be handed off too the setup of the later OpenImageIO target.
-#
-macro (add_oiio_plugin)
-    cmake_parse_arguments (_plugin "" "NAME" "SRC;INCLUDE_DIRS;LINK_LIBRARIES;DEFINITIONS" ${ARGN})
-       # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
-    get_filename_component (_plugin_name ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
-    if (NOT _plugin_NAME)
-        # If NAME is not supplied, infer target name (and therefore the
-        # executable name) from the directory name.
-        get_filename_component (_plugin_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-    endif ()
-    # if (NOT _plugin_SRC)
-    #     # If SRC is not supplied, assume local cpp files are its source.
-    #     file (GLOB _plugin_SRC *.cpp)
-    # endif ()
-    check_is_enabled (${_plugin_name} _enable_plugin)
-    if (_enable_plugin)
-        if (EMBEDPLUGINS)
-            # Add each source file to the libOpenImageIO_srcs, but it takes some
-            # bending over backwards to change it in the parent scope.
-            set (_plugin_all_source ${libOpenImageIO_srcs})
-            foreach (_plugin_source_file ${_plugin_UNPARSED_ARGUMENTS} )
-                list (APPEND _plugin_all_source "${CMAKE_CURRENT_SOURCE_DIR}/${_plugin_source_file}")
-            endforeach ()
-            set (libOpenImageIO_srcs "${_plugin_all_source}" PARENT_SCOPE)
-            set (format_plugin_definitions ${format_plugin_definitions} ${_plugin_DEFINITIONS} PARENT_SCOPE)
-            set (format_plugin_include_dirs ${format_plugin_include_dirs} ${_plugin_INCLUDE_DIRS} PARENT_SCOPE)
-            set (format_plugin_libs ${format_plugin_libs} ${_plugin_LINK_LIBRARIES} PARENT_SCOPE)
-        else ()
-            # Get the name of the current directory and use it as the target name.
-            get_filename_component (_plugin_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-            add_library (${_plugin_name} MODULE ${_plugin_UNPARSED_ARGUMENTS})
-            target_compile_definitions (${_plugin_name} PRIVATE
-                                        ${_plugin_DEFINITIONS}
-                                        OpenImageIO_EXPORTS)
-            target_include_directories (${_plugin_name} PRIVATE ${_plugin_INCLUDE_DIRS})
-            target_link_libraries (${_plugin_name} PUBLIC OpenImageIO
-                                                   PRIVATE ${_plugin_LINK_LIBRARIES})
-            set_target_properties (${_plugin_name} PROPERTIES PREFIX "" FOLDER "Plugins")
-            install_targets (${_plugin_name})
-        endif ()
-    else ()
-        message (STATUS "${ColorRed}Disabling ${_plugin_name} ${ColorReset}")
-        string (TOUPPER ${_plugin_name} _plugin_name_upper)
-        set (format_plugin_definitions ${format_plugin_definitions} DISABLE_${_plugin_name_upper} PARENT_SCOPE)
-    endif ()
-endmacro ()
-
-
-
-# Macro to add an executable build target. The executable name can be
-# specified with NAME, otherwise is inferred from the subdirectory name. The
-# source files of the binary can be specifeied with SRC, otherwise are
-# inferred to be all the .cpp files within the subdirectory. Optional
-# compile DEFINITIONS, private INCLUDE_DIRS, and priviate LINK_LIBRARIES may
-# also be specified.
-#
-# The executable may be disabled individually using any of the usual
-# check_is_enabled() conventions (e.g. -DENABLE_<executable>=OFF).
-#
-# Usage:
-#
-#   fancy_add_executable ([ NAME targetname ... ]
-#                         [ SRC source1 ... ]
-#                         [ INCLUDE_DIRS include_dir1 ... ]
-#                         [ DEFINITIONS -DFOO=bar ... ])
-#                         [ LINK_LIBRARIES external_lib1 ... ]
-#
-macro (fancy_add_executable)
-    cmake_parse_arguments (_target "" "NAME" "SRC;INCLUDE_DIRS;SYSTEM_INCLUDE_DIRS;LINK_LIBRARIES;DEFINITIONS" ${ARGN})
-       # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
-    if (NOT _target_NAME)
-        # If NAME is not supplied, infer target name (and therefore the
-        # executable name) from the directory name.
-        get_filename_component (_target_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-    endif ()
-    if (NOT _target_SRC)
-        # If SRC is not supplied, assume local cpp files are its source.
-        file (GLOB _target_SRC *.cpp)
-    endif ()
-    check_is_enabled (${_target_NAME} _target_NAME_enabled)
-    if (_target_NAME_enabled)
-        add_executable (${_target_NAME} ${_target_SRC})
-        if (_target_INCLUDE_DIRS)
-            target_include_directories (${_target_NAME} PRIVATE ${_target_INCLUDE_DIRS})
-        endif ()
-        if (_target_SYSTEM_INCLUDE_DIRS)
-            target_include_directories (${_target_NAME} SYSTEM PRIVATE ${_target_SYSTEM_INCLUDE_DIRS})
-        endif ()
-        if (_target_DEFINITIONS)
-            target_compile_definitions (${_target_name} PRIVATE ${_target_DEFINITIONS})
-        endif ()
-        if (_target_LINK_LIBRARIES)
-            target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES})
-        endif ()
-        set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools")
-        install_targets (${_target_NAME})
-    else ()
-        message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}")
-    endif ()
-endmacro ()
-
-
-
-# oiio_set_testenv() - add environment variables to a test
-#
-# Usage:
-#   oiio_set_testenv ( testname
-#                      testsuite  - The root of all tests ${CMAKE_SOURCE_DIR}/testsuite
-#                      testsrcdir - Current test directory in ${CMAKE_SOURCE_DIR}
-#                      testdir    - Current test sandbox in ${CMAKE_BINARY_DIR}
-#                      IMAGEDIR   - Optional path to image reference/compare directory)
-#
-macro (oiio_set_testenv testname testsuite testsrcdir testdir IMAGEDIR)
-    set_property(TEST ${testname} PROPERTY ENVIRONMENT
-                "OIIO_TESTSUITE_ROOT=${testsuite}"
-                ";OIIO_TESTSUITE_SRC=${testsrcdir}"
-                ";OIIO_TESTSUITE_CUR=${testdir}")
-    if (NOT ${IMAGEDIR} STREQUAL "")
-        set_property(TEST ${testname} APPEND PROPERTY ENVIRONMENT
-                     "OIIO_TESTSUITE_IMAGEDIR=${IMAGEDIR}")
-    endif()
-endmacro ()
-
-
-# oiio_add_tests() - add a set of test cases.
-#
-# Usage:
-#   oiio_add_tests ( test1 [ test2 ... ]
-#                    [ IMAGEDIR name_of_reference_image_directory ]
-#                    [ URL http://find.reference.cases.here.com ]
-#                    [ FOUNDVAR variable_name ... ]
-#                    [ ENABLEVAR variable_name ... ]
-#                  )
-#
-# The optional argument IMAGEDIR is used to check whether external test images
-# (not supplied with OIIO) are present, and to disable the test cases if
-# they're not.  If IMAGEDIR is present, URL should also be included to tell
-# the user where to find such tests.
-#
-# The optional FOUNDVAR introduces variables (typically Foo_FOUND) that if
-# not existing and true, will skip the test.
-#
-# The optional ENABLEVAR introduces variables (typically ENABLE_Foo) that
-# if existing and yet false, will skip the test.
-#
-macro (oiio_add_tests)
-    cmake_parse_arguments (_ats "" "" "URL;IMAGEDIR;LABEL;FOUNDVAR;ENABLEVAR;TESTNAME" ${ARGN})
-       # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
-    set (_ats_testdir "${OIIO_TESTSUITE_IMAGEDIR}/${_ats_IMAGEDIR}")
-    # If there was a FOUNDVAR param specified and that variable name is
-    # not defined, mark the test as broken.
-    foreach (_var ${_ats_FOUNDVAR})
-        if (NOT ${_var})
-            set (_ats_LABEL "broken")
-        endif ()
-    endforeach ()
-    foreach (_var ${_ats_ENABLEVAR})
-        if ((NOT "${${_var}}" STREQUAL "" AND NOT "${${_var}}") OR
-            (NOT "$ENV{${_var}}" STREQUAL "" AND NOT "$ENV{${_var}}"))
-            set (_ats_LABEL "broken")
-        endif ()
-    endforeach ()
-    if (_ats_IMAGEDIR AND NOT EXISTS ${_ats_testdir})
-        # If the directory containig reference data (images) for the test
-        # isn't found, point the user at the URL.
-        message (STATUS "\n\nDid not find ${_ats_testdir}")
-        message (STATUS "  -> Will not run tests ${_ats_UNPARSED_ARGUMENTS}")
-        message (STATUS "  -> You can find it at ${_ats_URL}\n")
-    else ()
-        # Add the tests if all is well.
-        set (_has_generator_expr TRUE)
-        foreach (_testname ${_ats_UNPARSED_ARGUMENTS})
-            set (_testsuite "${CMAKE_SOURCE_DIR}/testsuite")
-            set (_testsrcdir "${_testsuite}/${_testname}")
-            set (_testdir "${CMAKE_BINARY_DIR}/testsuite/${_testname}")
-            if (_ats_TESTNAME)
-                set (_testname "${_ats_TESTNAME}")
-            endif ()
-            if (_ats_LABEL MATCHES "broken")
-                set (_testname "${_testname}-broken")
-            endif ()
-
-            set (_runtest ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/testsuite/runtest.py" ${_testdir})
-            if (MSVC_IDE)
-                set (_runtest ${_runtest} --devenv-config $<CONFIGURATION>
-                                          --solution-path "${CMAKE_BINARY_DIR}" )
-            endif ()
-
-            file (MAKE_DIRECTORY "${_testdir}")
-
-            add_test ( NAME ${_testname}
-                       COMMAND ${_runtest} )
-
-            oiio_set_testenv("${_testname}" "${_testsuite}"
-                             "${_testsrcdir}" "${_testdir}" "${_ats_testdir}")
-
-            # For texture tests, add a second test using batch mode as well.
-            if (_testname MATCHES "texture")
-                set (_testname ${_testname}.batch)
-                set (_testdir ${_testdir}.batch)
-                set (_runtest ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/testsuite/runtest.py" ${_testdir})
-                if (MSVC_IDE)
-                    set (_runtest ${_runtest} --devenv-config $<CONFIGURATION>
-                                          --solution-path "${CMAKE_BINARY_DIR}" )
-                endif ()
-                file (MAKE_DIRECTORY "${_testdir}")
-                add_test ( NAME "${_testname}"
-                           COMMAND env TESTTEX_BATCH=1 ${_runtest} )
-
-                oiio_set_testenv("${_testname}" "${_testsuite}"
-                                 "${_testsrcdir}" "${_testdir}.batch" "${_ats_testdir}")
-            endif ()
-
-            #if (VERBOSE)
-            #    message (STATUS "TEST ${_testname}: ${_runtest}")
-            #endif ()
-        endforeach ()
-        if (VERBOSE)
-           message (STATUS "TESTS: ${_ats_UNPARSED_ARGUMENTS}")
-        endif ()
-    endif ()
-endmacro ()
-

src/cmake/packaging.cmake

@@ -0,0 +1,54 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio/
+
+#########################################################################
+# Packaging
+set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+# "Vendor" is only used in copyright notices, so we use the same thing that
+# the rest of the copyright notices say.
+set (CPACK_PACKAGE_VENDOR ${PROJECT_AUTHORS})
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenImageIO is an open source library for reading and writing image file formats, a nice format-agnostic image viewer, and other image-related classes and utilities.")
+set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/src/doc/Description.txt")
+set (CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+#SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_SOURCE_DIR}")
+file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/cpack")
+file (COPY "${PROJECT_SOURCE_DIR}/LICENSE.md" DESTINATION "${CMAKE_BINARY_DIR}/cpack")
+file (RENAME "${CMAKE_BINARY_DIR}/cpack/LICENSE.md" "${CMAKE_BINARY_DIR}/cpack/License.txt")
+set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/cpack/License.txt")
+file (COPY "${PROJECT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_BINARY_DIR}/cpack")
+set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/cpack/README.md")
+set (CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/src/doc/Welcome.txt")
+#SET (CPACK_STRIP_FILES Do we need this?)
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    set (CPACK_GENERATOR "TGZ;STGZ;RPM;DEB")
+    set (CPACK_SOURCE_GENERATOR "TGZ")
+endif ()
+if (APPLE)
+    set (CPACK_GENERATOR "TGZ;STGZ;PackageMaker")
+    set (CPACK_SOURCE_GENERATOR "TGZ")
+endif ()
+if (WIN32)
+    set (CPACK_GENERATOR "NSIS")
+    set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer")
+#    set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer")
+    set(CPACK_NSIS_MODIFY_PATH ON)
+    include (InstallRequiredSystemLibraries)
+endif ()
+set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-source)
+#set (CPACK_SOURCE_STRIP_FILES Do we need this?)
+set (CPACK_SOURCE_IGNORE_FILES ".*~")
+set (CPACK_COMPONENT_UNSPECIFIED_HIDDEN TRUE)
+set (CPACK_COMPONENT_UNSPECIFIED_REQUIRED TRUE)
+set (CPACK_COMPONENTS_ALL user developer documentation Unspecified)
+set (CPACK_COMPONENT_USER_DISPLAY_NAME "Applications")
+set (CPACK_COMPONENT_DEVELOPER_DISPLAY_NAME "Developer files")
+set (CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+set (CPACK_COMPONENT_USER_DESCRIPTION
+     "Applications: oiiotool, iv, iinfo, iconvert, idiff, igrep, maketx and libraries")
+set (CPACK_COMPONENT_DEVELOPER_DESCRIPTION "Include files")
+set (CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "OpenImageIO documentation")
+set (CPACK_COMPONENT_DEVELOPER_DEPENDS user)
+include (CPack)

src/cmake/pythonutils.cmake

@@ -1,21 +1,22 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 # Python-related options.
 option (USE_PYTHON "Build the Python bindings" ON)
-set (PYTHON_VERSION "2.7" CACHE STRING "Target version of python to find")
+set (PYTHON_VERSION "" CACHE STRING "Target version of python to find")
 option (PYLIB_INCLUDE_SONAME "If ON, soname/soversion will be set for Python module library" OFF)
 option (PYLIB_LIB_PREFIX "If ON, prefix the Python module with 'lib'" OFF)
 set (PYMODULE_SUFFIX "" CACHE STRING "Suffix to add to Python module init namespace")
+if (WIN32)
+    set (PYLIB_LIB_TYPE SHARED CACHE STRING "Type of library to build for python module (MODULE or SHARED)")
+else ()
+    set (PYLIB_LIB_TYPE MODULE CACHE STRING "Type of library to build for python module (MODULE or SHARED)")
+endif ()
 
 
 # Find Python. This macro should only be called if python is required. If
 # Python cannot be found, it will be a fatal error.
-# Variables set by this macro:
-#    PYTHON_INCLUDES_PATH - directory where python headers are found
-#    PYTHON_LIBRARIES     - python libraries to link
-#    PYTHON_SITE_DIR      - our own install dir where our python moduels go
 macro (find_python)
     if (NOT VERBOSE)
         set (PythonInterp_FIND_QUIETLY true)
@@ -24,31 +25,38 @@ macro (find_python)
 
     # Attempt to find the desired version, but fall back to other
     # additional versions.
-    checked_find_package (PythonInterp ${PYTHON_VERSION} REQUIRED)
+    unset (_req)
+    if (USE_PYTHON)
+        set (_req REQUIRED)
+        if (PYTHON_VERSION)
+            list (APPEND _req EXACT)
+        endif ()
+    endif ()
+    checked_find_package (Python ${PYTHON_VERSION}
+                          ${_req}
+                          COMPONENTS Interpreter Development
+                          PRINT Python_VERSION Python_EXECUTABLE
+                                Python_LIBRARIES
+                                Python_Development_FOUND
+                                Python_Interpreter_FOUND )
 
     # The version that was found may not be the default or user
     # defined one.
-    set (PYTHON_VERSION_FOUND ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+    set (PYTHON_VERSION_FOUND ${Python_VERSION_MAJOR}.${Python_VERSION_MINOR})
 
-    if (NOT ${PYTHON_VERSION} VERSION_EQUAL ${PYTHON_VERSION_FOUND} )
-        message (WARNING "The requested version ${PYTHON_VERSION} was not found.") 
-        message (WARNING "Using ${PYTHON_VERSION_FOUND} instead.")
-    endif ()
-
-    checked_find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
-    if (VERBOSE)
-        message (STATUS "    Python include dirs ${PYTHON_INCLUDE_PATH}")
-        message (STATUS "    Python libraries    ${PYTHON_LIBRARIES}")
-        message (STATUS "    Python site packages dir ${PYTHON_SITE_DIR}")
-        message (STATUS "    Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
-        message (STATUS "    Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
-        message (STATUS "    Python version ${PYTHON_VERSION_STRING}")
-        message (STATUS "    Python version major: ${PYTHON_VERSION_MAJOR} minor: ${PYTHON_VERSION_MINOR}")
-    endif ()
+    # Give hints to subsequent pybind11 searching to ensure that it finds
+    # exactly the same version that we found.
+    set (PythonInterp_FIND_VERSION PYTHON_VERSION_FOUND)
+    set (PythonInterp_FIND_VERSION_MAJOR ${Python_VERSION_MAJOR})
 
     if (NOT DEFINED PYTHON_SITE_DIR)
         set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages")
     endif ()
+    if (VERBOSE)
+        message (STATUS "    Python site packages dir ${PYTHON_SITE_DIR}")
+        message (STATUS "    Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
+        message (STATUS "    Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
+    endif ()
 endmacro()
 
 
@@ -56,7 +64,7 @@ endmacro()
 # pybind11
 
 macro (setup_python_module)
-    cmake_parse_arguments (lib "" "TARGET;MODULE;LIBS" "SOURCES" ${ARGN})
+    cmake_parse_arguments (lib "" "TARGET;MODULE" "SOURCES;LIBS" ${ARGN})
     # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
 
     set (target_name ${lib_TARGET})
@@ -66,20 +74,22 @@ macro (setup_python_module)
         set_property (SOURCE ${lib_SOURCES} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-macro-redefined ")
     endif ()
 
-    # Add the library itself
-    add_library (${target_name} MODULE ${lib_SOURCES})
-
-    # Set up include dirs for python & pybind11
-    target_include_directories (${target_name} SYSTEM PRIVATE ${PYTHON_INCLUDE_PATH})
+    pybind11_add_module(${target_name} ${PYLIB_LIB_TYPE} ${lib_SOURCES})
 
+#    # Add the library itself
+#    add_library (${target_name} MODULE ${lib_SOURCES})
+#
     # Declare the libraries it should link against
-    target_link_libraries (${target_name} PRIVATE
-                           pybind11::pybind11 ${lib_LIBS} ${SANITIZE_LIBRARIES})
-    if (APPLE)
-        set_target_properties (${target_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-    else ()
-        target_link_libraries (${target_name} PRIVATE ${PYTHON_LIBRARIES})
+    target_link_libraries (${target_name}
+                           PRIVATE ${lib_LIBS} ${SANITIZE_LIBRARIES})
+
+    set (_module_LINK_FLAGS "${VISIBILITY_MAP_COMMAND} ${EXTRA_DSO_LINK_ARGS}")
+    if (UNIX AND NOT APPLE)
+        # Hide symbols from any static dependent libraries embedded here.
+        set (_module_LINK_FLAGS "${_module_LINK_FLAGS} -Wl,--exclude-libs,ALL")
     endif ()
+    set_target_properties (${target_name} PROPERTIES LINK_FLAGS ${_module_LINK_FLAGS})
+
 
     # Exclude the 'lib' prefix from the name
     if (NOT PYLIB_LIB_PREFIX)
@@ -87,7 +97,8 @@ macro (setup_python_module)
                                    PRIVATE "PYMODULE_NAME=${lib_MODULE}")
         set_target_properties (${target_name} PROPERTIES
                                OUTPUT_NAME ${lib_MODULE}
-                               PREFIX "")
+                               # PREFIX ""
+                               )
     else ()
         target_compile_definitions(${target_name}
                                    PRIVATE "PYMODULE_NAME=Py${lib_MODULE}")
@@ -96,6 +107,12 @@ macro (setup_python_module)
                                PREFIX lib)
     endif ()
 
+    # Even if using a debug postfix, don't use it for the python module, or
+    # python won't find it properly.
+    set_target_properties(PyOpenImageIO PROPERTIES
+                          DEBUG_POSTFIX "")
+
+    # This is only needed for SpComp2
     if (PYLIB_INCLUDE_SONAME)
         if (VERBOSE)
             message(STATUS "Setting Py${lib_MODULE} SOVERSION to: ${SOVERSION}")
@@ -105,11 +122,11 @@ macro (setup_python_module)
             SOVERSION ${SOVERSION} )
     endif()
 
-    if (WIN32)
-        set_target_properties (${target_name} PROPERTIES
-                               DEBUG_POSTFIX "_d"
-                               SUFFIX ".pyd")
-    endif()
+#    if (WIN32)
+#        set_target_properties (${target_name} PROPERTIES
+#                               DEBUG_POSTFIX "_d"
+#                               SUFFIX ".pyd")
+#    endif()
 
     # In the build area, put it in lib/python so it doesn't clash with the
     # non-python libraries of the same name (which aren't prefixed by "lib"

src/cmake/testing.cmake

@@ -0,0 +1,371 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio/
+
+include (CTest)
+
+# Make a build/platform/testsuite directory, and copy the master runtest.py
+# there. The rest is up to the tests themselves.
+file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/testsuite")
+file (COPY "${CMAKE_CURRENT_SOURCE_DIR}/testsuite/common"
+      DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/testsuite")
+add_custom_command (OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/testsuite/runtest.py"
+                    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                        "${CMAKE_CURRENT_SOURCE_DIR}/testsuite/runtest.py"
+                        "${CMAKE_CURRENT_BINARY_DIR}/testsuite/runtest.py"
+                    MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/testsuite/runtest.py")
+add_custom_target ( CopyFiles ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/testsuite/runtest.py" )
+
+# set(OIIO_TESTSUITE_IMAGEDIR "${PROJECT_SOURCE_DIR}/.." CACHE PATH
+set(OIIO_TESTSUITE_IMAGEDIR "${PROJECT_BINARY_DIR}/testsuite" CACHE PATH
+    "Location of oiio-images, openexr-images, libtiffpic, etc.." )
+
+
+
+# oiio_set_testenv() - add environment variables to a test
+#
+# Usage:
+#   oiio_set_testenv ( testname
+#                      testsuite  - The root of all tests ${CMAKE_SOURCE_DIR}/testsuite
+#                      testsrcdir - Current test directory in ${CMAKE_SOURCE_DIR}
+#                      testdir    - Current test sandbox in ${CMAKE_BINARY_DIR}
+#                      IMAGEDIR   - Optional path to image reference/compare directory)
+#
+macro (oiio_set_testenv testname testsuite testsrcdir testdir IMAGEDIR)
+    set_property(TEST ${testname} PROPERTY ENVIRONMENT
+                "OIIO_TESTSUITE_ROOT=${testsuite}"
+                ";OIIO_TESTSUITE_SRC=${testsrcdir}"
+                ";OIIO_TESTSUITE_CUR=${testdir}")
+    if (NOT ${IMAGEDIR} STREQUAL "")
+        set_property(TEST ${testname} APPEND PROPERTY ENVIRONMENT
+                     "OIIO_TESTSUITE_IMAGEDIR=${IMAGEDIR}")
+    endif()
+endmacro ()
+
+
+
+# oiio_add_tests() - add a set of test cases.
+#
+# Usage:
+#   oiio_add_tests ( test1 [ test2 ... ]
+#                    [ IMAGEDIR name_of_reference_image_directory ]
+#                    [ URL http://find.reference.cases.here.com ]
+#                    [ FOUNDVAR variable_name ... ]
+#                    [ ENABLEVAR variable_name ... ]
+#                  )
+#
+# The optional argument IMAGEDIR is used to check whether external test images
+# (not supplied with OIIO) are present, and to disable the test cases if
+# they're not.  If IMAGEDIR is present, URL should also be included to tell
+# the user where to find such tests.
+#
+# The optional FOUNDVAR introduces variables (typically Foo_FOUND) that if
+# not existing and true, will skip the test.
+#
+# The optional ENABLEVAR introduces variables (typically ENABLE_Foo) that
+# if existing and yet false, will skip the test.
+#
+macro (oiio_add_tests)
+    cmake_parse_arguments (_ats "" "" "URL;IMAGEDIR;LABEL;FOUNDVAR;ENABLEVAR;TESTNAME" ${ARGN})
+       # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
+    set (_ats_testdir "${OIIO_TESTSUITE_IMAGEDIR}/${_ats_IMAGEDIR}")
+    # If there was a FOUNDVAR param specified and that variable name is
+    # not defined, mark the test as broken.
+    foreach (_var ${_ats_FOUNDVAR})
+        if (NOT ${_var})
+            set (_ats_LABEL "broken")
+        endif ()
+    endforeach ()
+    set (_test_disabled 0)
+    foreach (_var ${_ats_ENABLEVAR})
+        if ((NOT "${${_var}}" STREQUAL "" AND NOT "${${_var}}") OR
+            (NOT "$ENV{${_var}}" STREQUAL "" AND NOT "$ENV{${_var}}"))
+            set (_ats_LABEL "broken")
+            set (_test_disabled 1)
+        endif ()
+    endforeach ()
+    if (_test_disabled)
+        message (STATUS "Skipping test(s) ${_ats_UNPARSED_ARGUMENTS} because of disabled ${_ats_ENABLEVAR}")
+    elseif (_ats_IMAGEDIR AND NOT EXISTS ${_ats_testdir})
+        # If the directory containing reference data (images) for the test
+        # isn't found, point the user at the URL.
+        message (STATUS "\n\nDid not find ${_ats_testdir}")
+        message (STATUS "  -> Will not run tests ${_ats_UNPARSED_ARGUMENTS}")
+        message (STATUS "  -> You can find it at ${_ats_URL}\n")
+    else ()
+        # Add the tests if all is well.
+        set (_has_generator_expr TRUE)
+        foreach (_testname ${_ats_UNPARSED_ARGUMENTS})
+            set (_testsuite "${CMAKE_SOURCE_DIR}/testsuite")
+            set (_testsrcdir "${_testsuite}/${_testname}")
+            set (_testdir "${CMAKE_BINARY_DIR}/testsuite/${_testname}")
+            if (_ats_TESTNAME)
+                set (_testname "${_ats_TESTNAME}")
+            endif ()
+            if (_ats_LABEL MATCHES "broken")
+                set (_testname "${_testname}-broken")
+            endif ()
+
+            set (_runtest ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/testsuite/runtest.py" ${_testdir})
+            if (MSVC_IDE)
+                set (_runtest ${_runtest} --devenv-config $<CONFIGURATION>
+                                          --solution-path "${CMAKE_BINARY_DIR}" )
+            endif ()
+
+            file (MAKE_DIRECTORY "${_testdir}")
+
+            add_test ( NAME ${_testname}
+                       COMMAND ${_runtest} )
+
+            oiio_set_testenv("${_testname}" "${_testsuite}"
+                             "${_testsrcdir}" "${_testdir}" "${_ats_testdir}")
+
+            # For texture tests, add a second test using batch mode as well.
+            if (_testname MATCHES "texture")
+                set (_testname ${_testname}.batch)
+                set (_testdir ${_testdir}.batch)
+                set (_runtest ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/testsuite/runtest.py" ${_testdir})
+                if (MSVC_IDE)
+                    set (_runtest ${_runtest} --devenv-config $<CONFIGURATION>
+                                          --solution-path "${CMAKE_BINARY_DIR}" )
+                endif ()
+                file (MAKE_DIRECTORY "${_testdir}")
+                add_test ( NAME "${_testname}"
+                           COMMAND env TESTTEX_BATCH=1 ${_runtest} )
+
+                oiio_set_testenv("${_testname}" "${_testsuite}"
+                                 "${_testsrcdir}" "${_testdir}.batch" "${_ats_testdir}")
+            endif ()
+
+            #if (VERBOSE)
+            #    message (STATUS "TEST ${_testname}: ${_runtest}")
+            #endif ()
+        endforeach ()
+        if (VERBOSE)
+           message (STATUS "TESTS: ${_ats_UNPARSED_ARGUMENTS}")
+        endif ()
+    endif ()
+endmacro ()
+
+
+
+# The tests are organized into a macro so it can be called after all the
+# directories with plugins are included.
+#
+macro (oiio_add_all_tests)
+    #   Tests that require oiio-images:
+    oiio_add_tests (gpsread
+                    oiiotool oiiotool-attribs oiiotool-copy
+                    oiiotool-xform
+                    maketx oiiotool-maketx
+                    misnamed-file
+                    texture-crop texture-cropover
+                    texture-filtersize
+                    texture-filtersize-stochastic
+                    texture-overscan
+                    texture-wrapfill
+                    texture-res texture-maxres
+                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images"
+                   )
+
+    #   Remaining freestanding tests:
+    oiio_add_tests (
+                    cmake-consumer
+                    nonwhole-tiles
+                    oiiotool-composite oiiotool-control
+                    oiiotool-fixnan
+                    oiiotool-pattern
+                    oiiotool-readerror
+                    oiiotool-subimage oiiotool-text
+                    diff
+                    dither dup-channels
+                    jpeg-corrupt
+                    missingcolor
+                    null
+                    rational
+                    texture-derivs texture-fill
+                    texture-flipt texture-gettexels texture-gray
+                    texture-interp-bicubic
+                    texture-blurtube
+                    texture-half texture-uint16
+                    texture-interp-bilinear
+                    texture-interp-closest
+                    texture-mip-nomip texture-mip-onelevel
+                    texture-mip-trilinear
+                    texture-mip-stochastictrilinear
+                    texture-mip-stochasticaniso
+                    texture-missing
+                    texture-pointsample
+                    texture-udim texture-udim2
+                    texture-uint8
+                    texture-width0blur
+                    texture-fat texture-skinny
+                   )
+
+    # Add tests that require the Python bindings if we built the Python
+    # bindings. This is mostly the test that are specifically about testing
+    # the Python bindings themselves, but also a handful of tests that are
+    # mainly about other things but happen to use Python in order to perform
+    # thee test.
+    # We also exclude these tests if this is a sanitizer build on Linux,
+    # because the Python interpreter itself won't be linked with the right asan
+    # libraries to run correctly.
+    if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY AND NOT SANITIZE_ON_LINUX)
+        oiio_add_tests (
+                python-typedesc python-paramlist
+                python-imagespec python-roi python-deep python-colorconfig
+                python-imageinput python-imageoutput
+                python-imagebuf python-imagebufalgo
+                python-texturesys
+                IMAGEDIR oiio-images
+                )
+    endif ()
+
+    oiio_add_tests (oiiotool-color
+                    FOUNDVAR OPENCOLORIO_FOUND)
+
+    if (NOT DEFINED ENV{${PROJECT_NAME}_CI})
+        oiio_add_tests (texture-icwrite)
+    endif ()
+
+    # List testsuites for specific formats or features which might be not found
+    # or be intentionally disabled, or which need special external reference
+    # images from the web that if not found, should skip the tests:
+    oiio_add_tests (bmp
+                    ENABLEVAR ENABLE_BMP
+                    IMAGEDIR oiio-images/bmpsuite)
+    oiio_add_tests (dpx
+                    ENABLEVAR ENABLE_DPX
+                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+    oiio_add_tests (dds
+                    ENABLEVAR ENABLE_DDS
+                    IMAGEDIR oiio-images/dds URL "Recent checkout of oiio-images")
+    oiio_add_tests (fits
+                    ENABLEVAR ENABLE_FITS
+                    IMAGEDIR fits-images
+                    URL http://www.cv.nrao.edu/fits/data/tests/)
+    oiio_add_tests (gif
+                    FOUNDVAR GIF_FOUND ENABLEVAR ENABLE_GIF
+                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+    oiio_add_tests (hdr
+                    ENABLEVAR ENABLE_HDR
+                    IMAGEDIR openexr-images
+                    URL http://github.com/AcademySoftwareFoundation/openexr-images)
+    oiio_add_tests (heif
+                    FOUNDVAR Libheif_FOUND ENABLEVAR ENABLE_Libheif
+                    URL https://github.com/nokiatech/heif/tree/gh-pages/content)
+    oiio_add_tests (ico
+                    ENABLEVAR ENABLE_ICO
+                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+    oiio_add_tests (iff
+                    ENABLEVAR ENABLE_IFF
+                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+    oiio_add_tests (jpeg2000
+                    FOUNDVAR OPENJPEG_FOUND
+                    IMAGEDIR j2kp4files_v1_5
+                    URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
+    oiio_add_tests (openexr-suite openexr-multires openexr-chroma
+                    openexr-v2 openexr-window perchannel
+                    oiiotool-deep
+                    IMAGEDIR openexr-images
+                    URL http://github.com/AcademySoftwareFoundation/openexr-images)
+    if (NOT DEFINED ENV{${PROJECT_NAME}_CI})
+        oiio_add_tests (openexr-damaged
+                        IMAGEDIR openexr-images
+                        URL http://github.com/AcademySoftwareFoundation/openexr-images)
+    endif ()
+    oiio_add_tests (openvdb texture-texture3d
+                    FOUNDVAR OpenVDB_FOUND ENABLEVAR ENABLE_OpenVDB)
+    oiio_add_tests (png
+                    ENABLEVAR ENABLE_PNG
+                    IMAGEDIR oiio-images)
+    oiio_add_tests (pnm
+                    ENABLEVAR ENABLE_PNM
+                    IMAGEDIR oiio-images)
+    oiio_add_tests (psd psd-colormodes
+                    ENABLEVAR ENABLE_PSD
+                    IMAGEDIR oiio-images)
+    oiio_add_tests (ptex
+                    FOUNDVAR PTEX_FOUND ENABLEVAR ENABLE_PTEX)
+    oiio_add_tests (raw
+                    FOUNDVAR LIBRAW_FOUND ENABLEVAR ENABLE_LIBRAW
+                    IMAGEDIR oiio-images/raw)
+    oiio_add_tests (rla
+                    ENABLEVAR ENABLE_RLA
+                    IMAGEDIR oiio-images)
+    oiio_add_tests (sgi
+                    ENABLEVAR ENABLE_SGI
+                    IMAGEDIR oiio-images)
+    oiio_add_tests (targa
+                    ENABLEVAR ENABLE_TARGA
+                    IMAGEDIR oiio-images)
+    oiio_add_tests (tiff-suite tiff-depths tiff-misc
+                    IMAGEDIR oiio-images/libtiffpic)
+    oiio_add_tests (webp
+                    FOUNDVAR WebP_FOUND ENABLEVAR ENABLE_WebP
+                    IMAGEDIR oiio-images/webp)
+    oiio_add_tests (zfile ENABLEVAR ENABLE_ZFILE
+                    IMAGEDIR oiio-images)
+
+    if (SPI_TESTS)
+        oiio_add_tests (oiiotool-spi
+                        FOUNDVAR SPI_TESTS
+                        IMAGEDIR spi-oiio-tests
+                        URL "noplace -- it's SPI specific tests")
+    endif ()
+
+endmacro()
+
+
+set (OIIO_LOCAL_TESTDATA_ROOT "${CMAKE_SOURCE_DIR}/.." CACHE PATH
+     "Directory to check for local copies of testsuite data")
+option (OIIO_DOWNLOAD_MISSING_TESTDATA "Try to download any missing test data" ON)
+
+function (oiio_get_test_data name)
+    cmake_parse_arguments (_ogtd "" "REPO;BRANCH" "" ${ARGN})
+       # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
+    if (IS_DIRECTORY "${OIIO_LOCAL_TESTDATA_ROOT}/${name}"
+        AND NOT EXISTS "${CMAKE_BINARY_DIR}/testsuite/${name}")
+        if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
+            # Just make a link if we can
+            message (STATUS "Linking ${name} from ${OIIO_LOCAL_TESTDATA_ROOT}/../${name}")
+            file (CREATE_LINK "${OIIO_LOCAL_TESTDATA_ROOT}/${name}"
+                              "${CMAKE_BINARY_DIR}/testsuite/${name}"
+                              SYMBOLIC COPY_ON_ERROR)
+        else ()
+            # Older cmake -- copy
+            message (STATUS "Copying ${name} from ${OIIO_LOCAL_TESTDATA_ROOT}/../${name}")
+            file (COPY "${OIIO_LOCAL_TESTDATA_ROOT}/${name}"
+                  DESTINATION "${CMAKE_BINARY_DIR}/testsuite")
+        endif ()
+    elseif (IS_DIRECTORY "${CMAKE_BINARY_DIR}/testsuite/${name}")
+        message (STATUS "Test data for ${name} already present in testsuite")
+    elseif (OIIO_DOWNLOAD_MISSING_TESTDATA)
+        # Test data directory didn't exist -- fetch it
+        if (_ogtd_REPO)
+            message (STATUS "Cloning ${name} from ${_ogtd_REPO}")
+            if (NOT _ogtd_BRANCH)
+                set (_ogtd_BRANCH master)
+            endif ()
+            find_package (Git)
+            if (Git_FOUND AND GIT_EXECUTABLE)
+                execute_process(COMMAND ${GIT_EXECUTABLE} clone --depth 1
+                                        ${_ogtd_REPO} -b ${_ogtd_BRANCH}
+                                        ${CMAKE_BINARY_DIR}/testsuite/${name})
+            else ()
+                message (WARNING "Could not find Git executable, could not download test data from ${_ogtd_REPO}")
+            endif ()
+        endif ()
+    else ()
+        message (STATUS "Missing test data ${name}")
+    endif ()
+endfunction()
+
+function (oiio_setup_test_data)
+    oiio_get_test_data (oiio-images
+                        REPO https://github.com/OpenImageIO/oiio-images.git)
+    oiio_get_test_data (openexr-images
+                        REPO https://github.com/AcademySoftwareFoundation/openexr-images.git)
+    oiio_get_test_data (fits-images)
+    oiio_get_test_data (j2kp4files_v1_5)
+endfunction ()

src/dds.imageio/CMakeLists.txt

@@ -1,11 +1,12 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 if (Libsquish_FOUND)
     # External libsquish was found -- use it
     add_oiio_plugin (ddsinput.cpp
-                     LINK_LIBRARIES Libsquish::Libsquish
+                     INCLUDE_DIRS ${LIBSQUISH_INCLUDES}
+                     LINK_LIBRARIES ${LIBSQUISH_LIBRARIES}
                      )
 else ()
     # No external libsquish was found -- use the embedded version.

src/dds.imageio/dds_pvt.h

@@ -1,6 +1,6 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
 
 #pragma once
 

src/dds.imageio/ddsinput.cpp

@@ -1,6 +1,6 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
 
 #include <cmath>
 #include <cstdio>
@@ -27,16 +27,22 @@ public:
     DDSInput() { init(); }
     virtual ~DDSInput() { close(); }
     virtual const char* format_name(void) const override { return "dds"; }
+    virtual int supports(string_view feature) const override
+    {
+        return feature == "ioproxy";
+    }
     virtual bool open(const std::string& name, ImageSpec& newspec) override;
+    virtual bool open(const std::string& name, ImageSpec& spec,
+                      const ImageSpec& config) override;
     virtual bool close() override;
     virtual int current_subimage(void) const override
     {
-        lock_guard lock(m_mutex);
+        lock_guard lock(*this);
         return m_subimage;
     }
     virtual int current_miplevel(void) const override
     {
-        lock_guard lock(m_mutex);
+        lock_guard lock(*this);
         return m_miplevel;
     }
     virtual bool seek_subimage(int subimage, int miplevel) override;
@@ -47,7 +53,6 @@ public:
 
 private:
     std::string m_filename;            ///< Stash the filename
-    FILE* m_file;                      ///< Open image handle
     std::vector<unsigned char> m_buf;  ///< Buffer the image pixels
     int m_subimage;
     int m_miplevel;
@@ -58,17 +63,16 @@ private:
     int m_greenL, m_greenR;  ///< Bit shifts to extract green channel
     int m_blueL, m_blueR;    ///< Bit shifts to extract blue channel
     int m_alphaL, m_alphaR;  ///< Bit shifts to extract alpha channel
-
-    dds_header m_dds;  ///< DDS header
+    dds_header m_dds;        ///< DDS header
 
     /// Reset everything to initial state
     ///
     void init()
     {
-        m_file     = NULL;
         m_subimage = -1;
         m_miplevel = -1;
         m_buf.clear();
+        ioproxy_clear();
     }
 
     /// Helper function: read the image as scanlines (all but cubemaps).
@@ -90,16 +94,6 @@ private:
 
     /// Helper function: performs the actual pixel decoding.
     bool internal_readimg(unsigned char* dst, int w, int h, int d);
-
-    /// Helper: read, with error detection
-    ///
-    bool fread(void* buf, size_t itemsize, size_t nitems)
-    {
-        size_t n = ::fread(buf, itemsize, nitems, m_file);
-        if (n != nitems)
-            errorf("Read error");
-        return n == nitems;
-    }
 };
 
 
@@ -127,22 +121,29 @@ OIIO_PLUGIN_EXPORTS_END
 
 
 
+bool
+DDSInput::open(const std::string& name, ImageSpec& newspec,
+               const ImageSpec& config)
+{
+    ioproxy_retrieve_from_config(config);
+    return open(name, newspec);
+}
+
+
+
 bool
 DDSInput::open(const std::string& name, ImageSpec& newspec)
 {
     m_filename = name;
 
-    m_file = Filesystem::fopen(name, "rb");
-    if (!m_file) {
-        errorf("Could not open file \"%s\"", name);
+    if (!ioproxy_use_or_open(name))
         return false;
-    }
 
 // due to struct packing, we may get a corrupt header if we just load the
-// struct from file; to adress that, read every member individually
+// struct from file; to address that, read every member individually
 // save some typing
-#define RH(memb)                                                               \
-    if (!fread(&m_dds.memb, sizeof(m_dds.memb), 1))                            \
+#define RH(memb)                                     \
+    if (!ioread(&m_dds.memb, sizeof(m_dds.memb), 1)) \
     return false
 
     RH(fourCC);
@@ -155,7 +156,7 @@ DDSInput::open(const std::string& name, ImageSpec& newspec)
     RH(mipmaps);
 
     // advance the file pointer by 44 bytes (reserved fields)
-    fseek(m_file, 44, SEEK_CUR);
+    ioseek(44, SEEK_CUR);
 
     // pixel format struct
     RH(fmt.size);
@@ -172,7 +173,7 @@ DDSInput::open(const std::string& name, ImageSpec& newspec)
     RH(caps.flags2);
 
     // advance the file pointer by 8 bytes (reserved fields)
-    fseek(m_file, 8, SEEK_CUR);
+    ioseek(8, SEEK_CUR);
 #undef RH
     if (bigendian()) {
         // DDS files are little-endian
@@ -384,7 +385,7 @@ DDSInput::internal_seek_subimage(int cubeface, int miplevel, unsigned int& w,
         }
     }
     // seek to the offset we've found
-    fseek(m_file, ofs, SEEK_SET);
+    ioseek(ofs, SEEK_SET);
 }
 
 
@@ -454,15 +455,14 @@ DDSInput::seek_subimage(int subimage, int miplevel)
         tempstr += ((char*)&m_dds.fmt.fourCC)[3];
         m_spec.attribute("compression", tempstr);
     }
-    m_spec.attribute("oiio:BitsPerSample", m_dds.fmt.bpp);
+    if (m_dds.fmt.bpp)
+        m_spec.attribute("oiio:BitsPerSample", m_dds.fmt.bpp);
     m_spec.default_channel_names();
 
     // detect texture type
     if (m_dds.caps.flags2 & DDS_CAPS2_VOLUME) {
-        m_spec.attribute("texturetype", "Volume Texture");
         m_spec.attribute("textureformat", "Volume Texture");
     } else if (m_dds.caps.flags2 & DDS_CAPS2_CUBEMAP) {
-        m_spec.attribute("texturetype", "Environment");
         m_spec.attribute("textureformat", "CubeFace Environment");
         // check available cube map sides
         std::string sides = "";
@@ -495,7 +495,6 @@ DDSInput::seek_subimage(int subimage, int miplevel)
         }
         m_spec.attribute("dds:CubeMapSides", sides);
     } else {
-        m_spec.attribute("texturetype", "Plain Texture");
         m_spec.attribute("textureformat", "Plain Texture");
     }
 
@@ -525,7 +524,7 @@ DDSInput::internal_readimg(unsigned char* dst, int w, int h, int d)
         std::vector<squish::u8> tmp(
             squish::GetStorageRequirements(w, h, flags));
         // load image into buffer
-        if (!fread(&tmp[0], tmp.size(), 1))
+        if (!ioread(&tmp[0], tmp.size(), 1))
             return false;
         // decompress image
         squish::DecompressImage(dst, w, h, &tmp[0], flags);
@@ -551,14 +550,14 @@ DDSInput::internal_readimg(unsigned char* dst, int w, int h, int d)
 
         // HACK: shortcut for luminance
         if (m_dds.fmt.flags & DDS_PF_LUMINANCE) {
-            return fread(dst, w * m_Bpp, h);
+            return ioread(dst, w * m_Bpp, h);
         }
 
         int k, pixel = 0;
         for (int z = 0; z < d; z++) {
             for (int y = 0; y < h; y++) {
                 for (int x = 0; x < w; x++) {
-                    if (!fread(&pixel, 1, m_Bpp))
+                    if (!ioread(&pixel, 1, m_Bpp))
                         return false;
                     k          = (z * h * w + y * w + x) * m_spec.nchannels;
                     dst[k + 0] = ((pixel & m_dds.fmt.rmask) >> m_redR)
@@ -582,7 +581,7 @@ DDSInput::internal_readimg(unsigned char* dst, int w, int h, int d)
 bool
 DDSInput::readimg_scanlines()
 {
-    //std::cerr << "[dds] readimg: " << ftell (m_file) << "\n";
+    //std::cerr << "[dds] readimg: " << ftell() << "\n";
     // resize destination buffer
     m_buf.resize(m_spec.scanline_bytes() * m_spec.height * m_spec.depth
                  /*/ (1 << m_miplevel)*/);
@@ -608,11 +607,6 @@ DDSInput::readimg_tiles()
 bool
 DDSInput::close()
 {
-    if (m_file) {
-        fclose(m_file);
-        m_file = NULL;
-    }
-
     init();  // Reset to initial state
     return true;
 }
@@ -623,7 +617,7 @@ bool
 DDSInput::read_native_scanline(int subimage, int miplevel, int y, int z,
                                void* data)
 {
-    lock_guard lock(m_mutex);
+    lock_guard lock(*this);
     if (!seek_subimage(subimage, miplevel))
         return false;
 
@@ -644,7 +638,7 @@ bool
 DDSInput::read_native_tile(int subimage, int miplevel, int x, int y, int z,
                            void* data)
 {
-    lock_guard lock(m_mutex);
+    lock_guard lock(*this);
     if (!seek_subimage(subimage, miplevel))
         return false;
 

src/dds.imageio/squish/colourset.h

@@ -53,6 +53,6 @@ private:
 	bool m_transparent;
 };
 
-} // namespace sqish
+} // namespace squish
 
 #endif // ndef SQUISH_COLOURSET_H

src/dicom.imageio/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 if (DCMTK_FOUND)
     add_oiio_plugin (dicominput.cpp

src/dicom.imageio/dicominput.cpp

@@ -1,6 +1,6 @@
 // Copyright 2008-present Contributors to the OpenImageIO project.
 // SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+// https://github.com/OpenImageIO/oiio
 
 #include <OpenImageIO/fmath.h>
 #include <OpenImageIO/imageio.h>
@@ -326,7 +326,7 @@ bool
 DICOMInput::read_native_scanline(int subimage, int miplevel, int y, int /*z*/,
                                  void* data)
 {
-    lock_guard lock(m_mutex);
+    lock_guard lock(*this);
     if (!seek_subimage(subimage, miplevel))
         return false;
     if (y < 0 || y >= m_spec.height)  // out of range scanline

src/doc/.gitignore

@@ -3,5 +3,9 @@
 *.log
 *.out
 *.toc
+*.turd
 /openimageio.ilg
 /openimageio.ind
+_markdown_openimageio/
+_minted-openimageio/
+_static/

src/doc/CMakeLists.txt

@@ -1,12 +1,12 @@
 # Copyright 2008-present Contributors to the OpenImageIO project.
 # SPDX-License-Identifier: BSD-3-Clause
-# https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md
+# https://github.com/OpenImageIO/oiio
 
 project(documentation)
 
 set (public_docs
      "${OpenImageIO_SOURCE_DIR}/LICENSE.md"
-     "${OpenImageIO_SOURCE_DIR}/LICENSE-THIRD-PARTY.md"
+     "${OpenImageIO_SOURCE_DIR}/THIRD-PARTY.md"
      "${OpenImageIO_SOURCE_DIR}/CHANGES.md"
      CHANGES-0.x.md
      CHANGES-1.x.md
@@ -21,10 +21,7 @@ endif()
 # generate man pages using txt2man and a tiny python script to munge the
 # result of "$tool --help"
 find_program(TXT2MAN txt2man)
-if (NOT PYTHONINTERP_FOUND)
-find_package(PythonInterp)
-endif ()
-if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
+if (UNIX AND TXT2MAN AND Python_Interpreter_FOUND)
     message (STATUS "Unix man page documentation will be generated")
     set (cli_tools oiiotool iinfo maketx idiff igrep iconvert)
 
@@ -37,7 +34,7 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
         list (APPEND manpage_files ${outfile})
         add_custom_command (OUTPUT ${outfile}
             COMMAND ${tool} --help |
-            ${PYTHON_EXECUTABLE} "${documentation_SOURCE_DIR}/help2man_preformat.py" |
+            ${Python_EXECUTABLE} "${documentation_SOURCE_DIR}/help2man_preformat.py" |
             ${TXT2MAN} -v OpenImageIO -s 1 -t ${tool} > ${outfile}
             DEPENDS ${tool} help2man_preformat.py)
     endforeach()

src/doc/Doxyfile

@@ -99,7 +99,7 @@ OUTPUT_LANGUAGE        = English
 # Possible values are: None, LTR, RTL and Context.
 # The default value is: None.
 
-OUTPUT_TEXT_DIRECTION  = None
+#OUTPUT_TEXT_DIRECTION  = None
 
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
@@ -1120,7 +1120,7 @@ ALPHABETICAL_INDEX     = YES
 # Minimum value: 1, maximum value: 20, default value: 5.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-COLS_IN_ALPHA_INDEX    = 5
+# COLS_IN_ALPHA_INDEX    = 5
 
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
@@ -1850,7 +1850,7 @@ LATEX_HIDE_INDICES     = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_SOURCE_CODE      = YES
+# LATEX_SOURCE_CODE      = YES
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
@@ -1940,7 +1940,7 @@ RTF_EXTENSIONS_FILE    =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_SOURCE_CODE        = NO
+# RTF_SOURCE_CODE        = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
@@ -2045,7 +2045,7 @@ DOCBOOK_OUTPUT         = docbook
 # The default value is: NO.
 # This tag requires that the tag GENERATE_DOCBOOK is set to YES.
 
-DOCBOOK_PROGRAMLISTING = NO
+# DOCBOOK_PROGRAMLISTING = NO
 
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
@@ -2155,18 +2155,28 @@ INCLUDE_FILE_PATTERNS  = *.h
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
+                         OIIO_DOXYGEN:=1 \
                          OIIO_NO_SANITIZE_ADDRESS:= \
                          OIIO_API:= \
+                         OIIO_UTIL_API:= \
+                         OIIOC_API:= \
                          OIIO_HOSTDEVICE= \
                          OIIO_NAMESPACE_BEGIN="namespace OIIO {" \
                          OIIO_NAMESPACE_END="}" \
                          OIIO_CONSTEXPR14=constexpr \
+                         OIIO_CONSTEXPR17=constexpr \
                          OIIO_CONSTEXPR20=constexpr \
+                         OIIO_INLINE_CONSTEXPR="inline constexpr" \
                          OIIO_PURE_FUNC= \
                          OIIO_CONST_FUNC= \
                          OIIO_MAYBE_UNUSED= \
                          OIIO_NODISCARD=[[nodiscard]] \
-                         OIIO_FORCEINLINE=inline
+                         OIIO_DEPRECATED:=[[deprecated]] \
+                         OIIO_FORMAT_DEPRECATED:= \
+                         OIIO_FORCEINLINE=inline \
+                         IMATH_HALF_H_=1 \
+                         INCLUDED_IMATHVEC_H=1 \
+                         INCLUDED_IMATHMATRIX_H=1 \
 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

src/doc/Makefile

@@ -1,7 +1,7 @@
 .PHONY: figures
 
-include ../make/detectplatform.mk
-BUILDDIR := ../../build/${platform}
+#include ../make/detectplatform.mk
+BUILDDIR := ../../build
 ifeq (${OIIOTOOL},)
   ifneq (${shell ls ${BUILDDIR}/bin/oiiotool},)
     OIIOTOOL := "${BUILDDIR}/bin/oiiotool"
@@ -11,26 +11,23 @@ ifeq (${OIIOTOOL},)
 endif
 
 
-PDFLATEX := pdflatex -file-line-error --halt-on-error -interaction=errorstopmode
-
-# by default, just make the document
-all: openimageio.pdf
+help:
+	@echo "help"
+	@echo "BUILDDIR=${BUILDDIR}"
+	@echo "Interesting targets:"
+	@echo "  sphinx         Build html docs in BUILDDIR/sphinx"
+	@echo "  sphinxpdf      Build pdf docs in BUILDDIR/sphinx"
+	@echo "  doxygen        Doxygen pre-pass needed before sphinx"
+	@echo "  doxygenclean   Reset doxygen pass"
+	@echo "  figures        Rebuild all figures (DON'T DO THIS!)"
+	@echo "  cleanfigures   Clear all figures (DEFINITELY DON'T DO THIS!)"
+#	@echo "Sphinx targets:"
+#	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(SPHINXBUILDDIR)" $(SPHINXOPTS) $(O)
 
 
-# document making rule: use pdflatex
-openimageio.pdf: *.tex *.aux figures.turd
-	${PDFLATEX} openimageio.tex
+.PHONY: help Makefile
 
 
-# special command 'make index' to regenerate the index
-index: openimageio_index
-
-openimageio_index: figures
-	${PDFLATEX} openimageio.tex
-	${PDFLATEX} openimageio.tex
-	makeindex openimageio
-	${PDFLATEX} openimageio.tex
-
 figures:
 	(cmake -E make_directory figures ; \
 	 cd figures ; \
@@ -45,13 +42,6 @@ cleanfigures:
 	cmake -E remove_directory figures
 
 
-help:
-	@echo "help"
-	@echo "BUILDDIR=${BUILDDIR}"
-	@echo "Sphinx targets:"
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(SPHINXBUILDDIR)" $(SPHINXOPTS) $(O)
-
-
 
 doxygen:
 	echo "make doxygen TBD"
@@ -72,10 +62,6 @@ SPHINXBUILD   = sphinx-build
 SOURCEDIR     = .
 SPHINXBUILDDIR      = ../../build/sphinx
 
-# Put it first so that "make" without argument is like "make help".
-#help:
-
-.PHONY: help Makefile
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).