- updated to 2016.0.0

diff --git a/boost-1.57.0.patch b/boost-1.57.0.patch
deleted file mode 100644 (file)
index 6ab3541..0000000
--- a/boost-1.57.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hugin-2014.0.0/src/hugin1/hugin/TextureManager.h~  2014-10-08 20:19:19.000000000 +0200
-+++ hugin-2014.0.0/src/hugin1/hugin/TextureManager.h   2015-02-18 20:17:32.275040262 +0100
-@@ -42,6 +42,7 @@
- #include <map>
- #include <boost/version.hpp>
- #if BOOST_VERSION>=105400
-+#include <boost/weak_ptr.hpp>
- #include <boost/signals2/trackable.hpp>
- namespace boostSignal=boost::signals2;
- #else

diff --git a/hugin-boost.patch b/hugin-boost.patch
deleted file mode 100644 (file)
index 5b82256..0000000
--- a/hugin-boost.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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 b62c7d9d86f20ef1b4faa1cc1daac7240f1d0029..df8f4104a2fed5d18bfb7158db05177fe2d8cef7 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,18 +1,15 @@
 Summary:       Toolchain to create panoramic images
 Summary(pl.UTF-8):     Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:          hugin
-Version:       2014.0.0
-Release:       9
+Version:       2016.0.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5: 711784c27bdb743ddc45dc2c448ac87c
+# Source0-md5: 8407dd7275374a492610221e7ae56be9
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-cppflags.patch
-Patch2:                %{name}-boost.patch
-Patch3:                boost-1.57.0.patch
 Patch4:                no-sysctl.patch
-Patch5:                lensfun-0.3.patch
 Patch6:                python-install.patch
 URL:           http://hugin.sourceforge.net/
 BuildRequires: OpenEXR-devel
@@ -69,10 +66,7 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 %setup -q
 #%patch0 -p1
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
@@ -115,8 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENCE_VIGRA README TODO src/celeste/LICENCE_{GABOR,LIBSVM}
-%lang(ja) %doc README_JP
+%doc AUTHORS Changes.txt README TODO src/celeste/LICENCE_{GABOR,LIBSVM}
 %attr(755,root,root) %{_bindir}/PTBatcherGUI
 %attr(755,root,root) %{_bindir}/align_image_stack
 %attr(755,root,root) %{_bindir}/autooptimiser
@@ -129,7 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/fulla
 %attr(755,root,root) %{_bindir}/geocpset
 %attr(755,root,root) %{_bindir}/hugin
+%attr(755,root,root) %{_bindir}/hugin_executor
 %attr(755,root,root) %{_bindir}/hugin_hdrmerge
+%attr(755,root,root) %{_bindir}/hugin_lensdb
 %attr(755,root,root) %{_bindir}/hugin_stitch_project
 %attr(755,root,root) %{_bindir}/icpfind
 %attr(755,root,root) %{_bindir}/linefind
@@ -143,18 +138,16 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%attr(755,root,root) %{_bindir}/verdandi
 %attr(755,root,root) %{_bindir}/vig_optimize
 %dir %{_libdir}/hugin
 %attr(755,root,root) %{_libdir}/hugin/libceleste.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhuginbase.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhuginbasewx.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhuginlines.so.*.*
-%attr(755,root,root) %{_libdir}/hugin/libhuginvigraimpex.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libicpfindlib.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/liblocalfeatures.so.*.*
-%attr(755,root,root) %{_libdir}/hugin/libmakefilelib.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhugin_python_interface.so.*.*
 %attr(755,root,root) %{py_sitedir}/_hsi.so
 %{py_sitedir}/hpi.py*
@@ -183,14 +176,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/fulla.1*
 %{_mandir}/man1/geocpset.1*
 %{_mandir}/man1/hugin.1*
+%{_mandir}/man1/hugin_executor.1*
 %{_mandir}/man1/hugin_hdrmerge.1*
+%{_mandir}/man1/hugin_lensdb.1*
 %{_mandir}/man1/hugin_stitch_project.1*
 %{_mandir}/man1/icpfind.1*
 %{_mandir}/man1/linefind.1*
 %{_mandir}/man1/nona.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*
@@ -200,3 +194,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pto_var.1*
 %{_mandir}/man1/tca_correct.1*
 %{_mandir}/man1/vig_optimize.1*
+%{_mandir}/man1/verdandi.1*

diff --git a/lensfun-0.3.patch b/lensfun-0.3.patch
deleted file mode 100644 (file)
index 2253cc1..0000000
--- a/lensfun-0.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp~   2014-10-08 20:21:49.000000000 +0200
-+++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp    2015-06-27 11:39:56.946214317 +0200
-@@ -620,7 +620,6 @@
-                 break;
-             case LF_DIST_MODEL_NONE:
-             case LF_DIST_MODEL_POLY5:
--            case LF_DIST_MODEL_FOV1:
-             default:
-                 return false;
-                 break;