new upstream release

hugin-2010.4.0.gcc460.patch

@@ -1,11 +0,0 @@
-diff -r 9e1d0816a1ed -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx
---- a/src/foreign/vigra/vigra/multi_iterator.hxx	Mon Jan 24 21:37:53 2011 +0100
-+++ b/src/foreign/vigra/vigra/multi_iterator.hxx	Tue Jan 25 21:14:13 2011 +0000
-@@ -41,6 +41,7 @@
- #define VIGRA_MULTI_ITERATOR_HXX
- 
- #include <sys/types.h>
-+#include <stddef.h>
- #include "tinyvector.hxx"
- #include "iteratortags.hxx"
- 

hugin-gcc47.patch

@@ -1,33 +0,0 @@
-diff -r 658ded2153f2 src/celeste/Utilities.h
---- a/src/celeste/Utilities.h	Sun Jan 01 13:23:39 2012 +0100
-+++ b/src/celeste/Utilities.h	Sat Jan 07 19:38:25 2012 +0000
-@@ -33,6 +33,8 @@
- #include <stdio.h>
- #ifdef _WINDOWS
- #include "direct.h"
-+#else
-+#include <unistd.h>
- #endif
- 
- using namespace std; 
-diff -r 658ded2153f2 src/foreign/zthread/include/zthread/Guard.h
---- a/src/foreign/zthread/include/zthread/Guard.h	Sun Jan 01 13:23:39 2012 +0100
-+++ b/src/foreign/zthread/include/zthread/Guard.h	Sat Jan 07 19:38:25 2012 +0000
-@@ -428,7 +428,7 @@
-   template <class U, class V>
-   Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
- 
--    LockingPolicy::shareScope(*this, extract(g));
-+    LockingPolicy::shareScope(*this, this->extract(g));
-     
-   }
- 
-@@ -458,7 +458,7 @@
-   template <class U, class V>
-   Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
- 
--    LockingPolicy::transferScope(*this, extract(g));
-+    LockingPolicy::transferScope(*this, this->extract(g));
- 
-   }
- 

hugin.spec

@@ -1,12 +1,11 @@
 %{!?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
 Name: hugin
-Version: 2011.4.0
-Release: 6%{?dist}
+Version: 2012.0.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-Patch0: hugin-gcc47.patch
 URL: http://hugin.sourceforge.net/
 Requires: shared-mime-info
 Requires: webclient
@@ -15,7 +14,7 @@ Requires: %{name}-base = %{version}-%{release}
 BuildRequires: libpano13-devel >= 2.9.18 zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel freeglut-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
-BuildRequires: tclap-devel python-devel swig
+BuildRequires: tclap-devel python-devel swig flann-devel lensfun-devel
 %{?fedora:BuildRequires: mesa-libGLU-devel libXmu-devel}
 %{?rhel:BuildRequires: xorg-x11-devel}
 
@@ -31,7 +30,6 @@ Group: Applications/Multimedia
 Requires: make enblend >= 3.2 perl-Image-ExifTool
 Provides: bundled(vigra) = 1.5.0
 Provides: bundled(zthread) = 2.3.1
-Provides: bundled(flann) = 1.6.6
 
 %description base
 Command-line tools used to generate panoramic images, install this package
@@ -40,8 +38,6 @@ without a GUI environment.
 
 %prep
 %setup -q
-%patch0 -p1
-%__sed -i 's/^# @api-max.*/# @api-max %{version}/' src/hugin_script_interface/plugins/*.py
 
 %build
 %cmake . -DBUILD_HSI=1
@@ -56,6 +52,9 @@ desktop-file-install --vendor="" --delete-original \
 desktop-file-install --vendor="" --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
   %{buildroot}/%{_datadir}/applications/PTBatcherGUI.desktop
+desktop-file-install --vendor="" --delete-original \
+  --dir=%{buildroot}/%{_datadir}/applications \
+  %{buildroot}/%{_datadir}/applications/pto_gen.desktop
 %find_lang %{name}
 
 
@@ -77,11 +76,11 @@ touch --no-create %{_datadir}/icons/gnome || :
 
 %files -f %{name}.lang
 %defattr(-, root, root,-)
-%{_bindir}/PTBatcher
 %{_bindir}/PTBatcherGUI
+%{_bindir}/PTBatcher
 %{_bindir}/hugin
-%{_bindir}/hugin_stitch_project
 %{_bindir}/nona_gui
+%{_bindir}/hugin_stitch_project
 %{_bindir}/icpfind
 %{_bindir}/calibrate_lens_gui
 %{_bindir}/autopano-noop.sh
@@ -91,6 +90,7 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/PTBatcherGUI.desktop
 %{_datadir}/applications/calibrate_lens_gui.desktop
+%{_datadir}/applications/pto_gen.desktop
 %{_datadir}/pixmaps/*.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*
 %{_datadir}/mime/packages/%{name}.xml
@@ -115,8 +115,8 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/autooptimiser
 %{_bindir}/celeste_standalone
 %{_bindir}/fulla
-%{_bindir}/hugin_hdrmerge
 %{_bindir}/matchpoint
+%{_bindir}/hugin_hdrmerge
 %{_bindir}/nona
 %{_bindir}/pto2mk
 %{_bindir}/tca_correct
@@ -129,13 +129,13 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/checkpto
 %{_bindir}/cpfind
 %{_bindir}/linefind
+%{_bindir}/pto_gen
 
 %{_libdir}/%{name}/libhuginbase.so*
 %{_libdir}/%{name}/libhuginvigraimpex.so*
 %{_libdir}/%{name}/libceleste.so*
 %{_libdir}/%{name}/liblocalfeatures.so*
 %{_libdir}/%{name}/libmakefilelib.so*
-%{_libdir}/%{name}/libflann_cpp.so*
 %{_libdir}/%{name}/libhuginlines.so*
 %{_libdir}/%{name}/libhugin_python_interface.so*
 %{python_sitearch}/_hsi.so
@@ -162,8 +162,12 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_mandir}/man1/checkpto.*
 %{_mandir}/man1/cpfind.*
 %{_mandir}/man1/linefind.*
+%{_mandir}/man1/pto_gen.*
 
 %changelog
+* Mon Nov 05 2012 Bruno Postle 2012.0.0-1
+- Stable release, no longer contains a bundled flann
+
 * Sun May 20 2012 Bruno Postle - 2011.4.0-6
 - backported fix for bug that prevented python plugin 'Actions' menu appearing
 

sources

@@ -1 +1 @@
-3e4866dbbc7974972604aa18580eae0e  hugin-2011.4.0.tar.bz2
+6a4fb2585eb3539ba6769cf4557f6e88  hugin-2012.0.0.tar.bz2