From: Brad Smith Subject: Re: UPDATE: OpenColorIO 2.3.2 To: ports@openbsd.org Date: Fri, 5 Apr 2024 04:45:24 -0400 ping. Now that the Blender diff is in. On 2024-03-25 11:00 p.m., Brad Smith wrote: > Here is an update to OpenColorIO 2.3.2. > > > v2.3.0 > > This is the main new feature release for this year and is the base version for the > CY2024 VFX Reference Platform (which specifies 2.3.x). > > Major new features: > > PR #1816, Add new ocioview config visual editor app (alpha) > PR #1687, Utilize AVX SIMD intrinsics to accelerate Lut1D and Lut3D performance > PR #1828, Utilize Neon SIMD intrinsics and improve Universal Build support for macOS > PR #1788, Enhanced methods to find an equivalent color space between configs > PR #1802, Add command-line apps to Python Wheel > PR #1808, Add GetProcessorFromConfigs variants for displays and views > PR #1762, Disallow use of 1D textures for Lut1D ops in the GPU renderer > PR #1791, Add clear Processor cache function to accomodate changes to existing LUT files > PR #1773, Add cg-config-latest & studio-config-latest short-cuts to built-in configs > PR #1812, Add built-in transform for Display P3 and bump config version > > Bug fixes and minor enhancements: > > PR #1792, Add isInactiveColorSpace and getRoleColorSpace methods > PR #1832, Add hasDynamic method to CPUProcessor and allow OSL language output from Python > PR #1829, Fix named transform validation issue > PR #1779, Fix GradingPrimary bypass and allow easier comparison in Python > PR #1759, Allow PyOpenColorIO module to load DLLs from Windows PATH env var > PR #1780, Improve DisplayViewTransform error message and add more unit tests > PR #1786, Remove inactive color space warnings from unit test output > PR #1822, Remove additional color space warnings from unit test output > PR #1833, Update Python docs for new texture dimensions API > PR #1812, Fix error in Baker documentation related to LUT inversion > PR #1803, Add Thomas and Zach to the TSC > PR #1782, Add 3ds Max as a supported app > > Build process enhancements: > > PR #1777, Add CMake support for minimum and recommended versions of dependencies > PR #1813, Add VFX Platform 2023 to CI Linux build matrix > PR #1778, Improve Python Wheel packaging > PR #1790, Make OpenColorIO usable as a sub-project using CMake's FetchContent > PR #1806, Support minizip-ng 4 API > PR #1823, CMake fixes for yaml-cpp affecting vcpkg > PR #1793, Change min ZLib version to 1.2.8 > PR #1826, Adjust to change in Sphinx breaking documentation builds > PR #1809, Adjust to change in Doxygen groups to fix documentation build > PR #1797, Adjust urllib3 version to fix CI and dependencies-latest workflows > PR #1770, Update GitHub Actions workflows > PR #1795, OSL-related fix for dependencies-latest workflow on macOS > PR #1783, Docutils version fix for dependencies-latest workflow > PR #1714, Fix CI warnings / deprecations > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/graphics/opencolorio/Makefile,v > retrieving revision 1.31 > diff -u -p -u -p -r1.31 Makefile > --- Makefile 23 Sep 2023 16:29:53 -0000 1.31 > +++ Makefile 24 Mar 2024 02:02:28 -0000 > @@ -1,14 +1,12 @@ > -ONLY_FOR_ARCHS = ${CLANG_ARCHS} > - > COMMENT = color management library > > -EPOCH = 2 > GH_ACCOUNT = AcademySoftwareFoundation > GH_PROJECT = OpenColorIO > -GH_TAGNAME = v2.1.1 > +GH_TAGNAME = v2.3.2 > PKGNAME = ${DISTNAME:L} > +EPOCH = 2 > > -SHARED_LIBS += OpenColorIO 3.0 # 1.1.1 > +SHARED_LIBS += OpenColorIO 4.0 # 1.1.1 > > CATEGORIES = graphics > > @@ -19,9 +17,9 @@ MAINTAINER = Pascal Stumpf # several BSD-like > PERMIT_PACKAGE = Yes > > -WANTLIB += ${COMPILER_LIBCXX} Imath-3_1 expat m pystring yaml-cpp > +WANTLIB += ${COMPILER_LIBCXX} Imath-3_1 expat m minizip pystring yaml-cpp z > > -COMPILER = base-clang > +COMPILER = base-clang ports-gcc > > MODULES = devel/cmake \ > lang/python > @@ -30,16 +28,16 @@ BUILD_DEPENDS = devel/boost \ > devel/py-pybind11${MODPY_FLAVOR} \ > devel/py-setuptools${MODPY_FLAVOR} \ > devel/py-wheel${MODPY_FLAVOR} > -LIB_DEPENDS = devel/pystring \ > +LIB_DEPENDS = archivers/minizip>=4.0.4 \ > + devel/pystring \ > devel/yaml-cpp \ > math/imath > > CONFIGURE_ARGS += -DPYTHON="${MODPY_BIN}" \ > -DOCIO_BUILD_STATIC=OFF \ > -DOCIO_BUILD_APPS=OFF \ > - -DOCIO_BUILD_GPU_TESTS=OFF > - > -MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib > + -DOCIO_BUILD_GPU_TESTS=OFF \ > + -Dminizip-ng_INCLUDE_DIR="${LOCALBASE}/include/minizip" > > .if ${MACHINE_ARCH} == "amd64" > CONFIGURE_ARGS += -DOCIO_USE_SSE=ON > @@ -49,10 +47,6 @@ CONFIGURE_ARGS += -DOCIO_USE_SSE=OFF > > # everything except tests > ALL_TARGET = OpenColorIO PyOpenColorIO > - > -pre-configure: > - # custom code fails to find yaml-cpp>=0.8.0 > - rm -f ${WRKSRC}/share/cmake/modules/Findyaml-cpp.cmake > > pre-test: > # build whatever is left (ca. 180 C++ test files) > Index: distinfo > =================================================================== > RCS file: /cvs/ports/graphics/opencolorio/distinfo,v > retrieving revision 1.9 > diff -u -p -u -p -r1.9 distinfo > --- distinfo 12 Jun 2023 21:29:25 -0000 1.9 > +++ distinfo 24 Mar 2024 02:02:28 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (OpenColorIO-2.1.1.tar.gz) = FuvD4PIfctvpD+YEN+uGT01N6cJV744hL4N4JPybjZw= > -SIZE (OpenColorIO-2.1.1.tar.gz) = 11013141 > +SHA256 (OpenColorIO-2.3.2.tar.gz) = a79Of6TqL3Q6I4yyKv9EiQQldxovV/Ys7OFXTkbO7C8= > +SIZE (OpenColorIO-2.3.2.tar.gz) = 11443450 > Index: patches/patch-src_utils_NumberUtils_h > =================================================================== > RCS file: /cvs/ports/graphics/opencolorio/patches/patch-src_utils_NumberUtils_h,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 patch-src_utils_NumberUtils_h > --- patches/patch-src_utils_NumberUtils_h 12 Jun 2023 21:29:25 -0000 1.6 > +++ patches/patch-src_utils_NumberUtils_h 24 Mar 2024 02:02:28 -0000 > @@ -1,14 +1,27 @@ > -Fix build failure > - > Index: src/utils/NumberUtils.h > --- src/utils/NumberUtils.h.orig > +++ src/utils/NumberUtils.h > -@@ -140,7 +140,7 @@ really_inline from_chars_result from_chars(const char > +@@ -64,8 +64,10 @@ really_inline from_chars_result from_chars(const char > + double > #ifdef _WIN32 > - tempval = _strtol_l(first, &endptr, 0, loc.local); > - #else > -- tempval = ::strtol_l(first, &endptr, 0, loc.local); > -+ tempval = ::strtoll_l(first, &endptr, 0, loc.local); > + tempval = _strtod_l(first, &endptr, loc.local); > +-#else > ++#elif defined(__GLIBC__) || defined(_LIBCPP_VERSION) > + tempval = ::strtod_l(first, &endptr, loc.local); > ++#else > ++ tempval = ::strtod(first, &endptr); > + #endif > + > + if (errno != 0 && errno != EINVAL) > +@@ -108,8 +110,10 @@ really_inline from_chars_result from_chars(const char > + #elif __APPLE__ > + // On OSX, strtod_l is for some reason drastically faster than strtof_l. > + tempval = static_cast(::strtod_l(first, &endptr, loc.local)); > +-#else > ++#elif defined(__GLIBC__) || defined(_LIBCPP_VERSION) > + tempval = ::strtof_l(first, &endptr, loc.local); > ++#else > ++ tempval = ::strtof(first, &endptr); > #endif > > if (errno != 0) > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/graphics/opencolorio/pkg/PLIST,v > retrieving revision 1.5 > diff -u -p -u -p -r1.5 PLIST > --- pkg/PLIST 5 Mar 2022 11:30:10 -0000 1.5 > +++ pkg/PLIST 24 Mar 2024 02:02:28 -0000 > @@ -11,6 +11,8 @@ lib/cmake/OpenColorIO/OpenColorIOTargets > lib/cmake/OpenColorIO/OpenColorIOTargets.cmake > @lib lib/libOpenColorIO.so.${LIBOpenColorIO_VERSION} > lib/pkgconfig/OpenColorIO.pc > -@so lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO.so > +lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO/ > +@so lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO/PyOpenColorIO.so > +lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO/__init__.py > share/ocio/ > share/ocio/setup_ocio.sh >