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

diff --git a/pcl.spec b/pcl.spec
index 6b3faea..e381dcc 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -4,27 +4,32 @@
 %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.0
-Release:	3
+Version:	1.7.2
+Release:	12
 License:	BSD
 Group:		Libraries
 #Source0Download: http://pointclouds.org/downloads/
 Source0:	https://github.com/PointCloudLibrary/pcl/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	e2ac2d2e72825d991c6d194f9586b5d8
-Patch0:		%{name}-openni.patch
-Patch1:		%{name}-vtk6.patch
-Patch2:		%{name}-fz_api.patch
-Patch3:		%{name}-tawara.patch
+# Source0-md5:	02c72eb6760fcb1f2e359ad8871b9968
+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
 BuildRequires:	boost-devel >= 1.43
@@ -50,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)
 
@@ -82,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
@@ -94,6 +100,9 @@ Pliki nagłówkowe biblioteki PCL.
 Summary:	PCL API documentation and tutorials
 Summary(pl.UTF-8):	Dokumentacja API oraz wprowadzenie do biblioteki PCL
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 API documentation and tutorials for PCL library.
@@ -107,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
@@ -118,20 +131,16 @@ cd build
 	-DFZAPI_DIR=/usr \
 	-DFZAPI_INCLUDE_DIR=/usr/include \
 	-DFZAPI_LIBS=%{_libdir}/libfz_api.so \
+%endif
+%if %{with apidocs}
+	-DWITH_DOCS=ON \
+	-DWITH_TUTORIALS=ON \
 %endif
 	%{!?with_sse:-DPCL_ENABLE_SSE=OFF}
 
 # NOTE: -j1 because of OOM on th-x86_64
 %{__make} -j1
 
-# why it's not called on build?
-%if %{with apidocs}
-cd doc/doxygen
-doxygen doxyfile
-cd ../tutorials
-sphinx-build -b html -a -d doctrees ../../../doc/tutorials/content html
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -147,17 +156,23 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS.txt LICENSE.txt
+%attr(755,root,root) %{_bindir}/pcl_compute_hausdorff
 %attr(755,root,root) %{_bindir}/pcl_compute_hull
 %attr(755,root,root) %{_bindir}/pcl_concatenate_points_pcd
 %attr(755,root,root) %{_bindir}/pcl_convert_pcd_ascii_binary
 %attr(755,root,root) %{_bindir}/pcl_demean_cloud
 %attr(755,root,root) %{_bindir}/pcl_fast_bilateral_filter
+%attr(755,root,root) %{_bindir}/pcl_generate
+%attr(755,root,root) %{_bindir}/pcl_grid_min
 %attr(755,root,root) %{_bindir}/pcl_hdl_grabber
 %attr(755,root,root) %{_bindir}/pcl_linemod_detection
+%attr(755,root,root) %{_bindir}/pcl_local_max
 %attr(755,root,root) %{_bindir}/pcl_lum
 %attr(755,root,root) %{_bindir}/pcl_match_linemod_template
+%attr(755,root,root) %{_bindir}/pcl_morph
 %attr(755,root,root) %{_bindir}/pcl_ndt2d
 %attr(755,root,root) %{_bindir}/pcl_ndt3d
+%attr(755,root,root) %{_bindir}/pcl_obj2pcd
 %attr(755,root,root) %{_bindir}/pcl_oni2pcd
 %attr(755,root,root) %{_bindir}/pcl_openni_grabber_depth_example
 %attr(755,root,root) %{_bindir}/pcl_openni_grabber_example
@@ -172,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pcl_ply2ply
 %attr(755,root,root) %{_bindir}/pcl_ply2raw
 %attr(755,root,root) %{_bindir}/pcl_plyheader
+%attr(755,root,root) %{_bindir}/pcl_progressive_morphological_filter
 %attr(755,root,root) %{_bindir}/pcl_radius_filter
 %attr(755,root,root) %{_bindir}/pcl_sac_segmentation_plane
 %attr(755,root,root) %{_bindir}/pcl_train_linemod_template
@@ -215,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pcl_outlier_removal
 %attr(755,root,root) %{_bindir}/pcl_passthrough_filter
 %attr(755,root,root) %{_bindir}/pcl_pcd2ply
+%attr(755,root,root) %{_bindir}/pcl_pcd2png
 %attr(755,root,root) %{_bindir}/pcl_pcd2vtk
 %attr(755,root,root) %{_bindir}/pcl_pcd_grabber_viewer
 %attr(755,root,root) %{_bindir}/pcl_pcd_image_viewer
@@ -230,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
@@ -304,6 +323,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/pcl_common-1.7.pc
 %{_pkgconfigdir}/pcl_features-1.7.pc
 %{_pkgconfigdir}/pcl_filters-1.7.pc
+%{_pkgconfigdir}/pcl_geometry-1.7.pc
 %{_pkgconfigdir}/pcl_io-1.7.pc
 %{_pkgconfigdir}/pcl_kdtree-1.7.pc
 %{_pkgconfigdir}/pcl_keypoints-1.7.pc
@@ -327,6 +347,7 @@ rm -rf $RPM_BUILD_ROOT
 %files apidocs
 %defattr(644,root,root,755)
 %dir %{_docdir}/pcl-1.7
+%{_docdir}/pcl-1.7/advanced
 %{_docdir}/pcl-1.7/html
 %{_docdir}/pcl-1.7/tutorials
 %endif