Accepting request 148723 from graphics

- Update to version 2012.0.0:
  * integrated lensfun library
  * new tool pto_gen
  * improvements to cpfind
  * option to keep exposure fused stacks
  * pano_modify: Added HDR autocrop option
  * translations updated
  * more improvements and bug fixes
- Turn on HSI (Python Hugin Scripting Interface). (forwarded request 148722 from sbrabec)

OBS-URL: https://build.opensuse.org/request/show/148723
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=36

gcc47.diff

@@ -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 SunSat 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 SunSatSun Jan 01 13:23:39 2012 +0100
-+++ b/src/foreign/zthread/include/zthread/Guard.h SunSatSunSat 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-2011.4.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
-size 11740410

hugin-2012.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3
+size 11658665

hugin.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 15 18:55:20 CET 2013 - sbrabec@suse.cz
+
+- Update to version 2012.0.0:
+  * integrated lensfun library
+  * new tool pto_gen
+  * improvements to cpfind
+  * option to keep exposure fused stacks
+  * pano_modify: Added HDR autocrop option
+  * translations updated
+  * more improvements and bug fixes
+- Turn on HSI (Python Hugin Scripting Interface).
+
 -------------------------------------------------------------------
 Mon Mar 19 17:30:17 UTC 2012 - alinm.elena@gmail.com
 

hugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hugin
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,19 +22,22 @@ BuildRequires:  OpenEXR-devel
 BuildRequires:  SDL-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake
-BuildRequires:  fdupes
+BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  fftw3-devel
 BuildRequires:  freeglut-devel
 BuildRequires:  gcc-c++
 BuildRequires:  glew-devel
 BuildRequires:  lapack
+BuildRequires:  lensfun-devel
 BuildRequires:  libexiv2-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblapack3
 BuildRequires:  libpano-devel >= 2.9.18
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml2
+BuildRequires:  python-devel
+BuildRequires:  swig
 BuildRequires:  tclap
 BuildRequires:  update-desktop-files
 BuildRequires:  vigra
@@ -46,7 +49,7 @@ BuildRequires:  wxWidgets-devel
 BuildRequires:  python-wxGTK >= 2.7.0
 BuildRequires:  wxGTK-devel
 %endif
-%define mversion 2011.4
+%define mversion 2012.0
 Version:        %{mversion}.0
 Release:        0
 Summary:        Toolchain for Stitching of Images and Creating Panoramas
@@ -58,7 +61,6 @@ Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}
 # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin
 #Source:         %%{name}-svn2008xxxx.tar.bz2
 Source1:        %{name}-svn-dummy
-Patch0:         gcc47.diff
 Requires:       enblend-enfuse >= 3.2
 Recommends:     autopano-sift
 Recommends:     exiftool
@@ -97,7 +99,6 @@ rm README_JP.new
 #mkdir bin
 #cp %%{SOURCE1} bin/svn
 #chmod +x bin/svn
-%patch0 -p1
 
 %build
 export PATH=$PWD/bin:$PATH
@@ -105,7 +106,7 @@ export CFLAGS="%{optflags}"
 export CXXFLAGS="$CFLAGS"
 LIB_SUFFIX=%{_lib}
 LIB_SUFFIX=${LIB_SUFFIX#lib}
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX -DENABLE_LAPACK=ON .
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX -DENABLE_LAPACK=ON BUILD_HSI=ON .
 # parallel make kills our workers
 make -j1 VERBOSE=1
 
@@ -127,6 +128,7 @@ chmod -x %{buildroot}%{_docdir}/%{name}/*
 %if 0%{?suse_version} > 1130
   %icon_theme_cache_post
   %mime_database_post
+  %desktop_database_post
 %else
   if test -f %{_bindir}/update-mime-database ; then
     %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null
@@ -137,6 +139,7 @@ chmod -x %{buildroot}%{_docdir}/%{name}/*
 %if 0%{?suse_version} > 1130
   %icon_theme_cache_postun
   %mime_database_postun
+  %desktop_database_postun
 %else
   if test -f %{_bindir}/update-mime-database ; then
     %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null
@@ -155,5 +158,7 @@ chmod -x %{buildroot}%{_docdir}/%{name}/*
 %dir %{_libdir}/hugin
 %{_libdir}/hugin/*.so.*
 %doc %{_mandir}/man?/*.*
+%{py_sitedir}/*hpi*
+%{py_sitedir}/*hsi*
 
 %changelog