CVS commit: pkgsrc/graphics/opencolorio

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Oct 15 19:45:33 UTC 2023

Modified Files:
        pkgsrc/graphics/opencolorio: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/opencolorio/patches:
            patch-share_cmake_modules_Findyaml-cpp.cmake
            patch-share_cmake_utils_CheckSupportGL.cmake
Removed Files:
        pkgsrc/graphics/opencolorio/patches:
            patch-export_OpenColorIO_OpenColorABI.h.in
            patch-src_core_OCIOYaml.cpp patch-src_core_Platform.h

Log Message:
opencolorio: Update to 2.2.1

* 2.3.0 is not ready for Blender 3.6.4 yet.

Changelog:
v2.2.1

This is an ABI compatible update for the 2.2.x series that includes the relevant fixes since the 2.2.0 release.

Bug fixes and minor enhancements:

PR #1743, Fix inverse Lut1D optimization issue (may affect identity Look transforms in camera log process spaces)
PR #1742, Improve naming of ICC-based virtual displays on Windows
PR #1741, Fix Python ARM Wheel (now works on M1-based Macs)
PR #1738, Update documentation for 2.2 release
PR #1734, Fix issue with isColorSpaceLinear function (to avoid crash when color space doesn't exist)
PR #1726, Processor cache does not detect context variable changes in FileTransform cccid string
PR #1723, Replace "texture2D" function with "texture" for GLSL 1.3 (allows use of GLSL 1.3)

Build enhancements:

PR #1736, OCIO CMake improvements
PR #1729, Hiding minizip-ng symbols on Mac
PR #1725, Fix issue with minizip build
PR #1721, CheckSupportSSE2: Fix sse flags unexpected propagation
PR #1720, Configure the OpenColorIO.pc file on Windows

v2.1.3

This is an ABI compatible update for the 2.1.x series that includes the relevant fixes since the 2.1.2 release.

Bug fixes:

PR #1743, Fix inverse Lut1D optimization issue (may affect identity Look transforms in camera log process spaces)
PR #1726, Processor cache does not detect context variable changes in FileTransform cccid string
PR #1723, Replace "texture2D" function with "texture" for GLSL 1.3 (allows use of GLSL 1.3)
PR #1712, Fix atan2 argument order for HLSL (may affect ACES output transforms on Windows)
PR #1697, MinGW: Work around lack of strtof_l for local-independent parsing (allows compiling with MinGW)

v2.0.5

This is an ABI compatible update for the 2.0.x series that includes the relevant fixes since the 2.0.4 release.

Bug fixes:

PR #1743, Fix inverse Lut1D optimization issue (may affect identity Look transforms in camera log process spaces)
PR #1726, Processor cache does not detect context variable changes in FileTransform cccid string
PR #1723, Replace "texture2D" function with "texture" for GLSL 1.3
PR #1712, Fix atan2 argument order for HLSL (may affect ACES output transforms on Windows)

v2.2.0

This is the main new feature release for this year and is the base version for the CY2023 VFX Reference Platform (which specifies 2.2.x).

We anticipate making an ABI-compatible 2.2.1 release near the end of the year that will fix any bugs found with the new features as the 2.2.0 library gets more widely tested.

New features:

PR #1659, Build the new ACES CG and Studio configs into the library itself
PR #1696, Allow OCIO configs to be archived, introducing the .ocioz file format
PR #1710, Convert to or from a known external color space
PR #1703, Add a method to query whether a color space is linear
PR #1637, Address circular build dependency between OCIO and OpenImageIO

Noteworthy bug fixes and enhancements:

PR #1711, Make the interchange roles required for config versions 2.2 or higher
PR #1691, Add support for ICC Parametric curves type 1-4
PR #1689, Add getProcessor calls that take a NamedTransform
PR #1604, Add preliminary support for ACES Metadata Files (AMF)
PR #1693, Add NamedTransform support for Baking and fix crosstalk issue
PR #1704, Add Built-in Transforms for ARRI LogC4 and Canon curves
PR #1706, Add Python 3.11 wheels
PR #1712, Fix atan2 issue with ACES viewing transforms in HLSL
PR #1656, Speed up config ID hashing (replace md5 with xxhash)
PR #1684, Allow ocioconvert, ociowrite, ocioperf to invert a DisplayViewTransform
PR #1646, Provide scripts to facilitate building OCIO on Windows
PR #1630, Improve iridas_cube parsing speed
PR #1605, Add Python source distribution package for PyPI
PR #1598, Add DisplayViewTransform support to Baker
PR #1516, Default to C++ 14 and remove OIIO from ocioperf
PR #1532, Update default branch name to "main"

Other fixes and minor enhancements:

PR #1715, Fix missing warnings issue with ociocheck command-line tool
PR #1713, Update Built-in configs with official 1.0.0 CG and Studio release
PR #1708, Enforce GL_NEAREST with GPU tetrahedral interpolation
PR #1697, Built fix (strtof_l) for MinGW
PR #1695, Add anchorpoint to supported applications
PR #1694, Log OCIO version for debugging purposes
PR #1692, Fix OpenEXR build on ninja
PR #1684, Fix for const literals in HLSL
PR #1678, Build fix (from_chars, strtol_l) for those using the musl-libc library
PR #1669, Correct http links to https
PR #1647, Build fixes for MS Visual Studio 2022
PR #1636, Print version in cmake find_package
PR #1635, Adjust 'family' description in OpenColorIO.h
PR #1632, Fix "requirement" typo in installation.rst
PR #1599, Minor build and CI fixes
PR #1594, Fix cmake issue with Windows Unicode support
PR #1542, Build fixes for C++ 20
PR #1596, Update Carol Payne as TSC Chair in GOVERNANCE.md
PR #1498, Add Rémi Achard to GOVERNANCE.md & COMMITTERS.md

v2.1.2

This is an ABI compatible update for the 2.1.x series that includes the relevant fixes since the 2.1.1 release.

Noteworthy bug fixes and enhancements:

PR #1626, Fix half-domain Lut1D issue for certain values above HALF_MAX (#1614)
PR #1589, Python copy support (#1575)
PR #1585, Fix support for ARM64 macOS Python wheels (#1574)

Other fixes and minor enhancements:

PR #1610, Improve OpenImageIO dependency management of Imath headers (#1572)
PR #1592, Improve CMake and library install step (#1578)
PR #1591, Remove "expat" symbols (#1582)
PR #1587, Improve the GPU unit test framework (#1562)
PR #1586, Improve the OSL integration (#1561)
PR #1584, Propagate Android CMake configuration to external projects (#1579)
PR #1571, #1653, Update library name to 2.1.2

v2.0.4

This is an ABI compatible update for the 2.0.x series that includes the relevant fixes since the 2.0.3 release.

Noteworthy bug fixes and enhancements:

PR #1625, Fix half-domain Lut1D issue for certain values above HALF_MAX (#1614)
PR #1612, Python copy support (#1589)
PR #1611, Add virtual display Python bindings (#1464)

Other fixes and minor enhancements:

PR #1570, #1652, Update library name to 2.0.4

v2.1.1

This is an ABI compatible update for the 2.1.x series that includes important fixes and improvements over the 2.1.0 release.

New capabilities:

PR #1557, Adds Metal Shading Language generation support to the GPU renderer (#1520)
PR #1504, Adds OpenGL ES generation support to the GPU renderer (#1497)

Noteworthy bug fixes and enhancements:

PR #1565, After Effects plug-in updates
PR #1559, Adds Metal support to ociodisplay and enables running GPU tests with Metal backend (#1538)
PR #1551, Fix issue resulting in NaNs when inverting ACES Output Transforms (#1539)
PR #1548, Implement locale-agnostic number parsing (#1496)
PR #1545, Fix issue causing configs to fail validation with certain LUT search paths (#1535)
PR #1544, Python 3.10 macOS wheels
PR #1529, Remove extra commas when writing a CDL in CLF file format (#1526)
PR #1527, Fixes Unicode paths on Windows (#1363)
PR #1524, Fix issues with OSL generation and improve the OSL unit test framework (#1514)
PR #1518, Add Python GPU renderer implementation example (#1493)
PR #1511, Improvement to color space metadata in ocioconvert exports (#1500)
PR #1488, Better manage Imath dependency (#1478)

Other fixes and minor enhancements:

PR #1568, Update library name to 2.1.1
PR #1567, Update CLF test image from CLF working group (#1563)
PR #1534, Fix add_test calls and change temporary file creation (#1522)
PR #1528, ConfigTest - Virtual display python unit test (#1481)
PR #1523, CMake: remove duplicate find_package(pybind11 ...) (#1521)
PR #1517, Update to new cibuildwheel location (#1513)
PR #1512, Remove Python wheel workflow running on every pull request (#1503)
PR #1510, Fix install paths regressions (#1502)
PR #1506, Fix the analysis workflow (#1492)
PR #1505, Support for valgrind and related fixes, OIIO cmake tweak (#1489)
PR #1501, Add support for MinGW (#1485)
PR #1499, FindExpat: allow usage of expat 2.2.9 (#1483)
PR #1494, Remove the useless cmake target on oiiotool (#1477)
PR #1490, Remove OpenColorIOHeaders target and hardcoded install paths (#1471)

v2.0.3

This is an ABI compatible update for the 2.0.x series that includes the relevant bug fixes from the 2.1.1 release.

Noteworthy bug fixes and enhancements:

PR #1554, Fix issue resulting in NaNs when inverting ACES Output Transforms (#1539)
PR #1552, Fix issue causing configs to fail validation with certain LUT search paths (#1535)
PR #1531, Improvement to color space metadata in ocioconvert exports (#1500)
PR #1530, Remove extra commas when writing a CDL in CLF file format (#1526)

Other fixes and minor enhancements:

PR #1560, Update library name to 2.0.3

v2.0.2

This is an ABI compatible update for the 2.0.x series that includes the relevant bug fixes from the 2.1 release.

Noteworthy bug fixes and enhancements:

PR #1445, Allow apps to use getColorSpaceFromFilePath even for v1 configs and deprecate parseColorSpaceFromString
PR #1459, Fix problem rendering to integer pixel layouts when there is a no-op
PR #1447, Update CLF test files, add Python scripts for CLF implemenation guide

Other fixes and minor enhancements:

PR #1445, Various fixes and plug-in updates (integrate PRs #1391, #1373)
PR #1425, Minor SonarCloud related fixes
PR #1426, Add OpenColorIOConfig.cmake generation
PR #1428, Use CMake visibility flags
PR #1409, Hide dependency symbol visibility
PR #1427, Improve DX11 & Cg fragment shader support
PR #1444, Minor code & docs enhancements
PR #1430, Minor FixedFunctionTransform fix
PR #1431, Fix VisualC++ compilation flags
PR #1410, Allow choice of building against a specific Python release
PR #1443, Fix problem in LegacyViewingPipeline using a look that is a no-op
PR #1470, Fix problem with DisplayViewTransform using a look that is a no-op
PR #1467, Improve CMake for Pystring
PR #1463, Add half directory for ociodisplay, ociolutimage
PR #1412, GPU build fix

v2.1.0

This is the main new feature release for this year and is the base version for the CY2022 VFX Reference Platform (which specifies 2.1.x).

New features:

PR #1404, Add ACES 1.3 Gamut Compression implementation
PR #1371, Add OpenFX OCIO plug-in framework and examples
PR #1401, Add Python wheel generation and support for PyPI (pip install)
PR #1462, Add preliminary support for emitting Open Shading Language (OSL)

Noteworthy bug fixes and enhancements:

PR #1432, Add Imath 3 support for Half dependency and update CI workflow
PR #1472, Increment version number for the config file and CTF formats to 2.1
PR #1417, Allow apps to use getColorSpaceFromFilePath even for v1 configs and deprecate parseColorSpaceFromString
PR #1422, Add getDefaultView(display, colorspaceName) method
PR #1446, Fix problem rendering to integer pixel layouts when there is a no-op
PR #1436, Update CLF test files, add Python scripts for CLF implemenation guide

Other fixes and minor enhancements:

PR #1391, Minor GPU build fix
PR #1403, Minor SonarCloud related fixes
PR #1373, After Effects & Photoshop plug-in updates
PR #1397, Add OpenColorIOConfig.cmake generation
PR #1411, Use CMake visibility flags
PR #1416, Hide dependency symbol visbility
PR #1406, Improve DX11 & Cg fragment shader support
PR #1414, Minor code & docs enhancements
PR #1418, Minor FixedFunctionTransform fix
PR #1419, Fix VisualC++ compilation flags
PR #1424, Allow choice of building against a specific Python release
PR #1421, Test CMake Config script
PR #1437, Fix problem in LegacyViewingPipeline using a look that is a no-op
PR #1460, Fix problem with DisplayViewTransform using a look that is a no-op
PR #1438, Correct error in installation documentation
PR #1407, Improve debugging of multiple threads
PR #1449, Improve CMake for Pystring
PR #1450, Fix for Windows library name
PR #1464, Add Python bindings for virtual display methods
PR #1469, Fix minor template instantiation issue

v2.0.1

This is a patch release containing the following fixes and minor enhancements:

PR #1303, Update the After Effects and Photoshop plug-ins to OCIO v2.
PR #1352, Fix a problem with allocation vars not being used for the legacy GPU processing path. This provides a new getOptimizedLegacyGPUProcessor call for developers to access the legacy GPU 
processing (although you should be using the new GPU processor anyway!) and deprecates the previous CreateLegacyShaderDesc method.
PR #1387, Fix an issue where the environment section of the config was not being validated correctly for vars without a default. This also introduces stricter rules for validation of this part of the 
config and prevents a possible crash affecting both v1 and v2.
PR #1394, After Effects and Photoshop plug-in build updates.
PR #1370, Fix a minor issue with how CDL ops are optimized.
PR #1365, Enable gcc -Wextra build flag and clean up the resulting warnings.
PR #1353, Re-enable support for negative stride values for packed and planar ImageDescs.
PR #1351, Improve C++ version detection and fix some compilation issues.
PR #1350, Fix and update 'setup_ocio' script.
PR #1339, Correct a typo in the OCIO_USER_CATEGORIES environment variable name.
PR #1338, Fix an issue with the RPATH that was impacting the Python binding.
PR #1336, Improvements to cmake scripts and remove the OCIO_ADD_EXTRA_BUILTINS flag.
PR #1306, Correct the minimum GLSL version specified in some places (is now GPU_LANGUAGE_GLSL_1_2).

v2.0.0

This is the official release of OpenColorIO v2! The noteworthy changes relative to v2.0.0rc1 are:

PR #1291, Fixed a bug in the single-pixel applyRGB call.
PR #1281, Additional ACES Built-in Transforms -- The built-ins now include all transforms identified by the config working group for the initial ACES config, including all of the ACES Output 
Transforms.
PR #1280, Add to Python binding Uniform_Float3 and setStrictParsingEnabled.
PR #1277, Fixed pybind issue to allow children of Transform class to have the correct type.
PR #1275, Restructure PyOpenColorIO -- Completed PyGpuShaderDesc and moved declarations. Fixed a number of issues with the Python documentation.
PR #1274, Added lots of new Python unit tests, adjusted a few bindings as a result. Reserved some enums for future work.
PR #1272, Avoid NaN values during Lut1D composition.
PR #1271, Python dynamic property fixes and added unit tests. Warn if more than one property is active.
PR #1270, Modify Python LogCameraTransform and FixedFunctionTransform constructors to require arguments. Direct operator<< to Python repr rather than str.
PR #1268, Make shader textures available via the Python API.
PR #1267, Add constants for new roles to the API. Have parseColorSpaceFromString include inactive spaces. Modify ociocheck to warn if roles are missing, rather than error. Fix exception propagation 
issue from FileRules.
PR #1266, Use OIIO-provided CMake find module to fix build issue.

v2.0.0-rc1

This is the first release candidate for OCIO v2. The final release is about two weeks away, we request people test this thoroughly and help us find any issues. Here are the noteworthy changes 
relative to beta2:

PR #1241, Color Space Aliases -- It is now possible to define several alternate names for a color space, for example, a full name and an abbreviated name appropriate for use in image file paths. An 
optional "name" attribute was also added to the config.
PR #1220, App Helpers and Category improvements -- The App Helpers functions to ease use of the library have been moved into OCIO core. Also, the options for filtering color spaces based on category 
is now more powerful, implementing issue #1222.
PR #1197, New API Docs implementation -- This overhauls the way the API documentation for both C++ and Python are generated. Contributors now need to manually update the frozen Python .rst files and 
should review the issue for details.
PR #1249, Improved Python apply functions -- This fixed several Python applyRGB issues and the unit test for PyCPUProcessor now requires NumPy.
PR #1244, Improved version handling and config synonyms -- The parser will now throw if reading a minor version higher than current (i.e. a config version 2.1 or higher will now throw). This also 
fixed a bug when writing v1 configs that caused them to not load correctly. Several syntax enhancements requested related to view transforms were added: - The from/to_reference color space attributes 
are now written as from/to_scene_reference in v2 configs, although the old syntax is also supported. - The config also now has an attribute to identify the default view transform.
PR #1221, CDLTransform cleanup -- The code for reading and writing CDLs was refactored and the API changed so that they are written more like CLF and CTF files. The write method on Processor was 
moved to GroupTransform. The way CDL metadata is handled was made more consistent with CLF/CTF. Files with several CDLS (e.g. ccc) may now be loaded into a single GroupTransform.
PR #1245, Finish inversion of new look ops -- This complete the work on issue #1100, these operators all work in both forward and inverse direction.
PR #1251, Fix ACEScc and XYZ built-in transforms -- Addresses issues with several built-in transforms.
PR #1252, Misc fixes -- The ColorSpaceMenuHelpers code no longer warns on v1 configs. An edge case of using LegacyViewingPipeline with named transforms was addressed.
PR #1214, Minor file rules fixes.

v2.0.0-beta2

This is the second beta for OCIO v2. The release candidate is not far off, we request people test this thoroughly and help us find any issues. Here are the noteworthy changes relative to beta1:

PR #1189, Named Color Transforms -- It is now possible to include color transforms in a config separately from color spaces.
PR #1229, Data bypass fix -- Critical bug fix for an issue where conversions on data color spaces were sometimes not bypassed.
PR #1205, Remove dynamic properties from configs -- It is not possible to use dynamic properties in configs, configs are intended to be fixed representations.
PR #1228, Bump pybind11 required version to 2.6.1 -- Moving from 2.4.3 to 2.6.1 removes a dependency that was causing build issues.
PR #1204, Some API cleanup -- Capitalization change for three functions used for iterating over available LUT file formats.
PR #1208, Remove the 'unknown' shader language -- Minor cleanup of GPU renderer API.

v2.0.0-beta1

That's the beta1 step for the coming version 2 release.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/opencolorio/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/opencolorio/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/opencolorio/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/opencolorio/distinfo
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/opencolorio/patches/patch-export_OpenColorIO_OpenColorABI.h.in \
    pkgsrc/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp \
    pkgsrc/graphics/opencolorio/patches/patch-src_core_Platform.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake \
    pkgsrc/graphics/opencolorio/patches/patch-share_cmake_utils_CheckSupportGL.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/opencolorio/Makefile
diff -u pkgsrc/graphics/opencolorio/Makefile:1.8 pkgsrc/graphics/opencolorio/Makefile:1.9
--- pkgsrc/graphics/opencolorio/Makefile:1.8    Tue Jul 18 18:19:23 2023
+++ pkgsrc/graphics/opencolorio/Makefile        Sun Oct 15 19:45:33 2023
@@ -1,45 +1,56 @@
-# $NetBSD: Makefile,v 1.8 2023/07/18 18:19:23 nia Exp $
+# $NetBSD: Makefile,v 1.9 2023/10/15 19:45:33 ryoon Exp $
 
-DISTNAME=      OpenColorIO-1.1.1
-PKGREVISION=   1
+DISTNAME=      OpenColorIO-2.2.1
+PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=imageworks/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=AcademySoftwareFoundation/}
+GITHUB_PROJECT=        OpenColorIO
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/imageworks/OpenColorIO/
+HOMEPAGE=      https://opencolorio.org/
 COMMENT=       Color management solution
 LICENSE=       modified-bsd AND mit
 
-USE_CMAKE=     yes
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++11
+USE_TOOLS+=    gmake pkg-config
+USE_LANGUAGES= gnu99 gnu++14 # alloca(3)
+BUILDLINK_TRANSFORM+=  opt:-std=c++14:-std=gnu++14 # alloca(3)
 
 USE_CXX_FEATURES+=     c++11
 
-CMAKE_ARGS+=   -DUSE_EXTERNAL_TINYXML:BOOL=ON
-CMAKE_ARGS+=   -DUSE_EXTERNAL_YAML:BOOL=ON
-CMAKE_ARGS+=   -DOCIO_BUILD_APPS:BOOL=OFF
-CMAKE_ARGS+=   -DOCIO_BUILD_SHARED:BOOL=ON
-CMAKE_ARGS+=   -DOCIO_BUILD_PYGLUE:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_EXTERNAL_TINYXML:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_EXTERNAL_YAML:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DOCIO_BUILD_SHARED:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DOCIO_BUILD_PYGLUE:BOOL=OFF
 
 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
-CMAKE_ARGS+=   -DOCIO_USE_SSE:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF
 .endif
 
-PKGCONFIG_OVERRIDE+=   export/pkgconfig/OpenColorIO.pc.in
+PKGCONFIG_OVERRIDE+=   src/OpenColorIO/res/OpenColorIO.pc.in
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
-INSTALLATION_DIRS+=    lib/cmake/OpenColorIO
+OBJDIR=                        ../build
+CONFIGURE_DIRS=                ${OBJDIR}
 
-post-install:
-       ${MV} ${DESTDIR}${PREFIX}/lib/static/*.a ${DESTDIR}${PREFIX}/lib
-       ${MV} ${DESTDIR}${PREFIX}/*.cmake ${DESTDIR}${PREFIX}/lib/cmake/OpenColorIO
-       ${MV} ${DESTDIR}${PREFIX}/cmake/*.cmake ${DESTDIR}${PREFIX}/lib/cmake/OpenColorIO
+pre-configure:
+       ${MKDIR} ${WRKSRC}/${OBJDIR}
 
+.include "../../archivers/minizip-ng/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/py-pybind11/buildlink3.mk"
+.include "../../devel/pystring/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
-.include "../../textproc/tinyxml/buildlink3.mk"
+.include "../../math/imath/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
+PY_PATCHPLIST= yes
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/opencolorio/PLIST
diff -u pkgsrc/graphics/opencolorio/PLIST:1.3 pkgsrc/graphics/opencolorio/PLIST:1.4
--- pkgsrc/graphics/opencolorio/PLIST:1.3       Thu Sep 19 14:44:23 2019
+++ pkgsrc/graphics/opencolorio/PLIST   Sun Oct 15 19:45:33 2023
@@ -1,14 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2019/09/19 14:44:23 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/10/15 19:45:33 ryoon Exp $
 include/OpenColorIO/OpenColorABI.h
+include/OpenColorIO/OpenColorAppHelpers.h
 include/OpenColorIO/OpenColorIO.h
 include/OpenColorIO/OpenColorTransforms.h
 include/OpenColorIO/OpenColorTypes.h
-lib/cmake/OpenColorIO/OpenColorIO-relwithdebinfo.cmake
-lib/cmake/OpenColorIO/OpenColorIO.cmake
+include/OpenColorIO/oglapphelpers/glsl.h
+include/OpenColorIO/oglapphelpers/oglapp.h
 lib/cmake/OpenColorIO/OpenColorIOConfig.cmake
-lib/libOpenColorIO.a
+lib/cmake/OpenColorIO/OpenColorIOConfigVersion.cmake
+lib/cmake/OpenColorIO/OpenColorIOTargets-release.cmake
+lib/cmake/OpenColorIO/OpenColorIOTargets.cmake
 lib/libOpenColorIO.so
-lib/libOpenColorIO.so.1
+lib/libOpenColorIO.so.2.2
 lib/libOpenColorIO.so.${PKGVERSION}
+lib/libOpenColorIOoglapphelpers.a
 lib/pkgconfig/OpenColorIO.pc
+${PYSITELIB}/PyOpenColorIO.so
 share/ocio/setup_ocio.sh

Index: pkgsrc/graphics/opencolorio/buildlink3.mk
diff -u pkgsrc/graphics/opencolorio/buildlink3.mk:1.2 pkgsrc/graphics/opencolorio/buildlink3.mk:1.3
--- pkgsrc/graphics/opencolorio/buildlink3.mk:1.2       Wed Sep 18 22:30:49 2019
+++ pkgsrc/graphics/opencolorio/buildlink3.mk   Sun Oct 15 19:45:33 2023
@@ -1,16 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/09/18 22:30:49 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2023/10/15 19:45:33 ryoon Exp $
 
-BUILDLINK_TREE+=       OpenColorIO
+BUILDLINK_TREE+=       opencolorio
 
 .if !defined(OPENCOLORIO_BUILDLINK3_MK)
 OPENCOLORIO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.OpenColorIO+=    OpenColorIO>=1.0.9
-BUILDLINK_PKGSRCDIR.OpenColorIO?=      ../../graphics/opencolorio
+BUILDLINK_API_DEPENDS.opencolorio+=    opencolorio>=2.2.1
+BUILDLINK_PKGSRCDIR.opencolorio?=      ../../graphics/opencolorio
 
-.include "../../graphics/lcms2/buildlink3.mk"
-.include "../../textproc/tinyxml/buildlink3.mk"
-.include "../../textproc/yaml-cpp/buildlink3.mk"
 .endif # OPENCOLORIO_BUILDLINK3_MK
 
-BUILDLINK_TREE+=       -OpenColorIO
+BUILDLINK_TREE+=       -opencolorio

Index: pkgsrc/graphics/opencolorio/distinfo
diff -u pkgsrc/graphics/opencolorio/distinfo:1.7 pkgsrc/graphics/opencolorio/distinfo:1.8
--- pkgsrc/graphics/opencolorio/distinfo:1.7    Tue Oct 26 10:46:34 2021
+++ pkgsrc/graphics/opencolorio/distinfo        Sun Oct 15 19:45:33 2023
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:46:34 nia Exp $
+$NetBSD: distinfo,v 1.8 2023/10/15 19:45:33 ryoon Exp $
 
-BLAKE2s (OpenColorIO-1.1.1.tar.gz) = b37098be97bd8613336be507c440af88b80d1ccf3ba2ad621f82a17b7cbc5e42
-SHA512 (OpenColorIO-1.1.1.tar.gz) = bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-Size (OpenColorIO-1.1.1.tar.gz) = 13828483 bytes
-SHA1 (patch-export_OpenColorIO_OpenColorABI.h.in) = cc1bae24995365513ca16dc41be21a7c52d59b5c
-SHA1 (patch-src_core_OCIOYaml.cpp) = b471f546ebaea375ee28ad3b690b39221f3737ff
-SHA1 (patch-src_core_Platform.h) = ff731e912354126992e30fbdc2a6ce39da6df082
+BLAKE2s (OpenColorIO-2.2.1.tar.gz) = 5fd74fcfa9cc588b7252dcc32df273c69a62a49ccd22b3258f6b2a4d3022624a
+SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
+Size (OpenColorIO-2.2.1.tar.gz) = 11336775 bytes
+SHA1 (patch-share_cmake_modules_Findyaml-cpp.cmake) = e0ae8f97d09ef9c762b419a96a0c091333b4a0c9
+SHA1 (patch-share_cmake_utils_CheckSupportGL.cmake) = f259440166689f7fd8970a61456f111981083733

Added files:

Index: pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake
diff -u /dev/null pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake:1.1
--- /dev/null   Sun Oct 15 19:45:33 2023
+++ pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake    Sun Oct 15 19:45:33 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-share_cmake_modules_Findyaml-cpp.cmake,v 1.1 2023/10/15 19:45:33 ryoon Exp $
+
+* Fix yaml-cpp-0.8.8 detection.
+
+--- share/cmake/modules/Findyaml-cpp.cmake.orig        2023-01-06 02:05:59.000000000 +0000
++++ share/cmake/modules/Findyaml-cpp.cmake
+@@ -39,7 +39,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA
+ 
+     if(NOT DEFINED yaml-cpp_ROOT)
+         # Search for yaml-cpp-config.cmake
+-        find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
++        find_package(yaml-cpp::yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
+     endif()
+ 
+     if(yaml-cpp_FOUND)
Index: pkgsrc/graphics/opencolorio/patches/patch-share_cmake_utils_CheckSupportGL.cmake
diff -u /dev/null pkgsrc/graphics/opencolorio/patches/patch-share_cmake_utils_CheckSupportGL.cmake:1.1
--- /dev/null   Sun Oct 15 19:45:33 2023
+++ pkgsrc/graphics/opencolorio/patches/patch-share_cmake_utils_CheckSupportGL.cmake    Sun Oct 15 19:45:33 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-share_cmake_utils_CheckSupportGL.cmake,v 1.1 2023/10/15 19:45:33 ryoon Exp $
+
+* pkgsrc does not provide libOpenGL.so.
+
+--- share/cmake/utils/CheckSupportGL.cmake.orig        2023-01-06 02:05:59.000000000 +0000
++++ share/cmake/utils/CheckSupportGL.cmake
+@@ -76,14 +76,6 @@ if((OCIO_BUILD_TESTS AND OCIO_BUILD_GPU_
+     if(NOT OCIO_GL_ENABLED)
+         message(WARNING "GPU rendering disabled")
+     else()
+-        # OpenGL_egl_Library is defined iff GLVND is supported (CMake 10+).
+-        if(OPENGL_egl_LIBRARY)
+-            message(STATUS "GLVND supported")
+-            set(OCIO_USE_GLVND ON)
+-        else()
+-            message(STATUS "GLVND not supported; legacy OpenGL libraries used")
+-        endif()
+-
+         if(OCIO_USE_HEADLESS)
+             if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+                 if(NOT OCIO_USE_GLVND)