diff --git a/hugin-lensfun-0.3.patch b/hugin-lensfun-0.3.patch new file mode 100644 index 0000000..e59f1be --- /dev/null +++ b/hugin-lensfun-0.3.patch @@ -0,0 +1,14 @@ +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; + diff --git a/hugin.changes b/hugin.changes index 38c387f..b8ef16a 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 2 14:20:27 UTC 2015 - dimstar@opensuse.org + +- Add hugin-lensfun-0.3.patch: Fix build with Lensfun 0.3. + ------------------------------------------------------------------- Fri Dec 5 10:36:30 UTC 2014 - dimstar@opensuse.org diff --git a/hugin.spec b/hugin.spec index bd11764..ce88f93 100644 --- a/hugin.spec +++ b/hugin.spec @@ -1,7 +1,7 @@ # # spec file for package hugin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,6 +61,8 @@ Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name} 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 @@ -82,6 +84,7 @@ detection and extraction of key points. %prep %setup -q %patch0 -p1 +%patch1 -p1 # For SVN snapshot: #setup -q -n %%{name}