From 726dc3ff0cf13d70ad04b13a4c9d32526c822f70 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Wed, 31 Jan 2024 23:53:18 -0800 Subject: [PATCH] Stage for release of v1.13.6.1 Signed-off-by: Larry Gritz --- CHANGES.md | 7 ++++++- CMakeLists.txt | 4 ++-- INSTALL.md | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 36e869b97..09f51834a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,10 @@ -Release 1.13 -- beta 1: December 20, 2023 (compared to 1.12) +Release 1.13 -- Feb 1, 2024 (compared to 1.12) ------------------------------------------------------------- +- beta 1: December 20, 2023 +- release v1.13.6.1: Feb 1, 2024 ### New minimum dependencies and compatibility changes: @@ -91,6 +93,7 @@ Release 1.13 -- beta 1: December 20, 2023 (compared to 1.12) * OptiX PTX pipeline overhaul [#1680](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1680) (by Tim Grant) (1.13.5.0) * Perf: Don't insert redundant run layer calls inside a basic block [#1665](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1665) [#1669](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1669) [#1672](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1672) (by Chris Hellmuth) (1.13.4.0) +* Fix NVPTX TargetMachine leak, etc. [#1763](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1763) (by Tim Grant) ### 🐛/🔧 Internals: fixes, improvements, and developer concerns @@ -186,6 +189,7 @@ Release 1.13 -- beta 1: December 20, 2023 (compared to 1.12) * For clarity, use the term 'runner' instead of 'os' [#1743](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1743) * Test ABI compliance [#1748](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1748) * Fix tests passing when test commands fail [#1733](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1733) (by Brecht Van Lommel) + * *ci*: Test against LLVM 17 [#1760](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1760) * Platform support: * Include `immintrin.h` only when needed. #1605 (1.13.1.0) * Changed snprintf formatting to satisfy some compilers. @@ -211,6 +215,7 @@ Release 1.13 -- beta 1: December 20, 2023 (compared to 1.12) * Alert slack "release-announcements" channel upon OSL release [#1740](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1740) [#1749](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1749) * Update pull request template [#1741](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1741) +* Account for duplicate emails in the .mailmap [#1759](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1759) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8af6f88fe..b41e062ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required (VERSION 3.15) -set (OSL_VERSION "1.13.6.0") +set (OSL_VERSION "1.13.6.1") set (OSL_VERSION_OVERRIDE "" CACHE STRING "Version override (use with caution)!") mark_as_advanced (OSL_VERSION_OVERRIDE) @@ -18,7 +18,7 @@ project (OSL VERSION ${OSL_VERSION} set (PROJ_NAME ${PROJECT_NAME}) # short name 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 "beta1" CACHE STRING +set (PROJECT_VERSION_RELEASE_TYPE "" 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 Open Shading Language project") diff --git a/INSTALL.md b/INSTALL.md index dd5f446aa..b64ff95b6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -48,7 +48,7 @@ NEW or CHANGED dependencies since the last major release are **bold**. * [Cuda](https://developer.nvidia.com/cuda-downloads) 9.0 or higher. It is recommended that you use 11.0 or higher. -* [Boost](https://www.boost.org) 1.55 or newer (tested through boost 1.83) +* [Boost](https://www.boost.org) 1.55 or newer (tested through boost 1.84) * [Ilmbase or Imath](https://github.com/AcademySoftwareFoundation/Imath) 2.4 or newer (recommended: 3.1 or higher; tested through 3.2) NOTE: It is likely that 1.13 is the last release that will support