- builds now

diff --git a/hugin-boost.patch b/hugin-boost.patch
new file mode 100644 (file)
index 0000000..5b82256
--- /dev/null
+++ b/hugin-boost.patch
@@ -0,0 +1,81 @@
+--- hugin-2013.0.0.old/src/tools/ParseExp.cpp  2013-10-27 10:19:02.000000000 +0100
++++ hugin-2013.0.0/src/tools/ParseExp.cpp      2014-09-12 01:41:15.468973470 +0200
+@@ -50,37 +50,45 @@
+ //power function\r
+ struct lazy_pow_\r
+ {\r
+-    template <typename X, typename Y>\r
+-    struct result { typedef X type; };\r
++    template<class> struct result;\r
++\r
++    template <typename F, typename X, typename Y>\r
++    struct result<F(X,Y)> { typedef X& type; };\r
+ \r
+     template <typename X, typename Y>\r
+-    X operator()(X x, Y y) const\r
++    X& operator()(X& x, Y y) const\r
+     {\r
+-        return std::pow(x, y);\r
++        x= std::pow(x, y);\r
++        return x;\r
+     }\r
+ };\r
+ \r
+ // modulus for double values\r
+ struct lazy_mod_\r
+ {\r
+-    template <typename X, typename Y>\r
+-    struct result { typedef X type; };\r
++    template<class> struct result;\r
++\r
++    template <typename F, typename X, typename Y>\r
++    struct result<F(X,Y)> { typedef X& type; };\r
+ \r
+     template <typename X, typename Y>\r
+-    X operator()(X x, Y y) const\r
++    X& operator()(X& x, Y y) const\r
+     {\r
+-        return std::fmod(x,y);\r
++        x= std::fmod(x,y);\r
++        return x;\r
+     }\r
+ };\r
+ \r
+ // if statement\r
+ struct lazy_if_\r
+ {\r
+-    template <typename X, typename Y, typename Z>\r
+-    struct result { typedef Y type; };\r
++    template<class> struct result;\r
+ \r
+-    template <typename X, typename Y, typename Z>\r
+-    X operator()(X x, Y y, Z z) const\r
++    template <typename F, typename X, typename Y>\r
++    struct result<F(X,Y,Y)> { typedef Y& type; };\r
++\r
++    template <typename X, typename Y>\r
++    Y& operator()(X x, Y& y, Y& z) const\r
+     {\r
+         return x ? y : z;\r
+     }\r
+@@ -89,13 +97,16 @@
+ // wrapper for unary function\r
+ struct lazy_ufunc_\r
+ {\r
+-    template <typename F, typename A1>\r
+-    struct result { typedef A1 type; };\r
++    template<class> struct result;\r
++\r
++    template<typename F, typename F1, typename A1>\r
++    struct result<F(F1,A1)> { typedef A1& type; };\r
+ \r
+     template <typename F, typename A1>\r
+-    A1 operator()(F f, A1 a1) const\r
++    A1& operator()(F f, A1& a1) const\r
+     {\r
+-        return f(a1);\r
++        a1= f(a1);\r
++        return a1;\r
+     }\r
+ };\r
+ \r

diff --git a/hugin.spec b/hugin.spec
index 1e066fae74e1a9bd0224ee7ff267367276c915aa..4c7c59f6e201906aa35298b2d60d475a9866d45d 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -9,6 +9,7 @@ Source0:        http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
 # Source0-md5: 711784c27bdb743ddc45dc2c448ac87c
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-cppflags.patch
+Patch2:                %{name}-boost.patch
 URL:           http://hugin.sourceforge.net/
 BuildRequires: OpenEXR-devel
 BuildRequires: OpenGL-glut-devel
@@ -26,6 +27,7 @@ BuildRequires:        libpano13-devel >= 2.9.19
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
+BuildRequires: perl-Image-ExifTool
 BuildRequires: perl-tools-pod
 BuildRequires: pkgconfig
 BuildRequires: python-devel
@@ -63,6 +65,7 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 %setup -q
 #%patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
 
@@ -106,11 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog LICENCE_VIGRA README TODO src/celeste/LICENCE_{GABOR,LIBSVM}
 %lang(ja) %doc README_JP
-%attr(755,root,root) %{_bindir}/PTBatcher
 %attr(755,root,root) %{_bindir}/PTBatcherGUI
 %attr(755,root,root) %{_bindir}/align_image_stack
 %attr(755,root,root) %{_bindir}/autooptimiser
-%attr(755,root,root) %{_bindir}/autopano-noop.sh
 %attr(755,root,root) %{_bindir}/calibrate_lens_gui
 %attr(755,root,root) %{_bindir}/celeste_standalone
 %attr(755,root,root) %{_bindir}/checkpto
@@ -124,14 +125,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/hugin_stitch_project
 %attr(755,root,root) %{_bindir}/icpfind
 %attr(755,root,root) %{_bindir}/linefind
-%attr(755,root,root) %{_bindir}/matchpoint
 %attr(755,root,root) %{_bindir}/nona
-%attr(755,root,root) %{_bindir}/nona_gui
 %attr(755,root,root) %{_bindir}/pano_modify
 %attr(755,root,root) %{_bindir}/pano_trafo
 %attr(755,root,root) %{_bindir}/pto_gen
 %attr(755,root,root) %{_bindir}/pto_lensstack
+%attr(755,root,root) %{_bindir}/pto_mask
 %attr(755,root,root) %{_bindir}/pto_merge
+%attr(755,root,root) %{_bindir}/pto_move
+%attr(755,root,root) %{_bindir}/pto_template
 %attr(755,root,root) %{_bindir}/pto_var
 %attr(755,root,root) %{_bindir}/pto2mk
 %attr(755,root,root) %{_bindir}/tca_correct
@@ -158,11 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
 %{_pixmapsdir}/hugin.png
 %{_pixmapsdir}/ptbatcher.png
-%{_mandir}/man1/PTBatcher.1*
 %{_mandir}/man1/PTBatcherGUI.1*
 %{_mandir}/man1/align_image_stack.1*
 %{_mandir}/man1/autooptimiser.1*
-%{_mandir}/man1/autopano-noop.sh.1*
 %{_mandir}/man1/calibrate_lens_gui.1*
 %{_mandir}/man1/celeste_standalone.1*
 %{_mandir}/man1/checkpto.1*
@@ -176,15 +176,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/hugin_stitch_project.1*
 %{_mandir}/man1/icpfind.1*
 %{_mandir}/man1/linefind.1*
-%{_mandir}/man1/matchpoint.1*
 %{_mandir}/man1/nona.1*
-%{_mandir}/man1/nona_gui.1*
 %{_mandir}/man1/pano_modify.1*
 %{_mandir}/man1/pano_trafo.1*
 %{_mandir}/man1/pto2mk.1*
 %{_mandir}/man1/pto_gen.1*
 %{_mandir}/man1/pto_lensstack.1*
 %{_mandir}/man1/pto_merge.1*
+%{_mandir}/man1/pto_mask.1*
+%{_mandir}/man1/pto_move.1*
+%{_mandir}/man1/pto_template.1*
 %{_mandir}/man1/pto_var.1*
 %{_mandir}/man1/tca_correct.1*
 %{_mandir}/man1/vig_optimize.1*