- up to 2020.0.0

diff --git a/hugin-cppflags.patch b/hugin-cppflags.patch
index 963654dacbd0e512251859eae7b31c1eb013ea8c..53370928a3be906db26752fad2f98f0341d30753 100644 (file)
--- a/hugin-cppflags.patch
+++ b/hugin-cppflags.patch
@@ -7,4 +7,4 @@
 +ADD_DEFINITIONS($ENV{CPPFLAGS})
  
  # version
- set(V_MAJOR 2019)
+ set(V_MAJOR 2020)

diff --git a/hugin.spec b/hugin.spec
index de6400d648b0b42ed6f5d987d00a4ba60ef16a0f..464b0827ce32197a1c41e88f6506b0bb1d43292e 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,14 +1,15 @@
 Summary:       Toolchain to create panoramic images
 Summary(pl.UTF-8):     Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:          hugin
-Version:       2019.2.0
-Release:       7
+Version:       2020.0.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5: 3409c3a84e1881145b5b556df63de73c
+# Source0-md5: 59e152871b74fb071bc086fc23a4774a
 Patch0:                %{name}-cppflags.patch
 Patch1:                python-install.patch
+Patch2:                openexr3.patch
 URL:           http://hugin.sourceforge.net/
 BuildRequires: OpenEXR-devel
 BuildRequires: OpenGL-glut-devel
@@ -65,6 +66,7 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
 

diff --git a/openexr3.patch b/openexr3.patch
new file mode 100644 (file)
index 0000000..f577ebf
--- /dev/null
+++ b/openexr3.patch
@@ -0,0 +1,53 @@
+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()