[packages/pcl] - updated to 1.7.1 - updated vtk6 patch (VTK 6.1 support) - removed obsolete openni patch

[qboosh]

commit 0df594f44ea12b2c7e4524f3b5de935044a34827
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 27 18:18:16 2014 +0200

    - updated to 1.7.1
    - updated vtk6 patch (VTK 6.1 support)
    - removed obsolete openni patch

 pcl-openni.patch | 24 ------------------------
 pcl-vtk6.patch   |  8 +++++---
 pcl.spec         | 16 ++++++++--------
 3 files changed, 13 insertions(+), 35 deletions(-)
---
diff --git a/pcl.spec b/pcl.spec
index 5b10a1a..2e7a0e5 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -10,17 +10,16 @@
 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:	4
+Version:	1.7.1
+Release:	1
 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:	ce8fa17662544eb4bb7b084191a61ad5
+Patch0:		%{name}-vtk6.patch
+Patch1:		%{name}-fz_api.patch
+Patch2:		%{name}-tawara.patch
 URL:		http://pointclouds.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -109,7 +108,6 @@ Dokumentacja API oraz wprowadzenie do biblioteki PCL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 mkdir build
@@ -218,6 +216,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
@@ -307,6 +306,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
diff --git a/pcl-openni.patch b/pcl-openni.patch
deleted file mode 100644
index ced07db..0000000
--- a/pcl-openni.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- PCL-1.6.0-Source/io/CMakeLists.txt.orig	2012-07-18 01:11:32.000000000 +0200
-+++ PCL-1.6.0-Source/io/CMakeLists.txt	2012-12-28 15:34:55.362591817 +0100
-@@ -139,9 +139,6 @@
-     endif(OPENNI_FOUND)
- 
-     set(EXT_DEPS eigen3)
--    if(OPENNI_FOUND)
--      list(APPEND EXT_DEPS openni-dev)
--    endif(OPENNI_FOUND)
-     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
-       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
- 
---- PCL-1.6.0-Source/visualization/CMakeLists.txt.orig	2012-07-18 01:11:32.000000000 +0200
-+++ PCL-1.6.0-Source/visualization/CMakeLists.txt	2012-12-28 15:37:49.779254847 +0100
-@@ -99,9 +99,6 @@
-     endif()
- 
-     set(EXT_DEPS "")
--    if(OPENNI_FOUND)
--      list(APPEND EXT_DEPS openni-dev)
--    endif(OPENNI_FOUND)
-     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
-       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
- 
diff --git a/pcl-vtk6.patch b/pcl-vtk6.patch
index 30ca0c2..60e2a95 100644
--- a/pcl-vtk6.patch
+++ b/pcl-vtk6.patch
@@ -197,7 +197,7 @@ diff -up ./tools/CMakeLists.txt.vtk6 ./tools/CMakeLists.txt
  
        PCL_ADD_EXECUTABLE(pcl_tiff2pcd ${SUBSYS_NAME} tiff2pcd.cpp)
 -      target_link_libraries(pcl_tiff2pcd pcl_common pcl_io)
-+      target_link_libraries(pcl_tiff2pcd pcl_common pcl_io vtkRenderingCore vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkRenderingVolume vtkRenderingVolumeOpenGL vtkFiltersStatistics vtkFiltersStatisticsGnuR vtkInteractionStyle vtkFiltersStatistics)
++      target_link_libraries(pcl_tiff2pcd pcl_common pcl_io vtkRenderingCore vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkRenderingFreeTypeFontConfig vtkRenderingMatplotlib vtkRenderingVolume vtkRenderingVolumeOpenGL vtkFiltersStatistics vtkFiltersStatisticsGnuR vtkInteractionStyle vtkFiltersStatistics)
            
        PCL_ADD_EXECUTABLE(pcl_ply2vtk ${SUBSYS_NAME} ply2vtk.cpp)
        target_link_libraries(pcl_ply2vtk pcl_common pcl_io)
@@ -564,15 +564,17 @@ diff -up ./tools/vtk2ply.cpp.vtk6 ./tools/vtk2ply.cpp
 diff -up ./visualization/CMakeLists.txt.vtk6 ./visualization/CMakeLists.txt
 --- ./visualization/CMakeLists.txt.vtk6	2013-08-21 02:43:15.375525780 +0000
 +++ ./visualization/CMakeLists.txt	2013-08-21 02:57:55.536733573 +0000
-@@ -152,8 +152,10 @@ if(build)
+@@ -152,8 +152,12 @@ if(build)
       
      if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_LESS "5.6")
        target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommon vtkWidgets vtkHybrid vtkFiltering vtkRendering ${OPENGL_LIBRARIES})
 -    else()
 +    elseif(${VTK_MAJOR_VERSION} LESS 6)
        target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommon vtkWidgets vtkHybrid vtkCharts vtkFiltering vtkRendering ${OPENGL_LIBRARIES})
-+    else()
++    elseif("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_LESS "6.1")
 +      target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommonCore vtkChartsCore vtkInteractionStyle vtkImagingSources vtkRenderingCore vtkRenderingContext2D vtkRenderingAnnotation vtkRenderingLOD vtkRenderingVolume vtkRenderingOpenGL vtkRenderingVolumeOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionWidgets vtkFiltersStatistics vtkFiltersStatisticsGnuR vtkViewsContext2D ${OPENGL_LIBRARIES})
++    else()
++      target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommonCore vtkChartsCore vtkInteractionStyle vtkImagingSources vtkRenderingCore vtkRenderingContext2D vtkRenderingAnnotation vtkRenderingLOD vtkRenderingVolume vtkRenderingOpenGL vtkRenderingVolumeOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkRenderingFreeTypeFontConfig vtkRenderingMatplotlib vtkInteractionWidgets vtkFiltersStatistics vtkFiltersStatisticsGnuR vtkFiltersExtraction vtkViewsContext2D ${OPENGL_LIBRARIES})
      endif()
  
      set(EXT_DEPS "")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pcl.git/commitdiff/0df594f44ea12b2c7e4524f3b5de935044a34827