The next fedora 35 release has OpenEXR 3 (released in April) which
breaks some Hugin related stuff. Attached, working patches from
fedora.
--
Bruno
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/CAJV99Zh33a9cokPY2rvDKh75O16tih-MVPTk_e7unA2-pCxPbQ%40mail.gmail.com.
Index: vigra-1.11.1/CMakeLists.txt
===================================================================
--- vigra-1.11.1.orig/CMakeLists.txt
+++ vigra-1.11.1/CMakeLists.txt
@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
IF(WITH_OPENEXR)
+ FIND_PACKAGE(Imath CONFIG)
+ IF(TARGET Imath::Imath)
+ FIND_PACKAGE(OpenEXR CONFIG)
+ SET(OPENEXR_LIBRARIES
+ OpenEXR::OpenEXR
+ OpenEXR::Iex
+ OpenEXR::IlmThread
+ Imath::Imath
+ )
+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
+ include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
+ set(OPENEXR_FOUND TRUE)
+ ELSE()
VIGRA_FIND_PACKAGE(OpenEXR)
+ ENDIF()
ENDIF()
IF(WITH_HDF5)
Index: vigra-1.11.1/src/impex/CMakeLists.txt
===================================================================
--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
+++ vigra-1.11.1/src/impex/CMakeLists.txt
@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
ENDIF(TIFF_FOUND)
IF(OPENEXR_FOUND)
+ cmake_policy(SET CMP0028 NEW)
TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
ENDIF(OPENEXR_FOUND)
Index: hugin-2020.0.0/CMakeLists.txt
===================================================================
--- hugin-2020.0.0.orig/CMakeLists.txt
+++ hugin-2020.0.0/CMakeLists.txt
@@ -214,7 +214,18 @@ ENDIF()
ENDIF()
-FIND_PACKAGE(OpenEXR REQUIRED)
+FIND_PACKAGE(Imath CONFIG)
+IF(TARGET Imath::Imath)
+ FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
+ FIND_PACKAGE(ZLIB REQUIRED)
+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
+ list(APPEND OPENEXR_INCLUDE_DIR ${IMATH_INCLUDE_DIR})
+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR Imath::Imath ${ZLIB_LIBRARIES})
+ set(OPENEXR_FOUND TRUE)
+ELSE()
+ FIND_PACKAGE(OpenEXR REQUIRED)
+ENDIF()
include_directories(${OPENEXR_INCLUDE_DIR})
FIND_PACKAGE(VIGRA 1.9.0 REQUIRED)
Index: hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
===================================================================
--- hugin-2020.0.0.orig/src/hugin_base/vigra_ext/ReduceOpenEXR.h
+++ hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
@@ -25,8 +25,8 @@
#include <vigra_ext/HDRUtils.h>
#include <vigra_ext/FileRAII.h>
-#include <ImfRgbaFile.h>
-#include <ImfArray.h>
+#include <OpenEXR/ImfRgbaFile.h>
+#include <OpenEXR/ImfArray.h>
// hack to read pgm header
Index: hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
===================================================================
--- hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake
+++ hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
@@ -75,6 +75,9 @@ IF (VIGRA_FOUND)
)
STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
+ ELSEIF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libiopenexr")
+ MESSAGE(STATUS "OpenEXR is version 3 or greter.")
+ ELSE()
MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
ENDIF()
ELSE()
