Skip to content

Commit

Permalink
Integrate main into RB-2.3 branch and update library version (#1918)
Browse files Browse the repository at this point in the history
* Fix support for X86 32-bit (#1842)

Signed-off-by: Mark Reid <[email protected]>
(cherry picked from commit 16b3157)
Signed-off-by: Doug Walker <[email protected]>

* Add some small arm neon optimizations (#1847)

* Remove unused includes

Signed-off-by: Mark Reid <[email protected]>

* Use neon hardware support for f16 conversions

Signed-off-by: Mark Reid <[email protected]>

* Add some small neon optimizations
use blendv,floor and fma intrinsics were possible

Signed-off-by: Mark Reid <[email protected]>

---------

Signed-off-by: Mark Reid <[email protected]>
(cherry picked from commit 14f0afa)
Signed-off-by: Doug Walker <[email protected]>

* Add links to new release notes documentation (#1848)

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 87126fa)
Signed-off-by: Doug Walker <[email protected]>

* Changing version to 2.4.0 (#1852)

Signed-off-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 381d1fc)
Signed-off-by: Doug Walker <[email protected]>

* Correctly recover CXX_FLAGS in CheckSupportSSE2.cmake (#1861)

Signed-off-by: Chongyun Lee <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit c429400)
Signed-off-by: Doug Walker <[email protected]>

* Fix regression in cccid handling when no value is supplied (#1855)

In v1 of OCIO FileTransforms are able to load .cc files
without specifying a cccid. In v2 this broke causing an
exception to be raised instead of using the first cc found
in the file.

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit c7ad353)
Signed-off-by: Doug Walker <[email protected]>

* Fix missing cache id reset on look update. (#1873)

Signed-off-by: Eric Renaud-Houde <[email protected]>
(cherry picked from commit dddbee0)
Signed-off-by: Doug Walker <[email protected]>

* ocioview: Curve Inspector improvements (#1845)

* Curve inspector improvements

- Move README to root app folder
- Change curve inspector grid to always render as a square with 10 segments.
- Add transform init callback to set new transform subscriptions to the current viewer if set to passthrough.

Signed-off-by: Michael Dolan <[email protected]>

* Improve log range calculation

Signed-off-by: Michael Dolan <[email protected]>

* Improve channel sample comparison

Signed-off-by: Michael Dolan <[email protected]>

* Update src/apps/ocioview/ocioview/inspect/curve_inspector.py

Signed-off-by: Michael Dolan <[email protected]>

Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>

---------

Signed-off-by: Michael Dolan <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 8add374)
Signed-off-by: Doug Walker <[email protected]>

* Fix missing Default View Transform on equal operator (#1886)

Add the missing assignment of the the default view transform when a config is copied using the equal operator

Signed-off-by: Michael De Caria <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit bc8569b)
Signed-off-by: Doug Walker <[email protected]>

* Remove circular import caused by typing annotations. (#1882)

Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 1fad466)
Signed-off-by: Doug Walker <[email protected]>

* fix(grammatical): Spelling mistakes (#1892)

Signed-off-by: AbhineshJha <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 0d00b2c)
Signed-off-by: Doug Walker <[email protected]>

* Improve ocioview mac support and simplify dependencies (#1853)

* PySide 6, remove imath, add imageio support

Signed-off-by: Rémi Achard <[email protected]>

Remove Imath

Signed-off-by: Rémi Achard <[email protected]>

Support imageio as fallback for openimageio

Signed-off-by: Rémi Achard <[email protected]>

Further adjustments following latest updates

Signed-off-by: Rémi Achard <[email protected]>

Fix pixel probe

Signed-off-by: Remi Achard <[email protected]>

Add OpenColorIO to requirements

Signed-off-by: Remi Achard <[email protected]>

* Fix rebase issue

Signed-off-by: Remi Achard <[email protected]>

---------

Signed-off-by: Remi Achard <[email protected]>
Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>
Co-authored-by: Thomas Mansencal <[email protected]>
Co-authored-by: Michael Dolan <[email protected]>
(cherry picked from commit 45544ce)
Signed-off-by: Doug Walker <[email protected]>

* Issue #1874 Cast to unsigned char for isspace. (#1888)

* Issue #1874 Cast to unsigned char for isspace.

Signed-off-by: pylee <[email protected]>

* Add unit test.

Signed-off-by: pylee <[email protected]>

* Add test comment as suggested in code review.

Signed-off-by: pylee <[email protected]>

---------

Signed-off-by: pylee <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ed85207)
Signed-off-by: Doug Walker <[email protected]>

* Tentative fix for the doxygen installation in the CI (Windows) (#1890)

Signed-off-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit b94a184)
Signed-off-by: Doug Walker <[email protected]>

* Simplify the Findyaml-cpp module (#1891)

This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 1d3b695)
Signed-off-by: Doug Walker <[email protected]>

* Skip processor concatenation if the display color space is also data. (#1896)

* Skip processor concatenation if the display view transform is also data.

Signed-off-by: Eric Renaud-Houde <[email protected]>

* Moved missing display color space exception before processor creation.

Signed-off-by: Eric Renaud-Houde <[email protected]>

---------

Signed-off-by: Eric Renaud-Houde <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 52b4965)
Signed-off-by: Doug Walker <[email protected]>

* Restore GPU workflow and minor updates to CI (#1899)

* Restore GPU workflow runs

Signed-off-by: Rémi Achard <[email protected]>

* Enable undefined behaviour sanitizer

Signed-off-by: Rémi Achard <[email protected]>

* Fix SIMD option for platform_latest

Signed-off-by: Rémi Achard <[email protected]>

* Fix install_docs_env on CI workflow (not used at the moment)

Signed-off-by: Rémi Achard <[email protected]>

* Fix OpenEXR build flag

Signed-off-by: Rémi Achard <[email protected]>

---------

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 382dcb6)
Signed-off-by: Doug Walker <[email protected]>

* Improve handling of pystring include dir (#1901)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 9078753)
Signed-off-by: Doug Walker <[email protected]>

* Improve compatibility with minizip-ng COMPAT mode (#1902)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ffd0f70)
Signed-off-by: Doug Walker <[email protected]>

* Fix NamedTransform context var issue (#1905)

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 4d64b32)
Signed-off-by: Doug Walker <[email protected]>

* Fix env serialization for v1 configs (#1904)

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 4f4f30e)
Signed-off-by: Doug Walker <[email protected]>

* Fix yaml-cpp build issues (#1907)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 41441bb)
Signed-off-by: Doug Walker <[email protected]>

* Adsk Contrib - Improve heuristics for finding known color spaces (#1913)

* Improve heuristics

Signed-off-by: Doug Walker <[email protected]>

* Add some comments

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit d8852b5)
Signed-off-by: Doug Walker <[email protected]>

* Add Python 3.12 wheels (#1898)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit f2cfec3)
Signed-off-by: Doug Walker <[email protected]>

* Increment library version to 2.3.1

Signed-off-by: Doug Walker <[email protected]>

* Fix wrong RPATH being injected into Python bindings DSO (#1849)

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ba2b41e)
Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Kevin Wheatley <[email protected]>
Signed-off-by: Cédrik Fuoco <[email protected]>
Signed-off-by: Chongyun Lee <[email protected]>
Signed-off-by: Eric Renaud-Houde <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>
Signed-off-by: Michael De Caria <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: AbhineshJha <[email protected]>
Signed-off-by: Remi Achard <[email protected]>
Signed-off-by: pylee <[email protected]>
Signed-off-by: Tobias Mayer <[email protected]>
Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Mark Reid <[email protected]>
Co-authored-by: Kevin Wheatley <[email protected]>
Co-authored-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Uchiha Kakashi <[email protected]>
Co-authored-by: Éric Renaud-Houde <[email protected]>
Co-authored-by: Michael Dolan <[email protected]>
Co-authored-by: Michael De Caria <[email protected]>
Co-authored-by: Thomas Mansencal <[email protected]>
Co-authored-by: Abhinesh <[email protected]>
Co-authored-by: Rémi Achard <[email protected]>
Co-authored-by: PenneLee <[email protected]>
Co-authored-by: tobim <[email protected]>
  • Loading branch information
13 people authored Dec 8, 2023
1 parent b35fb73 commit 92db29b
Show file tree
Hide file tree
Showing 143 changed files with 5,612 additions and 652 deletions.
19 changes: 17 additions & 2 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -101,6 +103,7 @@ jobs:
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2023
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2022 (Python 3.9)
# -------------------------------------------------------------------
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -140,6 +145,7 @@ jobs:
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2022
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2021 (Python 3.7)
# -------------------------------------------------------------------
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -179,6 +187,7 @@ jobs:
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2021
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2020 (Python 3.7)
# -------------------------------------------------------------------
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/dependencies_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -62,6 +63,7 @@ jobs:
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2021
use-oiio: 'OFF'
# -------------------------------------------------------------------
# Clang
# -------------------------------------------------------------------
Expand All @@ -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'
Expand All @@ -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 }}
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/gpu_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ on:
tags-ignore:
- v0.*
- v1.*
paths:
- .github/workflows/gpu_workflow.yml

jobs:
# ---------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/platform_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions .github/workflows/wheel_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -------------------------------------------------------------------
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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' ||
Expand All @@ -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
# -------------------------------------------------------------------
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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' ||
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 92db29b

Please sign in to comment.