[hugin] FTBFS against lensfun-0.3 (#1168239)
Rex Dieter
rdieter at fedoraproject.org
Wed Nov 26 13:59:46 UTC 2014
commit 5ccdacb33cd2c956e115a19db78373229f098c8d
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Nov 26 07:59:43 2014 -0600
FTBFS against lensfun-0.3 (#1168239)
hugin-2013.0.0-lensfun_0.3.patch | 13 +++++++++++++
hugin.spec | 11 ++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/hugin-2013.0.0-lensfun_0.3.patch b/hugin-2013.0.0-lensfun_0.3.patch
new file mode 100644
index 0000000..897bdfa
--- /dev/null
+++ b/hugin-2013.0.0-lensfun_0.3.patch
@@ -0,0 +1,13 @@
+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.spec b/hugin.spec
index 24c0463..a17f242 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,7 +2,7 @@
Summary: A panoramic photo stitcher and more
Name: hugin
Version: 2013.0.0
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
@@ -19,6 +19,10 @@ BuildRequires: mesa-libGLU-devel libXmu-devel
BuildRequires: perl-podlators
%endif
+# Fix FTBFS against latest lensfun-0.3 release
+# https://bugzilla.redhat.com/show_bug.cgi?id=1168239
+Patch1: hugin-2013.0.0-lensfun_0.3.patch
+
%description
hugin can be used to stitch multiple images together. The resulting image can
span 360 degrees. Another common use is the creation of very high resolution
@@ -40,6 +44,8 @@ without a GUI environment.
%prep
%setup -q
+%patch1 -p1 -b .lensfun_0.3
+
%build
%cmake . -DBUILD_HSI=1
make VERBOSE=1 %{?_smp_mflags}
@@ -180,6 +186,9 @@ fi
%{_mandir}/man1/geocpset.*
%changelog
+* Wed Nov 26 2014 Rex Dieter <rdieter at fedoraproject.org> 2013.0.0-11
+- FTBFS against lensfun-0.3 (#1168239)
+
* Tue Nov 25 2014 Rex Dieter <rdieter at fedoraproject.org> 2013.0.0-10
- rebuild (openexr)
More information about the scm-commits
mailing list