Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
af676da761 | ||
|
db3d7f252c | ||
|
ca78d0e053 |
93
hugin-exiv2-0-27-1.patch
Normal file
93
hugin-exiv2-0-27-1.patch
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/AboutDialog.cpp
|
||||||
|
--- a/src/hugin1/hugin/AboutDialog.cpp Wed May 15 17:41:28 2019 +0200
|
||||||
|
+++ b/src/hugin1/hugin/AboutDialog.cpp Wed May 15 17:47:40 2019 +0200
|
||||||
|
@@ -42,7 +42,7 @@
|
||||||
|
// workaround for a conflict between exiv2 and wxWidgets/CMake built
|
||||||
|
#define HAVE_PID_T 1
|
||||||
|
#endif
|
||||||
|
-#include "exiv2/exiv2.hpp"
|
||||||
|
+#include <exiv2/exiv2.hpp>
|
||||||
|
#include "lensdb/LensDB.h"
|
||||||
|
#include "sqlite3.h"
|
||||||
|
#include <lcms2.h>
|
||||||
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/PanoOperation.cpp
|
||||||
|
--- a/src/hugin1/hugin/PanoOperation.cpp Wed May 15 17:41:28 2019 +0200
|
||||||
|
+++ b/src/hugin1/hugin/PanoOperation.cpp Wed May 15 17:47:40 2019 +0200
|
||||||
|
@@ -36,8 +36,7 @@
|
||||||
|
// workaround for a conflict between exiv2 and wxWidgets/CMake built
|
||||||
|
#define HAVE_PID_T 1
|
||||||
|
#endif
|
||||||
|
-#include <exiv2/exif.hpp>
|
||||||
|
-#include <exiv2/image.hpp>
|
||||||
|
+#include <exiv2/exiv2.hpp>
|
||||||
|
#include "base_wx/LensTools.h"
|
||||||
|
#include "base_wx/wxLensDB.h"
|
||||||
|
#include "hugin/ResetDialog.h"
|
||||||
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/RawImport.cpp
|
||||||
|
--- a/src/hugin1/hugin/RawImport.cpp Wed May 15 17:41:28 2019 +0200
|
||||||
|
+++ b/src/hugin1/hugin/RawImport.cpp Wed May 15 17:47:40 2019 +0200
|
||||||
|
@@ -35,10 +35,7 @@
|
||||||
|
// workaround for a conflict between exiv2 and wxWidgets/CMake built
|
||||||
|
#define HAVE_PID_T 1
|
||||||
|
#endif
|
||||||
|
-#include <exiv2/exif.hpp>
|
||||||
|
-#include <exiv2/image.hpp>
|
||||||
|
-#include <exiv2/easyaccess.hpp>
|
||||||
|
-#include <exiv2/xmpsidecar.hpp>
|
||||||
|
+#include <exiv2/exiv2.hpp>
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
#include <wx/msw/registry.h>
|
||||||
|
#endif
|
||||||
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/TextureManager.cpp
|
||||||
|
--- a/src/hugin1/hugin/TextureManager.cpp Wed May 15 17:41:28 2019 +0200
|
||||||
|
+++ b/src/hugin1/hugin/TextureManager.cpp Wed May 15 17:47:40 2019 +0200
|
||||||
|
@@ -65,8 +65,7 @@
|
||||||
|
// workaround for a conflict between exiv2 and wxWidgets/CMake built
|
||||||
|
#define HAVE_PID_T 1
|
||||||
|
#endif
|
||||||
|
-#include "exiv2/exiv2.hpp"
|
||||||
|
-#include "exiv2/preview.hpp"
|
||||||
|
+#include <exiv2/exiv2.hpp>
|
||||||
|
|
||||||
|
TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
|
||||||
|
{
|
||||||
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/ptbatcher/FindPanoDialog.cpp
|
||||||
|
--- a/src/hugin1/ptbatcher/FindPanoDialog.cpp Wed May 15 17:41:28 2019 +0200
|
||||||
|
+++ b/src/hugin1/ptbatcher/FindPanoDialog.cpp Wed May 15 17:47:40 2019 +0200
|
||||||
|
@@ -36,8 +36,7 @@
|
||||||
|
// workaround for a conflict between exiv2 and wxWidgets/CMake built
|
||||||
|
#define HAVE_PID_T 1
|
||||||
|
#endif
|
||||||
|
-#include "exiv2/exiv2.hpp"
|
||||||
|
-#include "exiv2/preview.hpp"
|
||||||
|
+#include <exiv2/exiv2.hpp>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <commctrl.h>
|
||||||
|
#endif
|
||||||
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/Exiv2Helper.cpp
|
||||||
|
--- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 15 17:41:28 2019 +0200
|
||||||
|
+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 15 17:47:40 2019 +0200
|
||||||
|
@@ -28,8 +28,7 @@
|
||||||
|
#include "Exiv2Helper.h"
|
||||||
|
#include "hugin_math/hugin_math.h"
|
||||||
|
#include "hugin_utils/utils.h"
|
||||||
|
-#include "exiv2/easyaccess.hpp"
|
||||||
|
-#include "exiv2/version.hpp"
|
||||||
|
+#include <exiv2/exiv2.hpp>
|
||||||
|
|
||||||
|
namespace HuginBase
|
||||||
|
{
|
||||||
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/SrcPanoImage.cpp
|
||||||
|
--- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 15 17:41:28 2019 +0200
|
||||||
|
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 15 17:47:40 2019 +0200
|
||||||
|
@@ -40,9 +40,7 @@
|
||||||
|
#include <vigra/diff2d.hxx>
|
||||||
|
#include <vigra/imageinfo.hxx>
|
||||||
|
#include <hugin_utils/utils.h>
|
||||||
|
-#include <exiv2/exif.hpp>
|
||||||
|
-#include <exiv2/image.hpp>
|
||||||
|
-#include <exiv2/easyaccess.hpp>
|
||||||
|
+#include <exiv2/exiv2.hpp>
|
||||||
|
#include <lensdb/LensDB.h>
|
||||||
|
#include "Exiv2Helper.h"
|
||||||
|
|
27
hugin.spec
27
hugin.spec
@ -1,9 +1,10 @@
|
|||||||
Summary: A panoramic photo stitcher and more
|
Summary: A panoramic photo stitcher and more
|
||||||
Name: hugin
|
Name: hugin
|
||||||
Version: 2018.0.0
|
Version: 2019.0.0
|
||||||
Release: 9%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
|
Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
|
||||||
|
Patch0: hugin-exiv2-0-27-1.patch
|
||||||
URL: http://hugin.sourceforge.net/
|
URL: http://hugin.sourceforge.net/
|
||||||
Requires: shared-mime-info
|
Requires: shared-mime-info
|
||||||
Requires: webclient
|
Requires: webclient
|
||||||
@ -33,15 +34,12 @@ without a GUI environment.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
sed -i 's^/usr/bin/env python^/usr/bin/python3^' \
|
sed -i 's^/usr/bin/env python^/usr/bin/python3^' \
|
||||||
src/hugin_script_interface/plugins-dev/*.py \
|
src/hugin_script_interface/plugins-dev/*.py \
|
||||||
src/hugin_script_interface/*.py \
|
src/hugin_script_interface/*.py \
|
||||||
src/hugin_script_interface/plugins/*.py
|
src/hugin_script_interface/plugins/*.py
|
||||||
|
|
||||||
# Bugzilla #1671088 (launchpad #1811441)
|
|
||||||
sed -i 's^exiv2/easyaccess.hpp^exiv2/exiv2.hpp^' \
|
|
||||||
src/hugin_base/panodata/Exiv2Helper.cpp
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# hugin now forces build out of tree
|
# hugin now forces build out of tree
|
||||||
[ ! -d "build" ] && mkdir build
|
[ ! -d "build" ] && mkdir build
|
||||||
@ -91,12 +89,13 @@ EOF
|
|||||||
%{_libdir}/%{name}/libhuginbasewx.so*
|
%{_libdir}/%{name}/libhuginbasewx.so*
|
||||||
%{_libdir}/%{name}/libicpfindlib.so*
|
%{_libdir}/%{name}/libicpfindlib.so*
|
||||||
%{_datadir}/%{name}/xrc
|
%{_datadir}/%{name}/xrc
|
||||||
|
%{_datadir}/%{name}/data
|
||||||
%{_datadir}/applications/%{name}.desktop
|
%{_datadir}/applications/%{name}.desktop
|
||||||
%{_datadir}/applications/PTBatcherGUI.desktop
|
%{_datadir}/applications/PTBatcherGUI.desktop
|
||||||
%{_datadir}/applications/calibrate_lens_gui.desktop
|
%{_datadir}/applications/calibrate_lens_gui.desktop
|
||||||
%{_datadir}/applications/pto_gen.desktop
|
%{_datadir}/applications/pto_gen.desktop
|
||||||
%{_datadir}/pixmaps/*.png
|
%{_datadir}/icons/gnome/*/mimetypes/*
|
||||||
%{_datadir}/icons/gnome/48x48/mimetypes/*
|
%{_datadir}/icons/hicolor/*/apps/*
|
||||||
%{_datadir}/mime/packages/%{name}.xml
|
%{_datadir}/mime/packages/%{name}.xml
|
||||||
%{_datadir}/%{name}/data/default.setting
|
%{_datadir}/%{name}/data/default.setting
|
||||||
%{_datadir}/%{name}/data/plugins/README_*.txt
|
%{_datadir}/%{name}/data/plugins/README_*.txt
|
||||||
@ -200,6 +199,18 @@ EOF
|
|||||||
%{_mandir}/man1/hugin_lensdb.*
|
%{_mandir}/man1/hugin_lensdb.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 14 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
|
||||||
|
|
||||||
|
* Thu Apr 11 2019 Richard Shaw <hobbes1069@gmail.com> - 2018.0.0-11
|
||||||
|
- Rebuild for OpenEXR 2.3.0.
|
||||||
|
|
||||||
|
* Sat Mar 23 2019 Bruno Postle <bruno@postle.net> - 2018.0.0-10
|
||||||
|
- upstream fix for cmake 3.14 changes
|
||||||
|
|
||||||
* Thu Jan 31 2019 Kalev Lember <klember@redhat.com> - 2018.0.0-9
|
* Thu Jan 31 2019 Kalev Lember <klember@redhat.com> - 2018.0.0-9
|
||||||
- Rebuilt for Boost 1.69
|
- Rebuilt for Boost 1.69
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (hugin-2018.0.0.tar.bz2) = 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
|
SHA512 (hugin-2019.0.0.tar.bz2) = 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
|
||||||
|
Loading…
Reference in New Issue
Block a user