openexr3.patch

   1 Index: hugin-2020.0.0/CMakeLists.txt
   2 ===================================================================
   3 --- hugin-2020.0.0.orig/CMakeLists.txt
   4 +++ hugin-2020.0.0/CMakeLists.txt
   5 @@ -214,7 +214,18 @@ ENDIF()
   6
   7  ENDIF()
   8
   9 -FIND_PACKAGE(OpenEXR REQUIRED)
  10 +FIND_PACKAGE(Imath CONFIG)
  11 +IF(TARGET Imath::Imath)
  12 +    FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
  13 +       FIND_PACKAGE(ZLIB REQUIRED)
  14 +       get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
  15 +       get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
  16 +    list(APPEND OPENEXR_INCLUDE_DIR ${IMATH_INCLUDE_DIR})
  17 +       set(OPENEXR_LIBRARIES OpenEXR::OpenEXR Imath::Imath ${ZLIB_LIBRARIES})
  18 +       set(OPENEXR_FOUND TRUE)
  19 +ELSE()
  20 +    FIND_PACKAGE(OpenEXR REQUIRED)
  21 +ENDIF()
  22  include_directories(${OPENEXR_INCLUDE_DIR})
  23
  24  FIND_PACKAGE(VIGRA 1.9.0 REQUIRED)
  25 Index: hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
  26 ===================================================================
  27 --- hugin-2020.0.0.orig/src/hugin_base/vigra_ext/ReduceOpenEXR.h
  28 +++ hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
  29 @@ -25,8 +25,8 @@
  30  #include <vigra_ext/HDRUtils.h>
  31  #include <vigra_ext/FileRAII.h>
  32
  33 -#include <ImfRgbaFile.h>
  34 -#include <ImfArray.h>
  35 +#include <OpenEXR/ImfRgbaFile.h>
  36 +#include <OpenEXR/ImfArray.h>
  37
  38
  39  // hack to read pgm header
  40 Index: hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
  41 ===================================================================
  42 --- hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake
  43 +++ hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
  44 @@ -75,6 +75,9 @@ IF (VIGRA_FOUND)
  45        )
  46        STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
  47        IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
  48 +      ELSEIF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libiopenexr")
  49 +           MESSAGE(STATUS "OpenEXR is version 3 or greter.")
  50 +         ELSE()
  51          MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
  52        ENDIF()
  53      ELSE()