rpm/hugin
SHA256
1
0
Fork 0
forked from pool/hugin
Code Pull Requests Activity

Accepting request 328759 from graphics

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/328759
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2015-09-08 15:39:00 +00:00 committed by Git OBS Bridge
commit 60e626e435
6 changed files with 24 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hugin-2014.0.0.tar.bz2
View File

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

3
hugin-2015.0.0.tar.bz2 Normal file
View File

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

85
hugin-boost-1.56.0.patch
View File

@ -1,85 +0,0 @@
Index: hugin-2014.0.0/src/tools/ParseExp.cpp
===================================================================
--- hugin-2014.0.0.orig/src/tools/ParseExp.cpp
+++ hugin-2014.0.0/src/tools/ParseExp.cpp
@@ -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;
};

14
hugin-lensfun-0.3.patch
View File

@ -1,14 +0,0 @@
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;

17
hugin.changes
View File

@ -1,3 +1,20 @@
Sun Aug 30 09:07:36 UTC 2015 - salsergey@gmail.com
- Updated to version 2015.0.0
* The makefile based stitching engine has been replaced with direct calls to the underlying programs.
* Hugin now has it's own blender, verdandi, based on a watershed algorithm, which has been included in 'nona'.
* The lensfun library has been removed as it did not fulfill our expectations. It has been replaced with our own camera and lens database which uses a data mining approach and operates automatically without user intervention.
* The fast preview window has a new tool to add or remove control points to selected areas in the output projection.
* Automatic exposure stack detection is now applied when loading images, and an option has been added to unlink image position when adding stacks.
* The fine-tune and auto-estimate functions in the control point tab have been made projection aware.
* PTBatcherGUI has more choice for the end of the process: depending on the operating system the PTBatcherGUI can be closed, the computer can be shut down or send to the hibernate mode.
* PTBatcherGUI now shows the thumbnails when searching for images in directories.
* Many of the underlying tools in hugin are now able to use available cpu cores.
* New command line tools for CLI processing: verdandi, hugin_executor, hugin_lensdb
* Many more improvements and bug fixes.
- Removed hugin-boost-1.56.0.patch (included upstream).
- Removed hugin-lensfun-0.3.patch (support for lensfun has been dropped).
-------------------------------------------------------------------
Mon Mar 2 14:20:27 UTC 2015 - dimstar@opensuse.org

14
hugin.spec
View File

@ -30,7 +30,6 @@ BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: glew-devel
BuildRequires: lapack
BuildRequires: lensfun-devel
BuildRequires: libXi-devel
BuildRequires: libXmu-devel
BuildRequires: libexiv2-devel
@ -41,13 +40,14 @@ BuildRequires: libtiff-devel
BuildRequires: libxml2
BuildRequires: python-devel
BuildRequires: python-wxWidgets >= 2.7.0
BuildRequires: sqlite3-devel
BuildRequires: swig
BuildRequires: tclap
BuildRequires: update-desktop-files
BuildRequires: vigra
BuildRequires: vigra-devel
BuildRequires: wxWidgets-devel
BuildRequires: zip
%define mversion 2014.0
%define mversion 2015.0
Version: %{mversion}.0
Release: 0
Summary: Toolchain for Stitching of Images and Creating Panoramas
@ -59,10 +59,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
# PATCH-FIX-UPSTREAM hugin-boost-1.56.0.patch dimstar@opensuse.org -- Fix build with Boost 1.56.0, taken from http://sourceforge.net/p/hugin/hugin/ci/e237d6d1d87354f974d37a95ba52dbd9666dd310/tree/src/tools/ParseExp.cpp?diff=dde84e96b755646f3390bd9114a76f7c392fd0bf
Patch0: hugin-boost-1.56.0.patch
# PATCH-FIX-UPSTREAM hugin-lensfun-0.3.patch dimstar@opensuse.org -- Fix build with hugin 0.3
Patch1: hugin-lensfun-0.3.patch
Requires: enblend-enfuse >= 3.2
# needed for photo stiching (bnc#822775)
Requires: make
@ -83,8 +79,6 @@ detection and extraction of key points.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# For SVN snapshot:
#setup -q -n %%{name}
@ -130,7 +124,7 @@ make VERBOSE=1 %{?_smp_mflags} -j1
# Use better place for MIME icons.
mv %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO %{buildroot}%{_docdir}/%{name}/
cp -a AUTHORS authors.txt COPYING ChangeLog README README_JP TODO %{buildroot}%{_docdir}/%{name}/
chmod -x %{buildroot}%{_docdir}/%{name}/*
%fdupes %{buildroot}