Compare commits

...

71 Commits
f20 ... master

Author SHA1 Message Date
Fedora Release Engineering
be5807a59a - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 08:40:29 +00:00
Bruno Postle
9d57b39f69 Fix for breakage caused by exiv2-0.27.1 2019-05-15 20:56:29 +01:00
Bruno Postle
3d20c04692 fix date in changelog 2019-04-13 12:14:55 +01:00
Bruno Postle
e39e655b71 Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/hugin 2019-04-13 12:10:53 +01:00
Bruno Postle
400eea7214 New upstream release, closes #1669720 2019-04-13 12:04:04 +01:00
Richard Shaw
88225e78e4 Rebuild for OpenEXR 2.3.0. 2019-04-11 12:46:10 -05:00
Bruno Postle
3297e5c739 cmake 3.14 fix (updated) 2019-03-23 11:59:18 +00:00
Bruno Postle
ae043e63c3 Fix build for cmake 3.14 #1690947 2019-03-23 10:20:17 +00:00
Kalev Lember
f52d84b0bb Rebuilt for Boost 1.69 2019-01-31 13:35:28 +01:00
Bruno Postle
8472041b59 Fix to build with exiv2 0.27 (Bugzilla #1671088) 2019-01-30 22:27:40 +00:00
Rex Dieter
74504087ce rebuild (exiv2) 2019-01-30 11:00:47 -06:00
Igor Gnatenko
aa6b442e73 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:07 +01:00
Jonathan Wakely
189ed0d0c4 Rebuilt for Boost 1.69 2019-01-25 06:50:59 +00:00
Bruno Postle
69afaaa540 remove ambiguous /usr/bin/env python in scripts 2018-09-18 21:09:48 +01:00
Nicolas Chauvet
07527c2c43 Fixup again 2018-08-23 15:02:15 +02:00
Nicolas Chauvet
96a804767d Fixup pycache 2018-08-23 14:49:02 +02:00
Nicolas Chauvet
09c984dcec Fix build 2018-08-23 14:31:20 +02:00
Nicolas Chauvet
94489ac971 - Rebuilt for glew 2.1.0 2018-08-23 13:29:22 +02:00
Igor Gnatenko
6bdb79e744
%{python_sitearch} → %{python2_sitearch}
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-30 00:22:31 +02:00
Fedora Release Engineering
5ec2f09398 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 05:08:53 +00:00
Igor Gnatenko
9e6390cb05 add BuildRequires: gcc-c++
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:46 +02:00
Fedora Release Engineering
a683427dfb - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 16:33:50 +00:00
Bruno Postle
39f00fd94e update for new stable release 2018-02-03 20:46:30 +00:00
Jonathan Wakely
8647918412 Rebuilt for Boost 1.66 2018-01-23 11:29:01 +00:00
Igor Gnatenko
69ef65ee0f Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-11 14:55:52 +01:00
Iryna Shcherbina
31dada46cc Update Python 2 dependency declarations to new packaging standards 2018-01-09 18:43:41 +01:00
Fedora Release Engineering
6b89e96cc0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 23:34:14 +00:00
Filipe Rosset
c0b4bb6f55 - rebuilt 2017-07-31 02:28:05 -03:00
Fedora Release Engineering
f34358182c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 12:55:28 +00:00
Kalev Lember
771ecb543d Rebuilt for Boost 1.64 2017-07-21 09:35:59 +02:00
Bruno Postle
2fefa58940 New stable release, built with configure option to force X11 backend on Wayland 2017-07-04 23:00:24 +01:00
Fedora Release Engineering
f1e99f6c70 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild 2017-05-15 20:41:30 +00:00
Rex Dieter
57b23f1377 rebuild (exiv2) 2017-05-02 10:37:17 -05:00
Fedora Release Engineering
0569f42cc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 12:46:59 +00:00
Orion Poplawski
df70ba2794 Rebuild for glew 2.0.0 2017-01-10 08:48:42 -07:00
Bruno Postle
b830065228 stable release, built with GTK2 2016-09-18 21:56:59 +01:00
Fedora Release Engineering
b4e49e13f2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 07:26:37 +00:00
Bruno Postle
92fe66175d rebuild for new vigra and switch to GTK3 2016-04-28 18:54:46 +01:00
Bruno Postle
6aa33a706f Merge branch 'master' of ssh://pkgs.fedoraproject.org/hugin 2016-04-13 19:02:39 +01:00
Bruno Postle
3b0308e943 upstream stable release 2016-04-13 19:01:18 +01:00
Dennis Gilmore
f46b4b2d21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 23:58:13 +00:00
Jonathan Wakely
d68a056ccd Rebuilt for Boost 1.60 2016-01-15 07:56:25 +00:00
Adam Jackson
f4ec4df806 Rebuild for glew 1.13 2016-01-14 13:08:40 -05:00
Jonathan Wakely
bd044944fc Rebuilt for Boost 1.59 2015-08-27 20:57:34 +01:00
Bruno Postle
417d259da8 Upstream release.
No longer uses lensfun, replaced by sqlite database.
No longer uses gnu make for batch processing.
Bundled libraries now all gone (vigra and zthread).
New tools: hugin_executor, verdandi, hugin_lensdb.
2015-08-19 15:31:53 +01:00
Dennis Gilmore
4aec5d67bf - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 2015-07-29 12:25:14 -05:00
David Tardon
fad43c5035 rebuild for Boost 1.58 2015-07-22 18:41:47 +02:00
Rex Dieter
2f32ff09f9 rebuild (exiv2) 2015-06-24 14:06:35 -05:00
Dennis Gilmore
2bcebdcbbb - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 10:38:22 +00:00
Nils Philippsen
9f202b7d44 rebuild for lensfun-0.3.1 2015-05-14 11:34:32 +02:00
Kalev Lember
33164dcde3 Rebuilt for GCC 5 C++11 ABI change 2015-05-02 14:22:00 +02:00
Richard Hughes
dc326bd218 Add an AppData file for the software center 2015-03-26 16:06:22 +00:00
Petr Machata
9f06b7f329 Apply an upstream patch that ports expression parser to Boost.Phoenix V3 2015-02-03 23:36:20 +01:00
Petr Machata
39c7a5351b Rebuild for boost 1.57.0 2015-02-03 23:22:36 +01:00
Bruno Postle
5baac42de4 Upstream release 2015-02-03 19:20:08 +00:00
Bruno Postle
47dcefe43a Upstream release 2015-02-02 21:41:39 +00:00
Petr Machata
721e28391b Rebuild for boost 1.57.0 2015-01-27 19:03:51 +01:00
Rex Dieter
5ccdacb33c FTBFS against lensfun-0.3 (#1168239) 2014-11-26 07:59:43 -06:00
Rex Dieter
e7751c1703 rebuild (openexr) 2014-11-25 13:55:04 -06:00
Peter Robinson
715f542570 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 20:49:18 +00:00
Rex Dieter
b27befbbb5 update icon/mime scriptlets 2014-08-09 13:46:48 -05:00
Bruno Postle
6a1eca5f5b Rebuild for rebuilt libpano13 2014-06-07 00:08:41 +01:00
Petr Machata
7a340cee6c Rebuild for boost 1.55.0 2014-05-23 05:05:32 +02:00
Bruno Postle
8e664a3c8f Merge branch 'master' of ssh://pkgs.fedoraproject.org/hugin
Conflicts:
	hugin.spec
2013-12-15 12:00:08 +00:00
Bruno Postle
20be1f0c9e one line fix to re-enable .pto file association 2013-12-15 11:55:45 +00:00
Rex Dieter
b8b70b330c rebuild (exiv2) 2013-12-03 09:42:37 -06:00
Rex Dieter
1f2f196df1 rebuild (openexr) 2013-11-27 10:54:48 -06:00
Dave Airlie
56a1ba749b rebuilt for GLEW 1.10 2013-11-18 10:52:55 +10:00
Bruno Postle
c55c88cb7a patch no longer needed for latest release 2013-10-31 23:30:40 +00:00
Bruno Postle
a5b786e69c upstream stable release 2013-10-31 23:29:42 +00:00
Rex Dieter
211faa044b rebuild (openexr) 2013-09-08 20:55:43 -05:00
7 changed files with 452 additions and 73 deletions

View File

@ -0,0 +1,86 @@
diff -up hugin-2013.0.0/src/tools/ParseExp.cpp\~ hugin-2013.0.0/src/tools/ParseExp.cpp
--- hugin-2013.0.0/src/tools/ParseExp.cpp~ 2013-10-27 10:19:02.000000000 +0100
+++ hugin-2013.0.0/src/tools/ParseExp.cpp 2015-02-03 22:40:30.710550300 +0100
@@ -34,6 +34,7 @@
#include <limits>
#include <iterator>
+#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#include <boost/spirit/version.hpp>
#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
#error "At least Spirit version 2.1 required"
@@ -50,11 +51,9 @@ namespace Parser
//power function
struct lazy_pow_
{
- template <typename X, typename Y>
- struct result { typedef X type; };
+ typedef double result_type;
- template <typename X, typename Y>
- X operator()(X x, Y y) const
+ double operator()(double x, double y) const
{
return std::pow(x, y);
}
@@ -63,11 +62,9 @@ struct lazy_pow_
// modulus for double values
struct lazy_mod_
{
- template <typename X, typename Y>
- struct result { typedef X type; };
+ typedef double result_type;
- template <typename X, typename Y>
- X operator()(X x, Y y) const
+ double operator()(double x, double y) const
{
return std::fmod(x,y);
}
@@ -76,37 +73,33 @@ struct lazy_mod_
// if statement
struct lazy_if_
{
- template <typename X, typename Y, typename Z>
- struct result { typedef Y type; };
+ typedef double result_type;
- template <typename X, typename Y, typename Z>
- X operator()(X x, Y y, Z z) const
+ double operator()(double x, double y, double z) const
{
- return x ? y : z;
+ return (std::fabs(x)>1e-5) ? y : z;
}
};
// wrapper for unary function
struct lazy_ufunc_
{
- template <typename F, typename A1>
- struct result { typedef A1 type; };
+ typedef double result_type;
- template <typename F, typename A1>
- A1 operator()(F f, A1 a1) const
+ double operator()(double (*f)(double), double a1) const
{
return f(a1);
}
};
// convert rad into deg
-double deg(const double d)
+const double deg(const double d)
{
return d*180.0/boost::math::constants::pi<double>();
};
// convert deg into rad
-double rad(const double d)
+const double rad(const double d)
{
return d*boost::math::constants::pi<double>()/180;
};
Diff finished. Tue Feb 3 22:40:34 2015

View File

@ -0,0 +1,13 @@
diff -up hugin-2013.0.0/src/hugin_base/lensdb/LensDB.cpp.lensfun hugin-2013.0.0/src/hugin_base/lensdb/LensDB.cpp
--- hugin-2013.0.0/src/hugin_base/lensdb/LensDB.cpp.lensfun 2013-10-27 04:19:02.000000000 -0500
+++ hugin-2013.0.0/src/hugin_base/lensdb/LensDB.cpp 2014-11-26 07:52:42.060305692 -0600
@@ -627,7 +627,9 @@ bool LensDB::GetDistortion(double focal,
break;
case LF_DIST_MODEL_NONE:
case LF_DIST_MODEL_POLY5:
+#ifdef LF_DIST_MODEL_FOV1
case LF_DIST_MODEL_FOV1:
+#endif
default:
return false;
break;

93
hugin-exiv2-0-27-1.patch Normal file
View 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"

View File

@ -1,9 +0,0 @@
diff -r 6a8a448574fc -r aae44c4b0570 doc/deghosting_mask.pod
--- a/doc/deghosting_mask.pod Thu May 30 18:03:56 2013 +0200
+++ b/doc/deghosting_mask.pod Sun Jun 09 12:29:12 2013 +0200
@@ -1,3 +1,5 @@
+=encoding utf8
+
=head1 NAME
deghosting_mask - Creates mask for removing ghosting in images

View File

@ -1,29 +1,21 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Summary: A panoramic photo stitcher and more Summary: A panoramic photo stitcher and more
Name: hugin Name: hugin
Version: 2012.0.0 Version: 2019.0.0
Release: 10%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia
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
Requires: wxPython
Requires: %{name}-base = %{version}-%{release} Requires: %{name}-base = %{version}-%{release}
BuildRequires: libpano13-devel >= 2.9.18 zlib-devel libtiff-devel libjpeg-devel BuildRequires: gcc-c++
BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel freeglut-devel 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 OpenEXR-devel exiv2-devel glew-devel
BuildRequires: tclap-devel python-devel swig flann-devel lensfun-devel BuildRequires: python3-devel swig flann-devel perl-Image-ExifTool
%{?fedora:BuildRequires: mesa-libGLU-devel libXmu-devel} BuildRequires: mesa-libGLU-devel libXmu-devel sqlite-devel vigra-devel
%{?rhel:BuildRequires: xorg-x11-devel} BuildRequires: perl-podlators fftw-devel lcms2-devel
%if 0%{?fedora} >= 19
BuildRequires: perl-podlators
%endif
# upstream patch to fix pod encoding issue(s)
# http://bugzilla.redhat.com/991875
Patch1: hugin-r6301.patch
%description %description
hugin can be used to stitch multiple images together. The resulting image can hugin can be used to stitch multiple images together. The resulting image can
@ -33,10 +25,7 @@ to create high quality images
%package base %package base
Summary: Command-line tools and libraries required by hugin Summary: Command-line tools and libraries required by hugin
Group: Applications/Multimedia Requires: enblend perl-Image-ExifTool
Requires: make enblend >= 3.2 perl-Image-ExifTool
Provides: bundled(vigra) = 1.5.0
Provides: bundled(zthread) = 2.3.1
%description base %description base
Command-line tools used to generate panoramic images, install this package Command-line tools used to generate panoramic images, install this package
@ -45,15 +34,22 @@ without a GUI environment.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1 -b .r6301 sed -i 's^/usr/bin/env python^/usr/bin/python3^' \
src/hugin_script_interface/plugins-dev/*.py \
src/hugin_script_interface/*.py \
src/hugin_script_interface/plugins/*.py
%build %build
%cmake . -DBUILD_HSI=1 # hugin now forces build out of tree
make VERBOSE=1 %{?_smp_mflags} [ ! -d "build" ] && mkdir build
cd build
%cmake .. -DBUILD_HSI=1 -DUSE_GDKBACKEND_X11=1
%make_build VERBOSE=1
%install %install
make install DESTDIR=%{buildroot} cd build
%make_install
desktop-file-install --vendor="" --delete-original \ desktop-file-install --vendor="" --delete-original \
--dir=%{buildroot}/%{_datadir}/applications \ --dir=%{buildroot}/%{_datadir}/applications \
@ -64,70 +60,74 @@ desktop-file-install --vendor="" --delete-original \
desktop-file-install --vendor="" --delete-original \ desktop-file-install --vendor="" --delete-original \
--dir=%{buildroot}/%{_datadir}/applications \ --dir=%{buildroot}/%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/pto_gen.desktop %{buildroot}/%{_datadir}/applications/pto_gen.desktop
cd ..
%find_lang %{name} %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
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<component type="desktop">
<metadata_license>CC0-1.0</metadata_license>
<id>calibrate_lens_gui.desktop</id>
<metadata>
<value key="X-Merge-With-Parent">hugin.desktop</value>
</metadata>
</component>
EOF
%post %ldconfig_scriptlets base
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/gnome || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
%postun
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/gnome || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
%post base -p /sbin/ldconfig
%postun base -p /sbin/ldconfig
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-, root, root,-)
%{_bindir}/PTBatcherGUI %{_bindir}/PTBatcherGUI
%{_bindir}/PTBatcher
%{_bindir}/hugin %{_bindir}/hugin
%{_bindir}/nona_gui
%{_bindir}/hugin_stitch_project %{_bindir}/hugin_stitch_project
%{_bindir}/icpfind %{_bindir}/icpfind
%{_bindir}/calibrate_lens_gui %{_bindir}/calibrate_lens_gui
%{_bindir}/autopano-noop.sh %{_bindir}/hugin_executor
%{_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
%{_datadir}/%{name}/data/plugins/*.py* %{_datadir}/%{name}/data/plugins/*.py*
%{_datadir}/%{name}/data/plugins-templates/*.py* %{_datadir}/%{name}/data/plugins-templates/*.py*
%{_mandir}/man1/PTBatcher.* %{_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
%{_mandir}/man1/PTBatcherGUI.* %{_mandir}/man1/PTBatcherGUI.*
%{_mandir}/man1/autopano-noop.*
%{_mandir}/man1/calibrate_lens_gui.* %{_mandir}/man1/calibrate_lens_gui.*
%{_mandir}/man1/hugin.* %{_mandir}/man1/hugin.*
%{_mandir}/man1/hugin_stitch_project.* %{_mandir}/man1/hugin_stitch_project.*
%{_mandir}/man1/nona_gui.*
%{_mandir}/man1/icpfind.* %{_mandir}/man1/icpfind.*
%{_mandir}/man1/hugin_executor.*
%doc AUTHORS COPYING README README_JP TODO LICENCE_VIGRA src/celeste/LICENCE_LIBSVM doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual %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
%files base %files base
%defattr(-, root, root,-)
%{_bindir}/align_image_stack %{_bindir}/align_image_stack
%{_bindir}/autooptimiser %{_bindir}/autooptimiser
%{_bindir}/celeste_standalone %{_bindir}/celeste_standalone
%{_bindir}/fulla %{_bindir}/fulla
%{_bindir}/matchpoint
%{_bindir}/hugin_hdrmerge %{_bindir}/hugin_hdrmerge
%{_bindir}/nona %{_bindir}/nona
%{_bindir}/pto2mk
%{_bindir}/tca_correct %{_bindir}/tca_correct
%{_bindir}/vig_optimize %{_bindir}/vig_optimize
%{_bindir}/cpclean %{_bindir}/cpclean
@ -139,29 +139,46 @@ touch --no-create %{_datadir}/icons/gnome || :
%{_bindir}/cpfind %{_bindir}/cpfind
%{_bindir}/linefind %{_bindir}/linefind
%{_bindir}/pto_gen %{_bindir}/pto_gen
%{_bindir}/pto_lensstack
%{_bindir}/pto_var
%{_bindir}/geocpset
%{_bindir}/pto_mask
%{_bindir}/pto_move
%{_bindir}/pto_template
%{_bindir}/verdandi
%{_bindir}/hugin_lensdb
%{_bindir}/hugin_stacker
%{_libdir}/%{name}/libhuginbase.so* %{_libdir}/%{name}/libhuginbase.so*
%{_libdir}/%{name}/libhuginvigraimpex.so*
%{_libdir}/%{name}/libceleste.so* %{_libdir}/%{name}/libceleste.so*
%{_libdir}/%{name}/liblocalfeatures.so* %{_libdir}/%{name}/liblocalfeatures.so*
%{_libdir}/%{name}/libmakefilelib.so*
%{_libdir}/%{name}/libhuginlines.so*
%{_libdir}/%{name}/libhugin_python_interface.so* %{_libdir}/%{name}/libhugin_python_interface.so*
%{python_sitearch}/_hsi.so %{python3_sitearch}/_hsi.so
%{python_sitearch}/hsi.py* %{python3_sitearch}/hsi.py*
%{python_sitearch}/hpi.py* %{python3_sitearch}/hpi.py*
%{python3_sitearch}/__pycache__/*
%{_datadir}/%{name}/Makefile.*.mk
%{_datadir}/%{name}/data/celeste.model %{_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
%{_mandir}/man1/align_image_stack.* %{_mandir}/man1/align_image_stack.*
%{_mandir}/man1/autooptimiser.* %{_mandir}/man1/autooptimiser.*
%{_mandir}/man1/cpclean.* %{_mandir}/man1/cpclean.*
%{_mandir}/man1/celeste_standalone.* %{_mandir}/man1/celeste_standalone.*
%{_mandir}/man1/fulla.* %{_mandir}/man1/fulla.*
%{_mandir}/man1/hugin_hdrmerge.* %{_mandir}/man1/hugin_hdrmerge.*
%{_mandir}/man1/matchpoint.*
%{_mandir}/man1/nona.* %{_mandir}/man1/nona.*
%{_mandir}/man1/pto2mk.*
%{_mandir}/man1/tca_correct.* %{_mandir}/man1/tca_correct.*
%{_mandir}/man1/vig_optimize.* %{_mandir}/man1/vig_optimize.*
%{_mandir}/man1/deghosting_mask.* %{_mandir}/man1/deghosting_mask.*
@ -172,8 +189,174 @@ touch --no-create %{_datadir}/icons/gnome || :
%{_mandir}/man1/cpfind.* %{_mandir}/man1/cpfind.*
%{_mandir}/man1/linefind.* %{_mandir}/man1/linefind.*
%{_mandir}/man1/pto_gen.* %{_mandir}/man1/pto_gen.*
%{_mandir}/man1/pto_lensstack.*
%{_mandir}/man1/pto_var.*
%{_mandir}/man1/geocpset.*
%{_mandir}/man1/pto_mask.*
%{_mandir}/man1/pto_move.*
%{_mandir}/man1/pto_template.*
%{_mandir}/man1/verdandi.*
%{_mandir}/man1/hugin_lensdb.*
%changelog %changelog
* 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
* 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
- Rebuilt for Boost 1.69
* Wed Jan 30 2019 Bruno Postle <bruno@postle.net> - 2018.0.0-8
- fix for exiv2 0.27
* Wed Jan 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 2018.0.0-7
- rebuild (exiv2)
* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 2018.0.0-6
- Rebuilt for Boost 1.69
* Tue Sep 18 2018 Bruno Postle <bruno@postle.net> - 2018.0.0-5
- remove ambiguous /usr/bin/env python
* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 2018.0.0-4
- Rebuilt for glew 2.1.0
- Fix build switch to python3
- Spec file clean-up
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Feb 03 2018 Bruno Postle <bruno@postle.net> - 2018.0.0-1
- stable release, built with configure option to force X11 backend on Wayland
* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 2017.0.0-8
- Rebuilt for Boost 1.66
* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2017.0.0-7
- Remove obsolete scriptlets
* Tue Jan 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2017.0.0-6
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Mon Jul 31 2017 Filipe Rosset <rosset.filipe@gmail.com> - 2017.0.0-4
- rebuilt
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 2017.0.0-2
- Rebuilt for Boost 1.64
* Tue Jul 04 2017 Bruno Postle <bruno@postle.net> - 2017.0.0-1
- stable release, built with configure option to force X11 backend on Wayland
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2016.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Tue May 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 2016.2.0-4
- rebuild (exiv2)
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2016.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 2016.2.0-2
- Rebuild for glew 2.0.0
* Sun Sep 18 2016 Bruno Postle <bruno@postle.net> - 2016.2.0-1
- stable release, built with GTK2
* Wed Apr 13 2016 Bruno Postle <bruno@postle.net> - 2016.0.0-1
- stable release
* Wed Aug 19 2015 Bruno Postle <bruno@postle.net> - 2015.0.0-1
- upstream release
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.0.0-10
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 2014.0.0-9
- rebuild for Boost 1.58
* Wed Jun 24 2015 Rex Dieter <rdieter@fedoraproject.org> - 2014.0.0-8
- rebuild (exiv2)
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.0.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu May 14 2015 Nils Philippsen <nils@redhat.com> - 2014.0.0-6
- rebuild for lensfun-0.3.1
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2014.0.0-5
- Rebuilt for GCC 5 C++11 ABI change
* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 2014.0.0-4
- Add an AppData file for the software center
* Tue Feb 03 2015 Petr Machata <pmachata@redhat.com> - 2014.0.0-3
- Rebuild for boost 1.57.0
- Apply an upstream patch that ports expression parser to
Boost.Phoenix V3 (hugin-2013.0.0-boost-phoenix3.patch)
* Mon Feb 02 2015 Bruno Postle <bruno@postle.net> - 2014.0.0-2
- Upstream release
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 2013.0.0-12
- Rebuild for boost 1.57.0
* Wed Nov 26 2014 Rex Dieter <rdieter@fedoraproject.org> 2013.0.0-11
- FTBFS against lensfun-0.3 (#1168239)
* Tue Nov 25 2014 Rex Dieter <rdieter@fedoraproject.org> 2013.0.0-10
- rebuild (openexr)
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2013.0.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Aug 09 2014 Rex Dieter <rdieter@fedoraproject.org> 2013.0.0-8
- update icon/mime scriptlets
* Sat Jun 07 2014 Bruno Postle <bruno@postle.net> - 2013.0.0-7
- Rebuild for rebuilt libpano13
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 2013.0.0-6
- Rebuild for boost 1.55.0
* Sun Dec 15 2013 Bruno Postle <bruno@postle.net> - 2013.0.0-5
- fix to re-enable .pto file association
* Tue Dec 03 2013 Rex Dieter <rdieter@fedoraproject.org> - 2013.0.0-4
- rebuild (exiv2)
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 2013.0.0-3
- rebuild (openexr)
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 2013.0.0-2
- rebuilt for GLEW 1.10
* Thu Oct 31 2013 Bruno Postle <bruno@postle.net> - 2013.0.0-1
- upstream stable release
* Sun Sep 08 2013 Rex Dieter <rdieter@fedoraproject.org> 2012.0.0-11
- rebuild (openexr)
* Mon Aug 26 2013 Rex Dieter <rdieter@fedoraproject.org> 2012.0.0-10 * Mon Aug 26 2013 Rex Dieter <rdieter@fedoraproject.org> 2012.0.0-10
- fix FTBFS wrt perl pod encoding issue(s) (#991875) - fix FTBFS wrt perl pod encoding issue(s) (#991875)

View File

@ -1 +1 @@
6a4fb2585eb3539ba6769cf4557f6e88 hugin-2012.0.0.tar.bz2 SHA512 (hugin-2019.0.0.tar.bz2) = 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5

13
wx_use_libs.patch Normal file
View File

@ -0,0 +1,13 @@
diff -r 5abfb4de7961 CMakeLists.txt
--- a/CMakeLists.txt Sun Jan 21 12:56:33 2018 +0100
+++ b/CMakeLists.txt Sat Mar 23 11:56:35 2019 +0000
@@ -162,8 +162,7 @@
##
# This must come before FINDs for tiff, jpeg, png, zlib to enable
# finding the wxWidgets distributions of those packages (Win32 only).
-SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa)
-FIND_PACKAGE(wxWidgets REQUIRED)
+FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa)
# hugin requires wxwidgets 3.0 or above
IF (UNIX)