Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

pyinstalldir is determined by distutils.sysconfig.get_python_lib, which
besides being deprecated, is incorrect for flatpaks because it points to
the runtime location in /usr rather than to CMAKE_INSTALL_PREFIX (/app).
Since no means is provided to configure this location, simply move the
files to the correct location in this case.

hugin-fix-crash-wx3.2.patch

@@ -0,0 +1,23 @@
+# HG changeset patch
+# User tmodes
+# Date 1658245150 -7200
+#      Tue Jul 19 17:39:10 2022 +0200
+# Node ID edfddc6070ca6d4223d359fb4b38273a5aed2f2d
+# Parent  490baa16aae6680792d31316be12a75b50236baa
+Fixes crash when environment variable XDG_DATA_HOME is not set
+
+diff -r 490baa16aae6 -r edfddc6070ca src/hugin_base/hugin_utils/utils.cpp
+--- a/src/hugin_base/hugin_utils/utils.cpp	Thu May 26 18:58:52 2022 +0200
++++ b/src/hugin_base/hugin_utils/utils.cpp	Tue Jul 19 17:39:10 2022 +0200
+@@ -472,9 +472,9 @@
+ #else
+ #ifdef USE_XDG_DIRS
+     char *xdgDataDir = getenv("XDG_DATA_HOME");
+-    if (strlen(xdgDataDir) == 0)
++    if (xdgDataDir == NULL || strlen(xdgDataDir) == 0)
+     {
+-        // no XDG_DATA_HOME enviroment variable set
++        // no XDG_DATA_HOME enviroment variable set or empty variable
+         // use $HOME/.local/share instead
+         const  std::string homeDir = GetHomeDir();
+         if (homeDir.empty())

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,21 +1,22 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
-Version: 2019.0.0
-Release: 3%{?dist}
-License: GPLv2+
-Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-Patch0: hugin-exiv2-0-27-1.patch
+Version: 2023.0.0
+Release: 11%{?dist}
+License: GPL-2.0-or-later
+Source: https://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
 URL: http://hugin.sourceforge.net/
 Requires: shared-mime-info
 Requires: webclient
 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: libpng-devel gettext-devel wxGTK-devel boost-devel freeglut-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel 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
+# contains deprecated distutils
+BuildRequires: python-setuptools
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -33,23 +34,24 @@ 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
 
 %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 -DUSE_GDKBACKEND_X11=ON
+%cmake_build
 
 %install
-cd build
-%make_install
+%cmake_install
+
+%if 0%{?flatpak}
+# pyinstalldir is not configurable
+mkdir -p %{buildroot}%{python3_sitearch}
+mv %{buildroot}%{_usr}/%{_lib}/python%{python3_version}/site-packages/* %{buildroot}%{python3_sitearch}
+%endif
 
 desktop-file-install --vendor="" --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
@@ -60,12 +62,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">
@@ -89,34 +90,23 @@ EOF
 %{_libdir}/%{name}/libhuginbasewx.so*
 %{_libdir}/%{name}/libicpfindlib.so*
 %{_datadir}/%{name}/xrc
-%{_datadir}/%{name}/data
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/PTBatcherGUI.desktop
 %{_datadir}/applications/calibrate_lens_gui.desktop
 %{_datadir}/applications/pto_gen.desktop
-%{_datadir}/icons/gnome/*/mimetypes/*
 %{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
 %{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/%{name}/data/default.setting
-%{_datadir}/%{name}/data/plugins/README_*.txt
-%{_datadir}/%{name}/data/plugins/*.py*
-%{_datadir}/%{name}/data/plugins-templates/*.py*
-%{_datadir}/%{name}/data/hugin_exiftool_copy.arg
-%{_datadir}/%{name}/data/blended_stacks.executor
-%{_datadir}/%{name}/data/fused_layers.executor
-%{_datadir}/%{name}/data/hdr_pano.executor
-%{_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
@@ -149,6 +139,7 @@ EOF
 %{_bindir}/hugin_lensdb
 %{_bindir}/hugin_stacker
 
+%dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/libhuginbase.so*
 %{_libdir}/%{name}/libceleste.so*
 %{_libdir}/%{name}/liblocalfeatures.so*
@@ -158,19 +149,8 @@ EOF
 %{python3_sitearch}/hpi.py*
 %{python3_sitearch}/__pycache__/*
 
-%{_datadir}/%{name}/data/celeste.model
-%{_datadir}/%{name}/data/hugin_exiftool_copy.arg
-%{_datadir}/%{name}/data/hugin_exiftool_final_example.arg
-%{_datadir}/%{name}/data/normal_enblend_cubic.executor
-%{_datadir}/%{name}/data/normal_layered_tiff.executor
-%{_datadir}/%{name}/data/median_stack.executor
-%{_datadir}/%{name}/data/expressions.ini
-%{_datadir}/%{name}/data/multirow.assistant
-%{_datadir}/%{name}/data/normal.assistant
-%{_datadir}/%{name}/data/scanned.assistant
-%{_datadir}/%{name}/data/scanned2.assistant
-%{_datadir}/%{name}/data/duallens.assistant
-%{_datadir}/%{name}/data/stacked.assistant
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/data
 
 %{_mandir}/man1/align_image_stack.*
 %{_mandir}/man1/autooptimiser.*
@@ -199,11 +179,154 @@ EOF
 %{_mandir}/man1/hugin_lensdb.*
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.0.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 14 2024 Robert-André Mauchin <zebob.m@gmail.com> - 2023.0.0-10
+- Rebuilt for exiv2 0.28.2
+
+* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 2023.0.0-9
+- Rebuilt for Python 3.13
+
+* Sun May 19 2024 Bruno Postle <bruno@postle.net> - 2023.0.0-8
+- own {_libdir}/hugin and {_datadir}/hugin folders bug #2280163
+- migrated to SPDX license
+
+* Wed Apr 24 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 2023.0.0-7
+- Rebuilt for openexr 3.2.4
+
+* Fri Mar 15 2024 Bruno Postle <bruno@postle.net> - 2023.0.0-6
+- Support flatpak python install dir (yselkowitz)
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 2023.0.0-3
+- Rebuilt for Boost 1.83
+
+* Tue Dec 05 2023 Bruno Postle <bruno@postle.net> - 2023.0.0-2
+- build without lz4 workarounds see bug #2240334
+
+* Sat Nov 11 2023 Bruno Postle <bruno@postle.net> - 2023.0.0-1
+- 2023.0.0 stable release
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2022.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 03 2023 Python Maint <python-maint@redhat.com> - 2022.0.0-4
+- Rebuilt for Python 3.12
+
+* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 2022.0.0-3
+- Rebuilt for Boost 1.81
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2022.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Dec 21 2022 Bruno Postle <bruno@postle.net> - 2022.0.0-1
+- Upstream stable release
+
+* Wed Dec 14 2022 Scott Talbert <swt@techie.net> - 2021.0.0-10
+- Rebuild with X11 backend due to wxGL now not supporting Wayland
+
+* Wed Dec 14 2022 Scott Talbert <swt@techie.net> - 2021.0.0-9
+- Fix crash with wxWidgets 3.2 (#2152749)
+
+* Sun Nov 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2021.0.0-8
+- Rebuild due to wxGLCanvas ABI change
+
+* Thu Aug 04 2022 Scott Talbert <swt@techie.net> - 2021.0.0-7
+- Rebuild with wxWidgets 3.2
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2021.0.0-5
+- Rebuilt for Python 3.11
+
+* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 2021.0.0-4
+- Rebuilt for Boost 1.78
+
+* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 2021.0.0-3
+- Rebuild for glew 2.2
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 30 2021 Bruno Postle <bruno@postle.net> - 2021.0.0-1
+- upstream stable release
+
+* 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
+- remove -DUSE_GDKBACKEND_X11=1 wayland workaround as WX now carries a patch for this directly
+
+* 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
@@ -467,7 +590,7 @@ EOF
 * Wed Jul 14 2010 Dan Horák <dan@danny.cz> - 2010.0.0-3
 - rebuilt against wxGTK-2.8.11-2
 
-* Mon May 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 2010.0.0-2 
+* Mon May 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 2010.0.0-2
 - rebuild (exiv2)
 
 * Tue Mar 23 2010 Bruno Postle <bruno@postle.net> 2010.0.0-1
@@ -476,7 +599,7 @@ EOF
 
 * Fri Feb 05 2010 Bruno Postle <bruno@postle.net> 2009.4.0-1
 - Fixes for push to fedora
- 
+
 * Fri Jan 22 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 2009.2.0-2
 - Rebuild for Boost soname bump
 
@@ -502,7 +625,7 @@ EOF
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Thu Dec 18 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-3 
+* Thu Dec 18 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-3
 - respin (eviv2)
 
 * Thu Dec 18 2008 Petr Machata <pmachata@redhat.com> - 0.7.0-2

sources

@@ -1 +1 @@
-SHA512 (hugin-2019.0.0.tar.bz2) = 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
+SHA512 (hugin-2023.0.0.tar.bz2) = f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8