From a5bb38175f7d84f5d388e0d2ec8ccb44faf141bf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 27 Jun 2015 11:48:07 +0200
Subject: [PATCH] - fix building with lensfun 0.3+ - drop sysctl.h include -
 not used on linux and breaks x32 build - rel 3

---
 hugin.spec        |  9 ++++++++-
 lensfun-0.3.patch | 10 ++++++++++
 no-sysctl.patch   | 10 ++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 lensfun-0.3.patch
 create mode 100644 no-sysctl.patch

diff --git a/hugin.spec b/hugin.spec
index d314e35..72a7abd 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,7 +2,7 @@ Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
 Version:	2014.0.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
@@ -11,6 +11,8 @@ Patch0:		%{name}-pl.po-update.patch
 Patch1:		%{name}-cppflags.patch
 Patch2:		%{name}-boost.patch
 Patch3:		boost-1.57.0.patch
+Patch4:		no-sysctl.patch
+Patch5:		lensfun-0.3.patch
 URL:		http://hugin.sourceforge.net/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-glut-devel
@@ -68,6 +70,8 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
 
@@ -154,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/hpi.py*
 %{py_sitedir}/hsi.py*
 %{_datadir}/%{name}
+%{_datadir}/appdata/PTBatcherGUI.appdata.xml
+%{_datadir}/appdata/calibrate_lens_gui.appdata.xml
+%{_datadir}/appdata/hugin.appdata.xml
 %{_datadir}/mime/packages/hugin.xml
 %{_desktopdir}/hugin.desktop
 %{_desktopdir}/pto_gen.desktop
diff --git a/lensfun-0.3.patch b/lensfun-0.3.patch
new file mode 100644
index 0000000..2253cc1
--- /dev/null
+++ b/lensfun-0.3.patch
@@ -0,0 +1,10 @@
+--- hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp~	2014-10-08 20:21:49.000000000 +0200
++++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp	2015-06-27 11:39:56.946214317 +0200
+@@ -620,7 +620,6 @@
+                 break;
+             case LF_DIST_MODEL_NONE:
+             case LF_DIST_MODEL_POLY5:
+-            case LF_DIST_MODEL_FOV1:
+             default:
+                 return false;
+                 break;
diff --git a/no-sysctl.patch b/no-sysctl.patch
new file mode 100644
index 0000000..abe3adf
--- /dev/null
+++ b/no-sysctl.patch
@@ -0,0 +1,10 @@
+--- hugin-2014.0.0/src/hugin_base/hugin_utils/platform.cpp~	2014-10-08 20:19:19.000000000 +0200
++++ hugin-2014.0.0/src/hugin_base/hugin_utils/platform.cpp	2015-06-27 11:36:28.945482042 +0200
+@@ -31,7 +31,6 @@
+ #include <unistd.h>
+ #else
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+ 
+ namespace hugin_utils {
-- 
2.43.0