[player/f18] Added dependency on hokuyoaist library
rmattes
rmattes at fedoraproject.org
Mon Aug 13 01:00:42 UTC 2012
commit a1e863d733b9d8fdde885e22aed2853c4ef23c42
Author: Rich Mattes <richmattes at gmail.com>
Date: Sun Aug 12 19:09:03 2012 -0400
Added dependency on hokuyoaist library
- Added dependency on flexiport library
- Fixed hokuyoaist driver to work with hokuyoaist library
- Removed gearbox dependency
- Updated for boost-1.5.0
player-3.0.2.boost150.patch | 61 +++++++++++++++++++++++++++++++++++++++++++
player-3.0.2.gbx10.patch | 16 ++++++-----
player.spec | 3 ++
3 files changed, 73 insertions(+), 7 deletions(-)
---
diff --git a/player-3.0.2.boost150.patch b/player-3.0.2.boost150.patch
new file mode 100644
index 0000000..b7d7bb7
--- /dev/null
+++ b/player-3.0.2.boost150.patch
@@ -0,0 +1,61 @@
+diff -up ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt.boost150 ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt
+--- ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt.boost150 2009-08-03 23:48:04.000000000 -0400
++++ ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt 2012-08-12 18:42:46.656436126 -0400
+@@ -24,7 +24,7 @@ IF (BUILD_PLAYERCC)
+ # Look for Boost libraries
+ IF (BUILD_PLAYERCC_BOOST)
+ # There is a new, much better, FindBoost.cmake in 2.6
+- IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
++ IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
+ OPTION (Boost_USE_STATIC_LIBS "Use the static versions of the Boost libraries" OFF)
+ MARK_AS_ADVANCED (Boost_USE_STATIC_LIBS)
+ OPTION (USE_BOOST_THREAD "Use the Boost threading library" ON)
+@@ -33,7 +33,7 @@ IF (BUILD_PLAYERCC)
+ MARK_AS_ADVANCED (USE_BOOST_SIGNALS)
+
+ IF (USE_BOOST_THREAD)
+- SET (BOOST_COMPONENTS thread)
++ SET (BOOST_COMPONENTS thread system)
+ ELSE (USE_BOOST_THREAD)
+ SET (HAVE_BOOST_THREAD FALSE CACHE INTERNAL "Is the Boost::Thread library present")
+ ENDIF (USE_BOOST_THREAD)
+@@ -61,6 +61,21 @@ IF (BUILD_PLAYERCC)
+ "Boost::Thread library not found, support will not be included.")
+ ENDIF (Boost_THREAD_FOUND)
+
++ IF (Boost_SYSTEM_FOUND)
++ GET_FILENAME_COMPONENT (boostSystemLib ${Boost_SYSTEM_LIBRARY} NAME_WE CACHE)
++ # Chop off the lib at the front, too, if present
++ STRING (REGEX REPLACE "^lib" "" boostSystemLib ${boostSystemLib})
++ PLAYERCC_ADD_LINK_LIB (${boostSystemLib})
++ SET (boostIncludeDir ${Boost_INCLUDE_DIR})
++ SET (HAVE_BOOST_SYSTEM TRUE CACHE INTERNAL "Is the Boost::System library present")
++ MESSAGE (STATUS
++ "PlayerC++ client library will be built with Boost::System support.")
++ ELSE (Boost_SYSTEM_FOUND)
++ MESSAGE (STATUS
++ "Boost::System library not found, support will not be included.")
++ ENDIF (Boost_SYSTEM_FOUND)
++
++
+ IF (Boost_SIGNALS_FOUND)
+ GET_FILENAME_COMPONENT (boostSignalsLib ${Boost_SIGNALS_LIBRARY} NAME_WE CACHE)
+ STRING (REGEX REPLACE "^lib" "" boostSignalsLib ${boostSignalsLib})
+@@ -78,7 +93,7 @@ IF (BUILD_PLAYERCC)
+ "Boost libraries were not found. Boost::Signals and Boost::Thread support
+ will not be included in PlayerC++.")
+ ENDIF (Boost_FOUND)
+- ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
++ ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
+ FIND_PACKAGE (Boost)
+ IF (Boost_FOUND)
+ # For 2.4, assume that if boost is found then both signals and threads are present
+@@ -146,7 +161,7 @@ IF (BUILD_PLAYERCC)
+ "Boost libraries were not found. Boost::Signals and Boost::Thread support
+ will not be included in PlayerC++.")
+ ENDIF (Boost_FOUND)
+- ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
++ ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
+ ELSE (BUILD_PLAYERCC_BOOST)
+ MESSAGE (STATUS
+ "Boost support disabled. Boost::Signals and Boost::Thread support will not be
diff --git a/player-3.0.2.gbx10.patch b/player-3.0.2.gbx10.patch
index f13482c..10fd65e 100644
--- a/player-3.0.2.gbx10.patch
+++ b/player-3.0.2.gbx10.patch
@@ -1,6 +1,6 @@
diff -up ./player-3.0.2/server/drivers/gps/gbxgarminacfr.cc.gbx10 ./player-3.0.2/server/drivers/gps/gbxgarminacfr.cc
--- ./player-3.0.2/server/drivers/gps/gbxgarminacfr.cc.gbx10 2010-06-28 00:12:42.000000000 -0400
-+++ ./player-3.0.2/server/drivers/gps/gbxgarminacfr.cc 2012-08-05 11:58:18.920031468 -0400
++++ ./player-3.0.2/server/drivers/gps/gbxgarminacfr.cc 2012-08-12 18:52:11.860249699 -0400
@@ -44,7 +44,8 @@ should include most GPS devices that use
@par Provides
@@ -37,7 +37,7 @@ diff -up ./player-3.0.2/server/drivers/gps/gbxgarminacfr.cc.gbx10 ./player-3.0.2
diff -up ./player-3.0.2/server/drivers/opaque/CMakeLists.txt.gbx10 ./player-3.0.2/server/drivers/opaque/CMakeLists.txt
--- ./player-3.0.2/server/drivers/opaque/CMakeLists.txt.gbx10 2010-06-28 00:12:42.000000000 -0400
-+++ ./player-3.0.2/server/drivers/opaque/CMakeLists.txt 2012-08-05 11:58:18.921031504 -0400
++++ ./player-3.0.2/server/drivers/opaque/CMakeLists.txt 2012-08-12 18:52:11.860249699 -0400
@@ -1,6 +1,6 @@
PLAYERDRIVER_OPTION (flexiport build_flexiport ON)
PLAYERDRIVER_REQUIRE_PKG (flexiport build_flexiport flexiport flexiport_includeDirs
@@ -48,7 +48,7 @@ diff -up ./player-3.0.2/server/drivers/opaque/CMakeLists.txt.gbx10 ./player-3.0.
LINKLIBS ${flexiport_linkLibs} LINKFLAGS ${flexiport_linkFlags} CFLAGS ${flexiport_cFlags}
diff -up ./player-3.0.2/server/drivers/opaque/flexiport.cc.gbx10 ./player-3.0.2/server/drivers/opaque/flexiport.cc
--- ./player-3.0.2/server/drivers/opaque/flexiport.cc.gbx10 2009-01-24 18:14:21.000000000 -0500
-+++ ./player-3.0.2/server/drivers/opaque/flexiport.cc 2012-08-05 11:58:18.921031504 -0400
++++ ./player-3.0.2/server/drivers/opaque/flexiport.cc 2012-08-12 18:52:11.860249699 -0400
@@ -88,7 +88,7 @@ driver
#include <flexiport/flexiport.h>
#include <flexiport/port.h>
@@ -60,7 +60,7 @@ diff -up ./player-3.0.2/server/drivers/opaque/flexiport.cc.gbx10 ./player-3.0.2/
////////////////////////////////////////////////////////////////////////////////////////////////////
diff -up ./player-3.0.2/server/drivers/ranger/CMakeLists.txt.gbx10 ./player-3.0.2/server/drivers/ranger/CMakeLists.txt
--- ./player-3.0.2/server/drivers/ranger/CMakeLists.txt.gbx10 2009-12-15 19:51:26.000000000 -0500
-+++ ./player-3.0.2/server/drivers/ranger/CMakeLists.txt 2012-08-05 11:58:18.921031504 -0400
++++ ./player-3.0.2/server/drivers/ranger/CMakeLists.txt 2012-08-12 18:52:11.860249699 -0400
@@ -7,14 +7,14 @@ PLAYERDRIVER_ADD_DRIVER (gbxsickacfr bui
LINKLIBS ${gbxsickacfr_linkLibs} LINKFLAGS ${gbxsickacfr_linkFlags}
CFLAGS ${gbxsickacfr_cFlags} SOURCES gbxsickacfr.cc)
@@ -86,7 +86,7 @@ diff -up ./player-3.0.2/server/drivers/ranger/CMakeLists.txt.gbx10 ./player-3.0.
PLAYERDRIVER_ADD_DRIVER (lasertoranger build_lasertoranger SOURCES toranger.cc lasertoranger.cc)
diff -up ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc.gbx10 ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc
--- ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc.gbx10 2009-09-06 22:04:21.000000000 -0400
-+++ ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc 2012-08-05 12:04:35.255599367 -0400
++++ ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc 2012-08-12 18:59:12.308477434 -0400
@@ -17,25 +17,25 @@
*/
@@ -173,7 +173,7 @@ diff -up ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc.gbx10 ./player-3.0.
#include <libplayercore/playercore.h>
const int DEFAULT_BAUDRATE = 19200;
-@@ -144,559 +148,644 @@ const bool DEFAULT_TIMESTAMPS = false;
+@@ -144,559 +148,646 @@ const bool DEFAULT_TIMESTAMPS = false;
class HokuyoDriver : public ThreadedDriver
{
@@ -547,7 +547,7 @@ diff -up ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc.gbx10 ./player-3.0.
+ //try
+ //{
+ // Change the baud rate
-+ device_.set_baud(req->value);
++ // device_.set_baud(req->value);
+ //}
+ //catch(hokuyoaist::NotSerialError)
+ //{
@@ -557,6 +557,7 @@ diff -up ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc.gbx10 ./player-3.0.
+ PLAYER_SET_INTPROP_REQ, NULL, 0, NULL);
+ return 0;
+ //}
++ /*
+ catch(hokuyoaist::BaseError &e)
+ {
+ PLAYER_ERROR1("HokuyoAIST: Error while changing baud rate: %s",
@@ -567,6 +568,7 @@ diff -up ./player-3.0.2/server/drivers/ranger/hokuyo_aist.cc.gbx10 ./player-3.0.
+ PLAYER_SET_INTPROP_REQ, NULL, 0, NULL);
+ return 0;
+ }
++ */
+ baudRate_.SetValueFromMessage(data);
+ Publish(device_addr, resp_queue, PLAYER_MSGTYPE_RESP_ACK,
+ PLAYER_SET_INTPROP_REQ, NULL, 0, NULL);
diff --git a/player.spec b/player.spec
index 8e42fd3..64458b8 100644
--- a/player.spec
+++ b/player.spec
@@ -20,6 +20,7 @@ Patch5: %{name}-3.0.2.s390x.patch
Patch6: %{name}-3.0.2.boostutc.patch
Patch7: %{name}-3.0.2.gzfile.patch
Patch8: %{name}-3.0.2.gbx10.patch
+Patch9: %{name}-3.0.2.boost150.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Sort order: build tools, feature libs, within alphabetically, group related
@@ -139,6 +140,7 @@ are experimental.
%patch6 -p0
%patch7 -p0
%patch8 -p2 -b .gbx10
+%patch9 -p2 -b .boost150
find . -name '*.c' -exec chmod -x {} \;
find . -name '*.cc' -exec chmod -x {} \;
find . -name '*.cpp' -exec chmod -x {} \;
@@ -226,6 +228,7 @@ rm -rf $RPM_BUILD_ROOT
- Added dependency on flexiport library
- Fixed hokuyoaist driver to work with hokuyoaist library
- Removed gearbox dependency
+- Updated for boost-1.5.0
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list