From 0ffc8a0a64486fc3576876e4eaf1c5225bd30dc5 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Wed, 24 May 2023 01:11:20 -0300 Subject: applying patch opencolorio-openexr3.patch diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake index c98e0af..5f68593 100644 --- a/share/cmake/modules/FindExtPackages.cmake +++ b/share/cmake/modules/FindExtPackages.cmake @@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED) # 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 --git a/src/OpenColorIO/BitDepthUtils.h b/src/OpenColorIO/BitDepthUtils.h index a8b3cbd..97090ea 100644 --- a/src/OpenColorIO/BitDepthUtils.h +++ b/src/OpenColorIO/BitDepthUtils.h @@ -7,7 +7,7 @@ #include -#include "OpenEXR/half.h" +#include "Imath/half.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt index 2ce801e..824f8a9 100755 --- a/src/OpenColorIO/CMakeLists.txt +++ b/src/OpenColorIO/CMakeLists.txt @@ -207,7 +207,7 @@ target_link_libraries(OpenColorIO public_api PRIVATE expat::expat - IlmBase::Half + Imath::Imath pystring::pystring sampleicc::sampleicc utils::strings diff --git a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h index 309c624..0873d49 100644 --- a/src/OpenColorIO/MathUtils.h +++ b/src/OpenColorIO/MathUtils.h @@ -9,7 +9,7 @@ #include -#include "OpenEXR/half.h" +#include "Imath/half.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp index 9ec863e..444dac7 100644 --- a/src/OpenColorIO/ops/range/RangeOp.cpp +++ b/src/OpenColorIO/ops/range/RangeOp.cpp @@ -7,7 +7,7 @@ #include #include "GpuShaderUtils.h" -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "HashUtils.h" #include "MathUtils.h" #include "ops/lut1d/Lut1DOpData.h" diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp index 20968c0..9ee2ac2 100644 --- a/src/OpenColorIO/transforms/builtins/ACES.cpp +++ b/src/OpenColorIO/transforms/builtins/ACES.cpp @@ -6,7 +6,7 @@ #include -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "ops/fixedfunction/FixedFunctionOp.h" #include "ops/gradingrgbcurve/GradingRGBCurveOp.h" #include "ops/log/LogOp.h" diff --git a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp index 04b8fbd..288ca56 100644 --- a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp +++ b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp @@ -4,7 +4,7 @@ #include -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "ops/lut1d/Lut1DOp.h" #include "transforms/builtins/OpHelpers.h" diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt index 68a5db1..6fea394 100755 --- a/src/apps/ocioconvert/CMakeLists.txt +++ b/src/apps/ocioconvert/CMakeLists.txt @@ -27,7 +27,7 @@ set_target_properties(ocioconvert PROPERTIES target_link_libraries(ocioconvert PRIVATE apputils - IlmBase::Half + Imath::Imath ${OCIO_GL_LIB} oiiohelpers OpenColorIO diff --git a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp index b56d499..7e8af7d 100644 --- a/src/apps/ocioconvert/main.cpp +++ b/src/apps/ocioconvert/main.cpp @@ -24,7 +24,7 @@ namespace OIIO = OIIO_NAMESPACE; #endif // OCIO_GPU_ENABLED #include "oiiohelpers.h" -#include "OpenEXR/half.h" +#include "Imath/half.h" // Array of non OpenColorIO arguments. diff --git a/src/apps/ocioperf/CMakeLists.txt b/src/apps/ocioperf/CMakeLists.txt index 69e9ba4..bcbe47b 100644 --- a/src/apps/ocioperf/CMakeLists.txt +++ b/src/apps/ocioperf/CMakeLists.txt @@ -20,7 +20,7 @@ set_target_properties(ocioperf PROPERTIES target_link_libraries(ocioperf PRIVATE apputils - IlmBase::Half + Imath::Imath oiiohelpers OpenColorIO OpenImageIO::OpenImageIO diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp index 6427860..f6e4a63 100644 --- a/src/apps/ocioperf/main.cpp +++ b/src/apps/ocioperf/main.cpp @@ -11,7 +11,7 @@ namespace OIIO = OIIO_NAMESPACE; #endif #include "apputils/argparse.h" -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "oiiohelpers.h" #include "utils/StringUtils.h" diff --git a/src/libutils/oiiohelpers/CMakeLists.txt b/src/libutils/oiiohelpers/CMakeLists.txt index 6ef7c36..bcd262f 100644 --- a/src/libutils/oiiohelpers/CMakeLists.txt +++ b/src/libutils/oiiohelpers/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(oiiohelpers PRIVATE OpenColorIO - IlmBase::Half + Imath::Imath utils::strings ) diff --git a/src/libutils/oiiohelpers/oiiohelpers.cpp b/src/libutils/oiiohelpers/oiiohelpers.cpp index be1a937..ca77b86 100644 --- a/src/libutils/oiiohelpers/oiiohelpers.cpp +++ b/src/libutils/oiiohelpers/oiiohelpers.cpp @@ -5,7 +5,7 @@ #include -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "oiiohelpers.h" #include "utils/StringUtils.h" diff --git a/tests/cpu/CMakeLists.txt b/tests/cpu/CMakeLists.txt index 6738996..8e8dd90 100755 --- a/tests/cpu/CMakeLists.txt +++ b/tests/cpu/CMakeLists.txt @@ -18,7 +18,7 @@ function(add_ocio_test NAME SOURCES PRIVATE_INCLUDES) public_api PRIVATE expat::expat - IlmBase::Half + Imath::Imath pystring::pystring sampleicc::sampleicc unittest_data -- 2.37.3 From 9e6338d65c8b8633c8289e198c3ee663136090d2 Mon Sep 17 00:00:00 2001 From: begasus Date: Tue, 20 Jul 2021 13:29:41 +0000 Subject: Fix installation paths diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index 9295acb..732caa3 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,4 +264,4 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/share/ocio/${OCIO_SETUP_NAME}.in ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} DESTINATION share/ocio/) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/) diff --git a/include/OpenColorIO/CMakeLists.txt b/include/OpenColorIO/CMakeLists.txt index e4c8a79..b8b4dca 100644 --- a/include/OpenColorIO/CMakeLists.txt +++ b/include/OpenColorIO/CMakeLists.txt @@ -16,4 +16,4 @@ file(GLOB_RECURSE core_export_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h") list(APPEND core_export_headers ${CMAKE_CURRENT_BINARY_DIR}/OpenColorABI.h) install(FILES ${core_export_headers} - DESTINATION include/OpenColorIO) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenColorIO) diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt old mode 100755 new mode 100644 index 824f8a9..aff6116 --- a/src/OpenColorIO/CMakeLists.txt +++ b/src/OpenColorIO/CMakeLists.txt @@ -279,7 +279,7 @@ if(MSVC AND BUILD_SHARED_LIBS) endif() install(TARGETS OpenColorIO - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -- 2.37.3 From aa0cf214a0ba2b6cd83416d18d7561db36616d70 Mon Sep 17 00:00:00 2001 From: begasus Date: Tue, 20 Jul 2021 13:31:09 +0000 Subject: Fix build for private expat::expat diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt index aff6116..7c4d966 100644 --- a/src/OpenColorIO/CMakeLists.txt +++ b/src/OpenColorIO/CMakeLists.txt @@ -206,7 +206,7 @@ target_link_libraries(OpenColorIO PUBLIC public_api PRIVATE - expat::expat + expat Imath::Imath pystring::pystring sampleicc::sampleicc -- 2.37.3