[patch] Buiding media-libs/opencolorio-2.0.1-r2 again OpenEXR 3

opencolorio-cumulative-OpenExr3.patch (text/plain), 5.84 KB, created by Vladislav Mikhailikov on 2022-02-11 19:50:44 UTC

diff -Naur a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
--- a/share/cmake/modules/FindExtPackages.cmake	2021-05-04 07:36:34.000000000 +0300
+++ b/share/cmake/modules/FindExtPackages.cmake	2022-02-11 22:40:24.985249693 +0300
@@ -34,7 +34,7 @@
 
 # Half (OpenEXR/IlmBase)
 # https://github.com/openexr/openexr
-find_package(Half 2.4.0 REQUIRED)
+find_package(Imath 3.0 REQUIRED)
 
 # pystring
 # https://github.com/imageworks/pystring
diff -Naur a/src/OpenColorIO/BitDepthUtils.h b/src/OpenColorIO/BitDepthUtils.h
--- a/src/OpenColorIO/BitDepthUtils.h	2021-05-04 07:36:34.000000000 +0300
+++ b/src/OpenColorIO/BitDepthUtils.h	2022-02-11 22:40:35.113173598 +0300
@@ -7,7 +7,7 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 
 
 namespace OCIO_NAMESPACE
diff -Naur a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
--- a/src/OpenColorIO/CMakeLists.txt	2021-05-04 07:36:34.000000000 +0300
+++ b/src/OpenColorIO/CMakeLists.txt	2022-02-11 22:40:24.985249693 +0300
@@ -207,7 +207,7 @@
 		public_api
 	PRIVATE
 		expat::expat
-		IlmBase::Half
+		Imath::Imath
 		pystring::pystring
 		sampleicc::sampleicc
 		utils::strings
diff -Naur a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h
--- a/src/OpenColorIO/MathUtils.h	2021-05-04 07:36:34.000000000 +0300
+++ b/src/OpenColorIO/MathUtils.h	2022-02-11 22:40:35.113173598 +0300
@@ -9,7 +9,7 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 
 namespace OCIO_NAMESPACE
 {
diff -Naur a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp
--- a/src/OpenColorIO/ops/range/RangeOp.cpp	2021-05-04 07:36:34.000000000 +0300
+++ b/src/OpenColorIO/ops/range/RangeOp.cpp	2022-02-11 22:40:35.113173598 +0300
@@ -7,7 +7,7 @@
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "GpuShaderUtils.h"
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 #include "HashUtils.h"
 #include "MathUtils.h"
 #include "ops/lut1d/Lut1DOpData.h"
diff -Naur a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp
--- a/src/OpenColorIO/transforms/builtins/ACES.cpp	2021-05-04 07:36:34.000000000 +0300
+++ b/src/OpenColorIO/transforms/builtins/ACES.cpp	2022-02-11 22:40:35.113173598 +0300
@@ -6,7 +6,7 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 #include "ops/fixedfunction/FixedFunctionOp.h"
 #include "ops/gradingrgbcurve/GradingRGBCurveOp.h"
 #include "ops/log/LogOp.h"
diff -Naur a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
--- a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp	2021-05-04 07:36:34.000000000 +0300
+++ b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp	2022-02-11 22:40:35.113173598 +0300
@@ -4,7 +4,7 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 #include "ops/lut1d/Lut1DOp.h"
 #include "transforms/builtins/OpHelpers.h"
 
diff -Naur a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt
--- a/src/apps/ocioconvert/CMakeLists.txt	2021-05-04 07:36:34.000000000 +0300
+++ b/src/apps/ocioconvert/CMakeLists.txt	2022-02-11 22:40:24.985249693 +0300
@@ -27,7 +27,7 @@
 target_link_libraries(ocioconvert
     PRIVATE
         apputils
-        IlmBase::Half
+        Imath::Imath
         ${OCIO_GL_LIB}
         oiiohelpers
         OpenColorIO
diff -Naur a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp
--- a/src/apps/ocioconvert/main.cpp	2021-05-04 07:36:34.000000000 +0300
+++ b/src/apps/ocioconvert/main.cpp	2022-02-11 22:40:35.113173598 +0300
@@ -24,7 +24,7 @@
 #endif // OCIO_GPU_ENABLED
 
 #include "oiiohelpers.h"
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 
 
 // Array of non OpenColorIO arguments.
diff -Naur a/src/apps/ocioperf/CMakeLists.txt b/src/apps/ocioperf/CMakeLists.txt
--- a/src/apps/ocioperf/CMakeLists.txt	2021-05-04 07:36:34.000000000 +0300
+++ b/src/apps/ocioperf/CMakeLists.txt	2022-02-11 22:40:24.985249693 +0300
@@ -20,7 +20,7 @@
 target_link_libraries(ocioperf
     PRIVATE
         apputils
-        IlmBase::Half
+        Imath::Imath
         oiiohelpers
         OpenColorIO
         OpenImageIO::OpenImageIO
diff -Naur a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp
--- a/src/apps/ocioperf/main.cpp	2021-05-04 07:36:34.000000000 +0300
+++ b/src/apps/ocioperf/main.cpp	2022-02-11 22:40:35.113173598 +0300
@@ -11,7 +11,7 @@
 #endif
 
 #include "apputils/argparse.h"
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 #include "oiiohelpers.h"
 #include "utils/StringUtils.h"
 
diff -Naur a/src/libutils/oiiohelpers/CMakeLists.txt b/src/libutils/oiiohelpers/CMakeLists.txt
--- a/src/libutils/oiiohelpers/CMakeLists.txt	2021-05-04 07:36:34.000000000 +0300
+++ b/src/libutils/oiiohelpers/CMakeLists.txt	2022-02-11 22:40:24.985249693 +0300
@@ -31,7 +31,7 @@
 
     PRIVATE
         OpenColorIO
-        IlmBase::Half
+        Imath::Imath
         utils::strings
 )
 
diff -Naur a/src/libutils/oiiohelpers/oiiohelpers.cpp b/src/libutils/oiiohelpers/oiiohelpers.cpp
--- a/src/libutils/oiiohelpers/oiiohelpers.cpp	2021-05-04 07:36:34.000000000 +0300
+++ b/src/libutils/oiiohelpers/oiiohelpers.cpp	2022-02-11 22:40:35.113173598 +0300
@@ -5,7 +5,7 @@
 #include <OpenColorIO/OpenColorIO.h>
 
 
-#include "OpenEXR/half.h"
+#include "Imath-3/half.h"
 #include "oiiohelpers.h"
 #include "utils/StringUtils.h"
 
diff -Naur a/tests/cpu/CMakeLists.txt b/tests/cpu/CMakeLists.txt
--- a/tests/cpu/CMakeLists.txt	2021-05-04 07:36:34.000000000 +0300
+++ b/tests/cpu/CMakeLists.txt	2022-02-11 22:40:24.985249693 +0300
@@ -18,7 +18,7 @@
             public_api
         PRIVATE
             expat::expat
-            IlmBase::Half
+            Imath::Imath
             pystring::pystring
             sampleicc::sampleicc
             unittest_data