[mrpt] Update to release 1.0.2
rmattes
rmattes at fedoraproject.org
Sun Sep 8 17:29:19 UTC 2013
commit 9f5d99218ded63b215f74b4dae41e2cbad7ce888
Author: Rich Mattes <richmattes at gmail.com>
Date: Sun Sep 8 13:28:07 2013 -0400
Update to release 1.0.2
- Re-enable tbb on ARM
mrpt-1.0.2-gtest.patch | 10 ++++++++++
mrpt-1.0.2-pcl.patch | 38 ++++++++++++++++++++++++++++++++++++++
mrpt.spec | 23 ++++++++++++++++++-----
sources | 2 +-
4 files changed, 67 insertions(+), 6 deletions(-)
---
diff --git a/mrpt-1.0.2-gtest.patch b/mrpt-1.0.2-gtest.patch
new file mode 100644
index 0000000..656bd41
--- /dev/null
+++ b/mrpt-1.0.2-gtest.patch
@@ -0,0 +1,10 @@
+diff -up ./cmakemodules/script_gtest.cmake.gtest ./cmakemodules/script_gtest.cmake
+--- ./cmakemodules/script_gtest.cmake.gtest 2013-08-30 22:56:53.238145451 +0000
++++ ./cmakemodules/script_gtest.cmake 2013-08-30 22:58:07.175687297 +0000
+@@ -1,4 +1,4 @@
+ # By default, use embedded version of gtest:
+ SET(CMAKE_MRPT_HAS_GTEST 1)
+-SET(CMAKE_MRPT_HAS_GTEST_SYSTEM 0)
+-SET(CMAKE_MRPT_GTEST_SRC_DIR "${MRPT_SOURCE_DIR}/otherlibs/gtest-1.6.0")
++SET(CMAKE_MRPT_HAS_GTEST_SYSTEM 1)
++SET(CMAKE_MRPT_GTEST_SRC_DIR "")
diff --git a/mrpt-1.0.2-pcl.patch b/mrpt-1.0.2-pcl.patch
new file mode 100644
index 0000000..4a9ef0a
--- /dev/null
+++ b/mrpt-1.0.2-pcl.patch
@@ -0,0 +1,38 @@
+diff -up ./cmakemodules/script_pcl.cmake.pcl ./cmakemodules/script_pcl.cmake
+--- ./cmakemodules/script_pcl.cmake.pcl 2013-09-08 16:43:49.006805758 +0000
++++ ./cmakemodules/script_pcl.cmake 2013-09-08 16:46:00.318251141 +0000
+@@ -19,8 +19,8 @@ IF(NOT DISABLE_PCL)
+
+ INCLUDE_DIRECTORIES(${PCL_INCLUDE_DIRS})
+ link_directories(${PCL_LIBRARY_DIRS})
+- add_definitions(${PCL_DEFINITIONS})
+-
++ #add_definitions(${PCL_DEFINITIONS})
++ add_definitions(-DEIGEN_USE_NEW_STDVECTOR -DEIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET)
+ IF (NOT Boost_FOUND)
+ MESSAGE("*MRPT ERROR MESSAGE*: PCL requires Boost. Either disable PCL (with DISABLE_PCL=ON) or, to fix the error, create the entries BOOST_ROOT and BOOST_LIBRARYDIR and set them to the correct values")
+ ENDIF (NOT Boost_FOUND)
+diff -up ./libs/opengl/CMakeLists.txt.pcl ./libs/opengl/CMakeLists.txt
+--- ./libs/opengl/CMakeLists.txt.pcl 2012-07-06 14:34:48.000000000 +0000
++++ ./libs/opengl/CMakeLists.txt 2013-09-08 16:42:30.250012627 +0000
+@@ -29,7 +29,7 @@ ENDIF(WIN32)
+
+ # Glext headers only (for Windows)
+ INCLUDE_DIRECTORIES("${MRPT_SOURCE_DIR}/libs/opengl/src/glext")
+-
++include_directories(${PCL_INCLUDE_DIRS})
+
+ #---------------------------------------------
+ # Macro declared in "DeclareMRPTLib.cmake":
+diff -up ./libs/pbmap/CMakeLists.txt.pcl ./libs/pbmap/CMakeLists.txt
+--- ./libs/pbmap/CMakeLists.txt.pcl 2013-02-27 18:08:17.000000000 +0000
++++ ./libs/pbmap/CMakeLists.txt 2013-09-08 16:42:30.250012627 +0000
+@@ -15,6 +15,8 @@ define_mrpt_lib(
+
+ IF(BUILD_mrpt-pbmap)
+ target_link_libraries(mrpt-pbmap ${PCL_LIBRARIES})
++ include_directories(${PCL_INCLUDE_DIRS})
++ message(STATUS "PCL Iincludes: ${PCL_INCLUDE_DIRS}")
+ ENDIF(BUILD_mrpt-pbmap)
+
+
diff --git a/mrpt.spec b/mrpt.spec
index 80b46c3..febcf66 100644
--- a/mrpt.spec
+++ b/mrpt.spec
@@ -1,7 +1,7 @@
Summary: Libraries and programs for mobile robot SLAM and navigation
Name: mrpt
-Version: 1.0.1
-Release: 5%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
License: BSD
Group: Development/Libraries
URL: http://www.mrpt.org/
@@ -22,7 +22,10 @@ Patch3: mrpt-1.0.0-systemdeps.patch
# Fixes error:
# error: the type 'dirs' is not supported for the entry tag within a navindex! Check your layout file!
Patch4: mrpt-0.9.6-doxygen.patch
-
+# Fixes build issue related to include paths for pcl
+Patch5: mrpt-1.0.2-pcl.patch
+# Disable use of internal gtest
+Patch6: mrpt-1.0.2-gtest.patch
BuildRequires: cmake
BuildRequires: wxGTK-devel, opencv-devel, freeglut-devel, lib3ds-devel
BuildRequires: boost-devel
@@ -32,8 +35,6 @@ BuildRequires: tex(latex), tex(dvips)
%ifnarch s390 s390x
BuildRequires: libdc1394-devel
BuildRequires: pcl-devel
-%endif
-%ifnarch s390 s390x %{arm}
BuildRequires: tbb-devel
%endif
BuildRequires: libfreenect-devel
@@ -274,6 +275,8 @@ with Doxygen.
%patch2 -p0 -b .eigen306
%patch3 -p0 -b .systemdeps
%patch4 -p0 -b .doxygen
+%patch5 -p1 -b .pcl
+%patch6 -p0 -b .gtest
# Fix encoding of the mrpt-book file
#gzip -d doc/mrpt-book.ps.gz
@@ -300,10 +303,14 @@ cd build
-DPHIDGET_LIB_DIR=%{_libdir} \
-DMRPT_HAS_TBB=ON \
-DTBB_LIB_DIR=%{_libdir} \
+ -DMRPT_AUTODETECT_SSE=OFF \
+ -DDISABLE_SSE4=ON \
-DDISABLE_SSE3=ON \
%ifnarch x86_64
-DDISABLE_SSE2=ON \
%endif
+ -DBOOST_ROOT=/usr \
+ -DBOOST_LIBRARYDIR=%{_libdir} \
-DMRPT_OPTIMIZE_NATIVE=OFF \
-DCMAKE_BUILD_TYPE=None \
-DEIGEN_USE_EMBEDDED_VERSION=OFF \
@@ -311,6 +318,8 @@ cd build
-DBUILD_ARIA=OFF \
-DBUILD_XSENS=OFF \
-DDISABLE_SIFT_HESS=ON \
+ -DPCL_FIND_QUIETLY=OFF \
+ -DBUILD_TESTING=OFF \
..
make VERBOSE=1 -j 3
@@ -480,6 +489,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Sun Sep 08 2013 Rich Mattes <richmattes at gmail.com> - 1.0.2-1
+- Update to release 1.0.2
+- Re-enable tbb on ARM
+
* Sun Aug 4 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.0.1-5
- Modernise SPEC
- exclude tbb build dep on ARM (not currently available)
diff --git a/sources b/sources
index 901f126..b50141d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf39ba6541a53dcfc36d3913ea165341 mrpt-1.0.1-fedora.tar.xz
+59ef96c504c829bfdb9339f3b8301046 mrpt-1.0.2-fedora.tar.xz
More information about the scm-commits
mailing list