diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8b464ecb..eb05bff45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -179,8 +179,9 @@ jobs: CMAKE_CXX_STANDARD: 17 PYTHON_VERSION: 3.9 USE_SIMD: avx2,f16c + OPENCOLORIO_VERSION: v2.1.0 OPENEXR_VERSION: v3.1.1 - OPENIMAGEIO_VERSION: dev-2.3 + OPENIMAGEIO_VERSION: release PYBIND11_VERSION: v2.7.1 steps: - uses: actions/checkout@v2 @@ -471,7 +472,7 @@ jobs: linux-latest-release: # Test against development master for relevant dependencies, latest # supported releases of everything else. - name: "Linux latest releases: gcc10/C++17, llvm12, oiio-master, py3.8, boost1.71, exr3.1, ocio2.0, avx2" + name: "Linux latest releases: gcc10/C++17, llvm12, oiio-2.3, py3.8, boost1.71, exr3.1, ocio2.1, avx2" runs-on: ubuntu-20.04 env: CXX: g++-10 @@ -481,9 +482,9 @@ jobs: LLVM_DISTRO_NAME: ubuntu-20.04 USE_SIMD: avx2,f16c OPENEXR_VERSION: v3.1.0 - OPENIMAGEIO_VERSION: master + OPENIMAGEIO_VERSION: release OPENIMAGEIO_CMAKE_FLAGS: -DBUILD_FMT_VERSION=8.0.0 - OPENCOLORIO_VERSION: v2.0.1 + OPENCOLORIO_VERSION: v2.1.0 PUGIXML_VERSION: v1.11.4 PYBIND11_VERSION: v2.7.1 PYTHON_VERSION: 3.8 diff --git a/CHANGES.md b/CHANGES.md index 24978b357..44b11919d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,12 @@ +Release 1.11.15.0 -- 1 Sep 2021 (compared to 1.11.14.2) +------------------------------------------------------- +* Changes for compatibility with OpenImageIO 2.3. #1393 #1388 +* Fix potential crashes (or at least undefined behavior) due to missing + virtual destructor of internal Symbol type. #1397 + Release 1.11.14.2 -- 1 Jul 2021 (compared to 1.11.14.1) ------------------------------------------------------- * Fix warnings that occur when compiling with clang and C++17 mode. #1379 diff --git a/CMakeLists.txt b/CMakeLists.txt index 103190314..c3607fd23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage cmake_minimum_required (VERSION 3.12) -project (OSL VERSION 1.11.14.2 +project (OSL VERSION 1.11.15.0 LANGUAGES CXX C HOMEPAGE_URL "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage") set (PROJ_NAME ${PROJECT_NAME}) # short name