X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pcl.spec;h=e381dcc456b8ea56372025139c102c03d0dacec2;hb=b58bf1434bd25a34886eb08b7b296f98368ee35c;hp=816f9e699ed67f8ac4126fbf8628a0facac971df;hpb=fe3c93b75eec8a0d4ffcdf22c15c5db5505b96bd;p=packages%2Fpcl.git

diff --git a/pcl.spec b/pcl.spec
index 816f9e6..e381dcc 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -4,14 +4,14 @@
 %bcond_without	apidocs	# do not build and package API docs
 %bcond_without	fzapi	# Fotonic FZ API support
 %bcond_with	sse	# SSE/SSE2/SSE3 support
-%bcond_without	tawara	# Tawara video output (pcl_video)
+%bcond_with	tawara	# Tawara video output (pcl_video)
 %bcond_without	vtk	# VTK support in libpcl_{io,surface} + libpcl_{apps,visualization} libs
 
 Summary:	Point Cloud Library - library for point cloud processing
 Summary(pl.UTF-8):	Point Cloud Library - biblioteka do operacji na chmurze punktów
 Name:		pcl
 Version:	1.7.2
-Release:	3
+Release:	12
 License:	BSD
 Group:		Libraries
 #Source0Download: http://pointclouds.org/downloads/
@@ -20,9 +20,15 @@ Source0:	https://github.com/PointCloudLibrary/pcl/archive/%{name}-%{version}.tar
 Patch0:		%{name}-fz_api.patch
 Patch1:		%{name}-tawara.patch
 Patch2:		%{name}-openni.patch
+Patch3:		eigen-dependency.patch
+Patch4:		vtk7.patch
+Patch5:		vtk71.patch
+Patch6:		vtkOpenGL2.patch
+Patch7:		fix-return-type.patch
 URL:		http://pointclouds.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	OpenNI-devel
 BuildRequires:	OpenNI2-devel
 BuildRequires:	QtCore-devel >= 4
 BuildRequires:	QtOpenGL-devel >= 4
@@ -49,8 +55,8 @@ BuildRequires:	sed >= 4.0
 %{?with_vtk:BuildRequires:	vtk-tcl >= 6}
 %if %{with apidocs}
 BuildRequires:	doxygen
-BuildRequires:	python-sphinxcontrib-doxylink >= 1.3
-BuildRequires:	sphinx-pdg
+BuildRequires:	python3-sphinxcontrib-doxylink >= 1.3
+BuildRequires:	sphinx-pdg >= 1.3.3-2
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -81,6 +87,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki PCL
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	boost-devel >= 1.44
+Requires:	eigen3 >= 3
 %{?with_vtk:Requires:	vtk-devel >= 6}
 
 %description devel
@@ -108,6 +115,11 @@ Dokumentacja API oraz wprowadzenie do biblioteki PCL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 mkdir build
@@ -235,7 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pcl_transform_from_viewpoint
 %attr(755,root,root) %{_bindir}/pcl_transform_point_cloud
 %attr(755,root,root) %{_bindir}/pcl_vfh_estimation
-%{?with_tawara:%attr(755,root,root) %{_bindir}/pcl_video}
+%if %{with vtk}
+%attr(755,root,root) %{_bindir}/pcl_video
+%endif
 %attr(755,root,root) %{_bindir}/pcl_viewer
 %attr(755,root,root) %{_bindir}/pcl_virtual_scanner
 %attr(755,root,root) %{_bindir}/pcl_voxel_grid