Hello community,

here is the log from the commit of package hugin for openSUSE:Factory checked 
in at 2015-03-05 15:39:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hugin (Old)
 and      /work/SRC/openSUSE:Factory/.hugin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hugin"

Changes:
--------
--- /work/SRC/openSUSE:Factory/hugin/hugin.changes      2014-12-08 
16:56:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hugin.new/hugin.changes 2015-03-05 
18:15:59.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar  2 14:20:27 UTC 2015 - [email protected]
+
+- Add hugin-lensfun-0.3.patch: Fix build with Lensfun 0.3.
+
+-------------------------------------------------------------------

New:
----
  hugin-lensfun-0.3.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hugin.spec ++++++
--- /var/tmp/diff_new_pack.l7h4SC/_old  2015-03-05 18:16:00.000000000 +0100
+++ /var/tmp/diff_new_pack.l7h4SC/_new  2015-03-05 18:16:00.000000000 +0100
@@ -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 @@
 Source1:        %{name}-svn-dummy
 # PATCH-FIX-UPSTREAM hugin-boost-1.56.0.patch [email protected] -- 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 [email protected]  -- 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 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # For SVN snapshot:
 #setup -q -n %%{name}

++++++ hugin-lensfun-0.3.patch ++++++
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;

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to