commit 6448c80180c8ccbfcd6180e15814649ebf8826bc Author: Arkadiusz Miśkiewicz <ar...@maven.pl> Date: Tue Nov 11 01:44:51 2014 +0100
- builds for me pcl-fz_api.patch | 11 +++++----- pcl-tawara.patch | 61 +++++++++++++++++++++++++++++++++++++++++--------------- pcl.spec | 20 +++++++++++-------- 3 files changed, 63 insertions(+), 29 deletions(-) --- diff --git a/pcl.spec b/pcl.spec index 8bcb524..44aa784 100644 --- a/pcl.spec +++ b/pcl.spec @@ -118,19 +118,15 @@ cd build -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 @@ -146,17 +142,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 @@ -171,6 +173,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 @@ -328,6 +331,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 diff --git a/pcl-fz_api.patch b/pcl-fz_api.patch index fff59c3..0d0ff83 100644 --- a/pcl-fz_api.patch +++ b/pcl-fz_api.patch @@ -1,6 +1,7 @@ ---- pcl-pcl-1.7.0/cmake/Modules/FindFZAPI.cmake.orig 2013-07-23 19:21:02.000000000 +0200 -+++ pcl-pcl-1.7.0/cmake/Modules/FindFZAPI.cmake 2013-09-19 21:29:44.661957271 +0200 -@@ -17,7 +17,7 @@ +diff -urN pcl-pcl-1.7.2.org/cmake/Modules/FindFZAPI.cmake pcl-pcl-1.7.2/cmake/Modules/FindFZAPI.cmake +--- pcl-pcl-1.7.2.org/cmake/Modules/FindFZAPI.cmake 2014-09-10 23:22:57.000000000 +0200 ++++ pcl-pcl-1.7.2/cmake/Modules/FindFZAPI.cmake 2014-11-07 15:22:34.406580761 +0100 +@@ -13,7 +13,7 @@ DOC "Fotonic include directories") # Find libraries @@ -9,10 +10,10 @@ HINTS "${FZ_API_DIR}/Release" NO_DEFAULT_PATH DOC "Fotonic libraries") else() -@@ -30,4 +30,4 @@ +@@ -23,4 +23,4 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FZAPI DEFAULT_MSG FZAPI_LIBS FZAPI_INCLUDE_DIR) - -\ Brak znaku nowej linii na ko�cu pliku +\ Brak znaku nowej linii na końcu pliku + diff --git a/pcl-tawara.patch b/pcl-tawara.patch index 207b964..c352860 100644 --- a/pcl-tawara.patch +++ b/pcl-tawara.patch @@ -1,6 +1,7 @@ ---- pcl-pcl-1.7.0/tools/CMakeLists.txt.orig 2013-09-15 20:30:42.553276043 +0200 -+++ pcl-pcl-1.7.0/tools/CMakeLists.txt 2013-09-19 21:27:13.421963621 +0200 -@@ -230,14 +230,14 @@ +diff -urN pcl-pcl-1.7.2.org/tools/CMakeLists.txt pcl-pcl-1.7.2/tools/CMakeLists.txt +--- pcl-pcl-1.7.2.org/tools/CMakeLists.txt 2014-09-10 23:22:57.000000000 +0200 ++++ pcl-pcl-1.7.2/tools/CMakeLists.txt 2014-11-07 15:21:20.377848947 +0100 +@@ -253,14 +253,14 @@ PCL_ADD_EXECUTABLE (pcl_transform_from_viewpoint "${SUBSYS_NAME}" transform_from_viewpoint.cpp) target_link_libraries (pcl_transform_from_viewpoint pcl_common pcl_io pcl_registration) @@ -8,7 +9,7 @@ - if(Tide_FOUND) - include_directories(${Tide_INCLUDE_DIRS}) - add_definitions(${Tide_DEFINITIONS}) -+ find_package(tawara) ++ find_package(tawara QUIET) + if(Tawara_FOUND) + include_directories(${Tawara_INCLUDE_DIRS}) + add_definitions(${Tawara_DEFINITIONS}) @@ -21,8 +22,9 @@ endif (BUILD_tools) ---- pcl-pcl-1.7.0/tools/pcl_video.cpp.orig 2013-07-23 19:21:02.000000000 +0200 -+++ pcl-pcl-1.7.0/tools/pcl_video.cpp 2013-09-19 21:29:01.191959097 +0200 +diff -urN pcl-pcl-1.7.2.org/tools/pcl_video.cpp pcl-pcl-1.7.2/tools/pcl_video.cpp +--- pcl-pcl-1.7.2.org/tools/pcl_video.cpp 2014-09-10 23:22:57.000000000 +0200 ++++ pcl-pcl-1.7.2/tools/pcl_video.cpp 2014-11-07 15:21:20.377848947 +0100 @@ -36,13 +36,13 @@ #include <iostream> @@ -68,11 +70,13 @@ cltr_offset.total_microseconds() / 10000)); cluster_->write(stream_); } -@@ -116,13 +116,13 @@ +@@ -115,14 +115,14 @@ + int Run() { // Write the EBML PCLHeader. This specifies that the file is an EBML - // file, and is a Tide document. +- // file, and is a Tide document. - tide::EBMLElement ebml_el; ++ // file, and is a Tawara document. + tawara::EBMLElement ebml_el; ebml_el.write(stream_); @@ -84,7 +88,23 @@ segment.write(stream_); // Set up the segment information so it can be used while writing tracks // and clusters. -@@ -153,11 +153,11 @@ +@@ -136,7 +136,7 @@ + segment.info.filename(filename_); + // The segment's timecode scale is possibly the most important value in the + // segment meta-data data. Without it, timely playback of frames is not +- // possible. It has a sensible default (defined in the Tide specification), ++ // possible. It has a sensible default (defined in the Tawara specification), + // but here we set it to ten milliseconds for demonstrative purposes. + segment.info.timecode_scale(10000000); + // The segment's date should be set. It is the somewhat-awkward value of +@@ -148,16 +148,16 @@ + segment.info.date(td.total_microseconds() * 1000); + // Let's give the segment an inspirational title. + segment.info.title(title_); +- // It sometimes helps to know what created a Tide file. +- segment.info.muxing_app("libtide-0.1"); ++ // It sometimes helps to know what created a Tawara file. ++ segment.info.muxing_app("libtawara-0.1"); segment.info.writing_app("pcl_video"); // Set up the tracks meta-data and write it to the file. @@ -125,9 +145,12 @@ bpt::ptime seg_start_; bpt::ptime cltr_start_; unsigned int count_; -@@ -247,26 +247,26 @@ +@@ -245,30 +245,30 @@ + int Run() + { // Open the file and check for the EBML header. This confirms that the file - // is an EBML file, and is a Tide document. +- // is an EBML file, and is a Tide document. ++ // is an EBML file, and is a Tawara document. std::ifstream stream(filename_, std::ios::in); - tide::ids::ReadResult id = tide::ids::read(stream); - if (id.first != tide::ids::EBML) @@ -143,21 +166,26 @@ - if (ebml_el.doc_type() != tide::TideDocType) + if (ebml_el.doc_type() != tawara::TawaraDocType) { - std::cerr << "Specified EBML file is not a Tide document.\n"; +- std::cerr << "Specified EBML file is not a Tide document.\n"; ++ std::cerr << "Specified EBML file is not a Tawara document.\n"; return 1; } - if (ebml_el.read_version() > tide::TideEBMLVersion) + if (ebml_el.read_version() > tawara::TawaraEBMLVersion) { - std::cerr << "This Tide document requires read version " << +- std::cerr << "This Tide document requires read version " << ++ std::cerr << "This Tawara document requires read version " << ebml_el.read_version() << ".\n"; return 1; } - if (ebml_el.doc_read_version() > tide::TideVersionMajor) + if (ebml_el.doc_read_version() > tawara::TawaraVersionMajor) { - std::cerr << "This Tide document requires doc read version " << +- std::cerr << "This Tide document requires doc read version " << ++ std::cerr << "This Tawara document requires doc read version " << ebml_el.read_version() << ".\n"; + return 1; + } @@ -278,13 +278,13 @@ // and read (or build, if necessary) an index of the level 1 elements. With // this index, we will be able to quickly jump to important elements such @@ -236,12 +264,13 @@ count_(0) { } -@@ -246,7 +248,7 @@ +@@ -248,7 +248,7 @@ class Player { // Open the file and check for the EBML header. This confirms that the file - // is an EBML file, and is a Tide document. + // is an EBML file, and is a Tawara document. - std::ifstream stream(filename_, std::ios::in); + std::ifstream stream(filename_.c_str(), std::ios::in); tawara::ids::ReadResult id = tawara::ids::read(stream); if (id.first != tawara::ids::EBML) { + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pcl.git/commitdiff/6448c80180c8ccbfcd6180e15814649ebf8826bc _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit