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

Accepting request 288556 from graphics

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/288556
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2015-03-05 14:39:40 +00:00 committed by Git OBS Bridge
commit 1128b25ffe
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hugin-lensfun-0.3.patch Normal file
View File

@ -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;

5
hugin.changes
View File

@ -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 Fri Dec 5 10:36:30 UTC 2014 - dimstar@opensuse.org

5
hugin.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hugin # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 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 # 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 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 Requires: enblend-enfuse >= 3.2
# needed for photo stiching (bnc#822775) # needed for photo stiching (bnc#822775)
Requires: make Requires: make
@ -82,6 +84,7 @@ detection and extraction of key points.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
# For SVN snapshot: # For SVN snapshot:
#setup -q -n %%{name} #setup -q -n %%{name}