Integrate main into RB-2.3 branch and update library version

.github/workflows/ci_workflow.yml

@@ -77,6 +77,7 @@ jobs:
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2023
+            install-ext-packages: MISSING
           - build: 11
             build-type: Release
             build-shared: 'ON'
@@ -89,6 +90,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2023
+            install-ext-packages: ALL
           - build: 10
             build-type: Release
             build-shared: 'OFF'
@@ -101,6 +103,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2023
+            install-ext-packages: ALL
           # -------------------------------------------------------------------
           # VFX CY2022 (Python 3.9)
           # -------------------------------------------------------------------
@@ -116,6 +119,7 @@ jobs:
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2022
+            install-ext-packages: ALL
           - build: 8
             build-type: Release
             build-shared: 'ON'
@@ -128,6 +132,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2022
+            install-ext-packages: MISSING
           - build: 7
             build-type: Release
             build-shared: 'OFF'
@@ -140,6 +145,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2022
+            install-ext-packages: ALL
           # -------------------------------------------------------------------
           # VFX CY2021 (Python 3.7)
           # -------------------------------------------------------------------
@@ -155,6 +161,7 @@ jobs:
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2021
+            install-ext-packages: MISSING
           - build: 5
             build-type: Release
             build-shared: 'OFF'
@@ -167,6 +174,7 @@ jobs:
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2021
+            install-ext-packages: ALL
           - build: 4
             build-type: Debug
             build-shared: 'ON'
@@ -179,6 +187,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2021
+            install-ext-packages: ALL
           # -------------------------------------------------------------------
           # VFX CY2020 (Python 3.7)
           # -------------------------------------------------------------------
@@ -194,6 +203,7 @@ jobs:
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2020
+            install-ext-packages: MISSING
           - build: 2
             build-type: Debug
             build-shared: 'OFF'
@@ -206,6 +216,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2020
+            install-ext-packages: ALL
           - build: 1
             build-type: Release
             build-shared: 'ON'
@@ -218,6 +229,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2020
+            install-ext-packages: ALL
     env:
       CXX: ${{ matrix.cxx-compiler }}
       CC: ${{ matrix.cc-compiler }}
@@ -245,7 +257,7 @@ jobs:
                 -DOCIO_BUILD_GPU_TESTS=OFF \
                 -DOCIO_USE_SIMD=${{ matrix.use-simd }} \
                 -DOCIO_USE_OIIO_FOR_APPS=${{ matrix.use-oiio }} \
-                -DOCIO_INSTALL_EXT_PACKAGES=ALL \
+                -DOCIO_INSTALL_EXT_PACKAGES=${{ matrix.install-ext-packages }} \
                 -DOCIO_WARNING_AS_ERROR=ON \
                 -DPython_EXECUTABLE=$(which python)
         working-directory: _build
@@ -527,7 +539,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install docs env
-        run: share/ci/scripts/windows/install_docs_env.sh
+        run: |
+          DOXYGEN_PATH=$GITHUB_WORKSPACE/doxygen
+          share/ci/scripts/windows/install_docs_env.sh "$DOXYGEN_PATH"
+          echo "$DOXYGEN_PATH" >> $GITHUB_PATH
         shell: bash
         if: matrix.build-docs == 'ON'
       - name: Install tests env

.github/workflows/dependencies_latest.yml

@@ -54,6 +54,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2022
+            use-oiio: 'ON'
           - build: 2
             build-docs: 'OFF'
             build-openfx: 'OFF'
@@ -62,6 +63,7 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2021
+            use-oiio: 'OFF'
           # -------------------------------------------------------------------
           # Clang
           # -------------------------------------------------------------------
@@ -73,6 +75,7 @@ jobs:
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2022
+            use-oiio: 'OFF'
           - build: 4
             build-docs: 'ON'
             build-openfx: 'ON'
@@ -81,6 +84,7 @@ jobs:
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2021
+            use-oiio: 'ON'
     env:
       CXX: ${{ matrix.cxx-compiler }}
       CC: ${{ matrix.cc-compiler }}
@@ -132,7 +136,7 @@ jobs:
                 -DOCIO_INSTALL_EXT_PACKAGES=NONE \
                 -DOCIO_WARNING_AS_ERROR=OFF \
                 -DPython_EXECUTABLE=$(which python) \
-                -DOCIO_USE_OIIO_CMAKE_CONFIG=ON
+                -DOCIO_USE_OIIO_FOR_APPS=${{ matrix.use-oiio }}
         working-directory: _build
       - name: Build
         run: |
@@ -176,11 +180,13 @@ jobs:
             build-openfx: 'ON'
             cxx-standard: 17
             python-version: '3.11'
+            use-oiio: 'ON'
           - build: 2
             build-docs: 'ON'
             build-openfx: 'ON'
             cxx-standard: 14
             python-version: '3.9'
+            use-oiio: 'OFF'
     steps:
       - name: Setup Python
         uses: actions/setup-python@v4
@@ -235,7 +241,7 @@ jobs:
                 -DOCIO_INSTALL_EXT_PACKAGES=NONE \
                 -DOCIO_WARNING_AS_ERROR=OFF \
                 -DPython_EXECUTABLE=$(which python) \
-                -DOCIO_USE_OIIO_CMAKE_CONFIG=ON
+                -DOCIO_USE_OIIO_FOR_APPS=${{ matrix.use-oiio }}
         working-directory: _build
       - name: Build
         run: |
@@ -279,11 +285,13 @@ jobs:
             build-openfx: 'ON'
             cxx-standard: 17
             python-version: '3.11'
+            use-oiio: 'ON'
           - build: 2
             build-docs: 'ON'
             build-openfx: 'ON'
             cxx-standard: 14
             python-version: '3.9'
+            use-oiio: 'OFF'
     steps:
       - name: Setup Python
         uses: actions/setup-python@v4
@@ -292,7 +300,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install docs env
-        run: share/ci/scripts/windows/install_docs_env.sh
+        run: |
+          DOXYGEN_PATH=$GITHUB_WORKSPACE/doxygen
+          share/ci/scripts/windows/install_docs_env.sh "$DOXYGEN_PATH"
+          echo "$DOXYGEN_PATH" >> $GITHUB_PATH
         shell: bash
         if: matrix.build-docs == 'ON'
       - name: Install tests env
@@ -359,7 +370,7 @@ jobs:
                 -DOCIO_WARNING_AS_ERROR=OFF \
                 -DPython_EXECUTABLE=$(which python) \
                 -DOCIO_BUILD_PYTHON=OFF \
-                -DOCIO_USE_OIIO_CMAKE_CONFIG=ON
+                -DOCIO_USE_OIIO_FOR_APPS=${{ matrix.use-oiio }}
         shell: bash
         working-directory: _build
       - name: Build

.github/workflows/gpu_workflow.yml

@@ -16,8 +16,6 @@ on:
     tags-ignore:
       - v0.*
       - v1.*
-    paths:
-      - .github/workflows/gpu_workflow.yml
 
 jobs:
   # ---------------------------------------------------------------------------

.github/workflows/platform_latest.yml

@@ -104,7 +104,7 @@ jobs:
                 -DOCIO_BUILD_OPENFX=ON \
                 -DOCIO_BUILD_GPU_TESTS=OFF \
                 -DOCIO_BUILD_PYTHON=${{ matrix.build-python}} \
-                -DOCIO_USE_SSE=ON \
+                -DOCIO_USE_SIMD=ON \
                 -DOCIO_USE_OIIO_FOR_APPS=OFF \
                 -DOCIO_INSTALL_EXT_PACKAGES=ALL \
                 -DOCIO_WARNING_AS_ERROR=ON \
@@ -219,7 +219,7 @@ jobs:
                 -DOCIO_BUILD_OPENFX=ON \
                 -DOCIO_BUILD_GPU_TESTS=OFF \
                 -DOCIO_BUILD_PYTHON=${{ matrix.build-python}} \
-                -DOCIO_USE_SSE=ON \
+                -DOCIO_USE_SIMD=ON \
                 -DOCIO_USE_OIIO_FOR_APPS=OFF \
                 -DOCIO_INSTALL_EXT_PACKAGES=ALL \
                 -DOCIO_WARNING_AS_ERROR=ON \
@@ -333,7 +333,7 @@ jobs:
                 -DOCIO_BUILD_OPENFX=ON \
                 -DOCIO_BUILD_GPU_TESTS=OFF \
                 -DOCIO_BUILD_PYTHON=${{ matrix.build-python}} \
-                -DOCIO_USE_SSE=ON \
+                -DOCIO_USE_SIMD=ON \
                 -DOCIO_USE_OIIO_FOR_APPS=OFF \
                 -DOCIO_INSTALL_EXT_PACKAGES=ALL \
                 -DOCIO_WARNING_AS_ERROR=ON \

.github/workflows/wheel_workflow.yml

@@ -95,6 +95,9 @@ jobs:
           - build: CPython 3.11 64 bits
             python: cp311-manylinux*
             arch: x86_64
+          - build: CPython 3.12 64 bits
+            python: cp312-manylinux*
+            arch: x86_64
           # -------------------------------------------------------------------
           # CPython ARM 64 bits
           # -------------------------------------------------------------------
@@ -113,6 +116,9 @@ jobs:
           - build: CPython 3.11 ARM 64 bits
             python: cp311-manylinux*
             arch: aarch64
+          - build: CPython 3.12 ARM 64 bits
+            python: cp312-manylinux*
+            arch: aarch64
 
     steps:
       - uses: actions/checkout@v3
@@ -128,7 +134,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.1
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -143,7 +149,7 @@ jobs:
 
   macos:
     name: Build wheels on macOS
-    runs-on: macos-11
+    runs-on: macos-12
     # Don't run on OCIO forks
     if: |
       github.event_name != 'schedule' ||
@@ -169,6 +175,9 @@ jobs:
           - build: CPython 3.11 64 bits
             python: cp311-*
             arch: x86_64
+          - build: CPython 3.12 64 bits
+            python: cp312-*
+            arch: x86_64
           # -------------------------------------------------------------------
           # CPython ARM 64 bits
           # -------------------------------------------------------------------
@@ -184,6 +193,9 @@ jobs:
           - build: CPython 3.11 ARM 64 bits
             python: cp311-*
             arch: arm64
+          - build: CPython 3.12 ARM 64 bits
+            python: cp312-*
+            arch: arm64
 
     steps:
       - uses: actions/checkout@v3
@@ -194,7 +206,7 @@ jobs:
           python-version: '3.8'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.1
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -209,7 +221,7 @@ jobs:
 
   windows:
     name: Build wheels on Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     # Don't run on OCIO forks
     if: |
       github.event_name != 'schedule' ||
@@ -235,6 +247,9 @@ jobs:
           - build: CPython 3.11 64 bits
             python: cp311-*
             arch: AMD64
+          - build: CPython 3.12 64 bits
+            python: cp312-*
+            arch: AMD64
 
     steps:
       - uses: actions/checkout@v3
@@ -245,7 +260,7 @@ jobs:
           python-version: '3.8'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.1
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}

CHANGELOG.md

@@ -3,8 +3,13 @@
 
 This file documents releases up to 1.1.1.  For a description of version 2.0 and later
 please refer to the Releases page on GitHub:
+
 https://github.com/AcademySoftwareFoundation/OpenColorIO/releases
 
+and for more details please see the release notes in latest documentation pages:
+
+https://opencolorio.readthedocs.io/en/latest/releases/_index.html#releases
+
 **Version 1.1.1 (April 2 2019):**
     * Added optional compatibility for building apps with OpenImageIO 1.9+
     * Added USE_SSE checks to fix Linux build failure

CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 # Project definition.
 
 project(OpenColorIO 
-    VERSION 2.3.0
+    VERSION 2.3.1
     DESCRIPTION "OpenColorIO (OCIO) is a complete color management solution"
     HOMEPAGE_URL https://github.com/AcademySoftwareFoundation/OpenColorIO
     LANGUAGES CXX C)
@@ -180,8 +180,11 @@ option(OCIO_USE_OIIO_FOR_APPS "Request OIIO to build apps (ociolutimage, ociocon
 
 
 if (NOT APPLE)
-    if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(AMD64|IA64|EM64T|X86|x86_64|i386|i686)")
+    if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(AMD64|IA64|EM64T|x86_64|X86|i386|i686)")
         # Intel-based architecture (not APPLE)
+        if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(X86|i386|i686)")
+            set(OCIO_ARCH_X86_32 1)
+        endif()
         set(OCIO_ARCH_X86 1)
         set(OCIO_BUILD_ENABLE_OPTIMIZATIONS_SSE ON)
         set(OCIO_BUILD_ENABLE_OPTIMIZATIONS_AVX ON)

CONTRIBUTING.md

@@ -243,7 +243,7 @@ expected to validate the behavior of every part of OCIO:
 * Any change to existing functionality should have tests added if they
   don't already exist.
 
-The test should should be run, via ``ctest``, before submitting a pull request.
+The test should be run, via ``ctest``, before submitting a pull request.
 
 ## Versioning Policy