- try fixing tawara bcond

[packages/pcl.git] / pcl.spec

diff --git a/pcl.spec b/pcl.spec
index 25095e79721c52686e1068b214102244cb4fa2e7..e381dcc456b8ea56372025139c102c03d0dacec2 100644 (file)
--- 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:       9
+Release:       12
 License:       BSD
 Group:         Libraries
 #Source0Download: http://pointclouds.org/downloads/
@@ -21,6 +21,10 @@ 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
@@ -112,6 +116,10 @@ Dokumentacja API oraz wprowadzenie do biblioteki PCL.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 mkdir build
@@ -239,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