opencolorio/repos/extra-x86_64/opencolorio-openexr3.patch

   1 diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
   2 index c98e0af3..5f685935 100644
   3 --- a/share/cmake/modules/FindExtPackages.cmake
   4 +++ b/share/cmake/modules/FindExtPackages.cmake
   5 @@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED)
   6
   7  # Half (OpenEXR/IlmBase)
   8  # https://github.com/openexr/openexr
   9 -find_package(Half 2.4.0 REQUIRED)
  10 +find_package(Imath 3.0 REQUIRED)
  11
  12  # pystring
  13  # https://github.com/imageworks/pystring
  14 diff --git a/src/OpenColorIO/BitDepthUtils.h b/src/OpenColorIO/BitDepthUtils.h
  15 index a8b3cbd9..bb0163bf 100644
  16 --- a/src/OpenColorIO/BitDepthUtils.h
  17 +++ b/src/OpenColorIO/BitDepthUtils.h
  18 @@ -7,7 +7,7 @@
  19
  20  #include <OpenColorIO/OpenColorIO.h>
  21
  22 -#include "OpenEXR/half.h"
  23 +#include "Imath/half.h"
  24
  25
  26  namespace OCIO_NAMESPACE
  27 diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
  28 index 2ce801e6..824f8a98 100755
  29 --- a/src/OpenColorIO/CMakeLists.txt
  30 +++ b/src/OpenColorIO/CMakeLists.txt
  31 @@ -207,7 +207,7 @@ target_link_libraries(OpenColorIO
  32                 public_api
  33         PRIVATE
  34                 expat::expat
  35 -               IlmBase::Half
  36 +               Imath::Imath
  37                 pystring::pystring
  38                 sampleicc::sampleicc
  39                 utils::strings
  40 diff --git a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h
  41 index 309c6244..0873d490 100644
  42 --- a/src/OpenColorIO/MathUtils.h
  43 +++ b/src/OpenColorIO/MathUtils.h
  44 @@ -9,7 +9,7 @@
  45
  46  #include <OpenColorIO/OpenColorIO.h>
  47
  48 -#include "OpenEXR/half.h"
  49 +#include "Imath/half.h"
  50
  51  namespace OCIO_NAMESPACE
  52  {
  53 diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp
  54 index 9ec863e2..444dac75 100644
  55 --- a/src/OpenColorIO/ops/range/RangeOp.cpp
  56 +++ b/src/OpenColorIO/ops/range/RangeOp.cpp
  57 @@ -7,7 +7,7 @@
  58  #include <OpenColorIO/OpenColorIO.h>
  59
  60  #include "GpuShaderUtils.h"
  61 -#include "OpenEXR/half.h"
  62 +#include "Imath/half.h"
  63  #include "HashUtils.h"
  64  #include "MathUtils.h"
  65  #include "ops/lut1d/Lut1DOpData.h"
  66 diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp
  67 index 20968c0d..9ee2ac27 100644
  68 --- a/src/OpenColorIO/transforms/builtins/ACES.cpp
  69 +++ b/src/OpenColorIO/transforms/builtins/ACES.cpp
  70 @@ -6,7 +6,7 @@
  71
  72  #include <OpenColorIO/OpenColorIO.h>
  73
  74 -#include "OpenEXR/half.h"
  75 +#include "Imath/half.h"
  76  #include "ops/fixedfunction/FixedFunctionOp.h"
  77  #include "ops/gradingrgbcurve/GradingRGBCurveOp.h"
  78  #include "ops/log/LogOp.h"
  79 diff --git a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
  80 index 04b8fbd4..288ca566 100644
  81 --- a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
  82 +++ b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
  83 @@ -4,7 +4,7 @@
  84
  85  #include <OpenColorIO/OpenColorIO.h>
  86
  87 -#include "OpenEXR/half.h"
  88 +#include "Imath/half.h"
  89  #include "ops/lut1d/Lut1DOp.h"
  90  #include "transforms/builtins/OpHelpers.h"
  91
  92 diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt
  93 index 68a5db17..6fea394a 100755
  94 --- a/src/apps/ocioconvert/CMakeLists.txt
  95 +++ b/src/apps/ocioconvert/CMakeLists.txt
  96 @@ -27,7 +27,7 @@ set_target_properties(ocioconvert PROPERTIES
  97  target_link_libraries(ocioconvert
  98      PRIVATE
  99          apputils
 100 -        IlmBase::Half
 101 +        Imath::Imath
 102          ${OCIO_GL_LIB}
 103          oiiohelpers
 104          OpenColorIO
 105 diff --git a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp
 106 index b56d4999..7e8af7d0 100644
 107 --- a/src/apps/ocioconvert/main.cpp
 108 +++ b/src/apps/ocioconvert/main.cpp
 109 @@ -24,7 +24,7 @@ namespace OIIO = OIIO_NAMESPACE;
 110  #endif // OCIO_GPU_ENABLED
 111
 112  #include "oiiohelpers.h"
 113 -#include "OpenEXR/half.h"
 114 +#include "Imath/half.h"
 115
 116
 117  // Array of non OpenColorIO arguments.
 118 diff --git a/src/apps/ocioperf/CMakeLists.txt b/src/apps/ocioperf/CMakeLists.txt
 119 index 69e9ba4c..bcbe47be 100644
 120 --- a/src/apps/ocioperf/CMakeLists.txt
 121 +++ b/src/apps/ocioperf/CMakeLists.txt
 122 @@ -20,7 +20,7 @@ set_target_properties(ocioperf PROPERTIES
 123  target_link_libraries(ocioperf
 124      PRIVATE
 125          apputils
 126 -        IlmBase::Half
 127 +        Imath::Imath
 128          oiiohelpers
 129          OpenColorIO
 130          OpenImageIO::OpenImageIO
 131 diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp
 132 index 6427860d..f6e4a63c 100644
 133 --- a/src/apps/ocioperf/main.cpp
 134 +++ b/src/apps/ocioperf/main.cpp
 135 @@ -11,7 +11,7 @@ namespace OIIO = OIIO_NAMESPACE;
 136  #endif
 137
 138  #include "apputils/argparse.h"
 139 -#include "OpenEXR/half.h"
 140 +#include "Imath/half.h"
 141  #include "oiiohelpers.h"
 142  #include "utils/StringUtils.h"
 143
 144 diff --git a/src/libutils/oiiohelpers/CMakeLists.txt b/src/libutils/oiiohelpers/CMakeLists.txt
 145 index 6ef7c368..5f4a5113 100644
 146 --- a/src/libutils/oiiohelpers/CMakeLists.txt
 147 +++ b/src/libutils/oiiohelpers/CMakeLists.txt
 148 @@ -31,7 +31,7 @@ target_link_libraries(oiiohelpers
 149
 150      PRIVATE
 151          OpenColorIO
 152 -        IlmBase::Half
 153 +        Imath::Imath
 154          utils::strings
 155  )
 156
 157 diff --git a/src/libutils/oiiohelpers/oiiohelpers.cpp b/src/libutils/oiiohelpers/oiiohelpers.cpp
 158 index be1a937d..e7db652c 100644
 159 --- a/src/libutils/oiiohelpers/oiiohelpers.cpp
 160 +++ b/src/libutils/oiiohelpers/oiiohelpers.cpp
 161 @@ -5,7 +5,7 @@
 162  #include <OpenColorIO/OpenColorIO.h>
 163
 164
 165 -#include "OpenEXR/half.h"
 166 +#include "Imath/half.h"
 167  #include "oiiohelpers.h"
 168  #include "utils/StringUtils.h"
 169
 170 diff --git a/tests/cpu/CMakeLists.txt b/tests/cpu/CMakeLists.txt
 171 index 67389962..8e8dd900 100755
 172 --- a/tests/cpu/CMakeLists.txt
 173 +++ b/tests/cpu/CMakeLists.txt
 174 @@ -18,7 +18,7 @@ function(add_ocio_test NAME SOURCES PRIVATE_INCLUDES)
 175              public_api
 176          PRIVATE
 177              expat::expat
 178 -            IlmBase::Half
 179 +            Imath::Imath
 180              pystring::pystring
 181              sampleicc::sampleicc
 182              unittest_data