Rebuild for OpenEXR/Imath 3.1.

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

hugin-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()

hugin.spec

@@ -1,10 +1,16 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
-Version: 2019.0.0
-Release: 3%{?dist}
+Version: 2020.0.0
+Release: 12%{?dist}
 License: GPLv2+
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-Patch0: hugin-exiv2-0-27-1.patch
+# As of OpenEXR 3 upstream has significantly reorganized the libraries
+# including splitting out imath as a standalone library (which this project may
+# or may not need). Please see
+# https://github.com/AcademySoftwareFoundation/Imath/blob/master/docs/PortingGuide2-3.md
+# for porting details and encourage upstream to support it. For now a minimal
+# pactch is provided.
+Patch0: hugin-openexr3.patch
 URL: http://hugin.sourceforge.net/
 Requires: shared-mime-info
 Requires: webclient
@@ -12,10 +18,16 @@ Requires: %{name}-base = %{version}-%{release}
 BuildRequires: gcc-c++
 BuildRequires: libpano13-devel zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK3-devel boost-devel freeglut-devel
-BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
+BuildRequires: cmake desktop-file-utils exiv2-devel glew-devel
 BuildRequires: python3-devel swig flann-devel perl-Image-ExifTool
 BuildRequires: mesa-libGLU-devel libXmu-devel sqlite-devel vigra-devel
 BuildRequires: perl-podlators fftw-devel lcms2-devel
+%if 0%{?fedora} > 34
+BuildRequires: cmake(OpenEXR)
+BuildRequires: cmake(Imath)
+%else
+BuildRequires: OpenEXR-devel
+%endif
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -33,23 +45,23 @@ separately from hugin if you want to batch-process hugin projects on a machine
 without a GUI environment.
 
 %prep
-%setup -q
-%patch0 -p1
-sed -i 's^/usr/bin/env python^/usr/bin/python3^' \
+%autosetup -p1
+sed -i 's^/usr/bin/env python3^/usr/bin/python3^' \
 src/hugin_script_interface/plugins-dev/*.py \
 src/hugin_script_interface/*.py \
 src/hugin_script_interface/plugins/*.py
 
+# Bundled version does not define ZLIB::ZLIB
+%if 0%{?fedora} > 33
+rm CMakeModules/FindZLIB.cmake
+%endif
+
 %build
-# hugin now forces build out of tree
-[ ! -d "build" ] && mkdir  build
-cd build
-%cmake .. -DBUILD_HSI=1 -DUSE_GDKBACKEND_X11=1
-%make_build VERBOSE=1
+%cmake -DBUILD_HSI=1
+%cmake_build
 
 %install
-cd build
-%make_install
+%cmake_install
 
 desktop-file-install --vendor="" --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
@@ -60,12 +72,11 @@ desktop-file-install --vendor="" --delete-original \
 desktop-file-install --vendor="" --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
   %{buildroot}/%{_datadir}/applications/pto_gen.desktop
-cd ..
 %find_lang %{name}
 
 # Merge applications into one software center item
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/calibrate_lens_gui.appdata.xml <<EOF
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
+cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/calibrate_lens_gui.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -108,15 +119,16 @@ EOF
 %{_datadir}/%{name}/data/normal_enblend.executor
 %{_datadir}/%{name}/data/normal_smartblend.executor
 %{_datadir}/%{name}/data/zeronoise.executor
-%{_datadir}/appdata/PTBatcherGUI.appdata.xml
-%{_datadir}/appdata/calibrate_lens_gui.appdata.xml
-%{_datadir}/appdata/hugin.appdata.xml
+%{_datadir}/metainfo/PTBatcherGUI.appdata.xml
+%{_datadir}/metainfo/calibrate_lens_gui.appdata.xml
+%{_datadir}/metainfo/hugin.appdata.xml
 %{_mandir}/man1/PTBatcherGUI.*
 %{_mandir}/man1/calibrate_lens_gui.*
 %{_mandir}/man1/hugin.*
 %{_mandir}/man1/hugin_stitch_project.*
 %{_mandir}/man1/icpfind.*
 %{_mandir}/man1/hugin_executor.*
+%{_mandir}/man1/hugin_stacker.*
 
 %doc AUTHORS README TODO src/celeste/LICENCE_LIBSVM doc/nona.txt doc/fulla.html doc/executor_file_format.txt src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
 %license COPYING.txt
@@ -199,11 +211,75 @@ EOF
 %{_mandir}/man1/hugin_lensdb.*
 
 %changelog
+* Sat Aug 21 2021 Richard Shaw <hobbes1069@gmail.com> - 2020.0.0-12
+- Rebuild for OpenEXR/Imath 3.1.
+
+* Tue Aug 10 2021 Richard Shaw <hobbes1069@gmail.com> - 2020.0.0-11
+- Rebuild for OpenEXR 3.
+
+* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 2020.0.0-10
+- Rebuilt for Boost 1.76
+
+* Mon Aug 02 2021 Richard Shaw <hobbes1069@gmail.com> - 2020.0.0-9
+- Rebuild for OpenEXR/Imath 3.
+
+* Thu Jul 29 2021 Bruno Postle <bruno@postle.net> - 2020.0.0-8
+- Rebuilt
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.0.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2020.0.0-6
+- Rebuilt for Python 3.10
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 2020.0.0-4
+- Rebuilt for Boost 1.75
+
+* Tue Jan 12 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2020.0.0-3
+- rebuild against New OpenEXR again
+
+* Fri Jan 01 2021 Richard Shaw <hobbes1069@gmail.com> - 2020.0.0-2
+- Rebuild for OpenEXR 2.5.3.
+
+* Sat Dec 12 2020 Bruno Postle <bruno@postle.net> - 2020.0.0-1
+- stable release
+
+* Sat Aug 08 2020 Rich Mattes <richmattes@gmail.com> - 2019.2.0-7
+- Rebuild for flann-1.9.1
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 24 2020 Bruno Postle <bruno@postle.net> - 2019.2.0-5
+- cmake macros have changed, rebuild
+
+* Fri May 29 2020 Jonathan Wakely <jwakely@redhat.com> - 2019.2.0-4
+- Rebuilt for Boost 1.73
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2019.2.0-3
+- Rebuilt for Python 3.9
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+
+* Sun Jan 05 2020 Bruno Postle <bruno@postle.net> - 2019.2.0-1
+- stable release
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2019.0.0-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2019.0.0-4
+- Rebuilt for Python 3.8
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Wed May 14 2019 Bruno Postle <bruno@postle.net> - 2019.0.0-2
-* Patch to fix breakage caused by exiv2-0.27.1
+* Wed May 15 2019 Bruno Postle <bruno@postle.net> - 2019.0.0-2
+- Patch to fix breakage caused by exiv2-0.27.1
 
 * Sat Apr 13 2019 Bruno Postle <bruno@postle.net> - 2019.0.0-1
 - Stable release, still built with configure option to force X11 backend on Wayland

sources

@@ -1 +1 @@
-SHA512 (hugin-2019.0.0.tar.bz2) = 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
+SHA512 (hugin-2020.0.0.tar.bz2) = 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e