From 1843de9ea8d6b481e7d006e7b738ced535fbb6cc Mon Sep 17 00:00:00 2001
From: Larry Gritz <lg@larrygritz.com>
Date: Tue, 5 Jan 2021 20:20:52 -0800
Subject: [PATCH] Fix build break against OpenColorIO master -- headers
 disappeared (#2817)

The functions we depend on are all still there, they just moved from
these headers into the main OpenColorIO.h.
---
 src/libOpenImageIO/color_ocio.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/libOpenImageIO/color_ocio.cpp b/src/libOpenImageIO/color_ocio.cpp
index fa000fcfb7..8aae34517d 100644
--- a/src/libOpenImageIO/color_ocio.cpp
+++ b/src/libOpenImageIO/color_ocio.cpp
@@ -24,9 +24,19 @@
 #    include <OpenColorIO/OpenColorIO.h>
 #    if OCIO_VERSION_HEX >= MAKE_OCIO_VERSION_HEX(2, 0, 0)
 #        define OCIO_v2 1
-#        include <OpenColorIO/apphelpers/ColorSpaceHelpers.h>
-#        include <OpenColorIO/apphelpers/DisplayViewHelpers.h>
-#        include <OpenColorIO/apphelpers/ViewingPipeline.h>
+// NOTE: these 3 header files were part of the pre-release OCIO 2.0 but
+// eventually were removed. After OCIO v2 is released and we are fairly
+// confident nobody will encounter them, we can remove these includes
+// entirely.
+#        if __has_include(<OpenColorIO/apphelpers/ColorSpaceHelpers.h>)
+#            include <OpenColorIO/apphelpers/ColorSpaceHelpers.h>
+#        endif
+#        if __has_include(<OpenColorIO/apphelpers/DisplayViewHelpers.h>)
+#            include <OpenColorIO/apphelpers/DisplayViewHelpers.h>
+#        endif
+#        if __has_include(<OpenColorIO/apphelpers/ViewingPipeline.h>)
+#            include <OpenColorIO/apphelpers/ViewingPipeline.h>
+#        endif
 #    endif
 namespace OCIO = OCIO_NAMESPACE;
 #endif