[fawkes/f18] Fixed include path for new hokuyoaist
rmattes
rmattes at fedoraproject.org
Tue Aug 14 21:56:53 UTC 2012
commit 08c366164bee7915fe7eb05388d993a6348b74fa
Author: Rich Mattes <richmattes at gmail.com>
Date: Mon Aug 13 23:09:57 2012 -0400
Fixed include path for new hokuyoaist
fawkes-0.4.2-gbx10.patch | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/fawkes-0.4.2-gbx10.patch b/fawkes-0.4.2-gbx10.patch
index 4c7f7c7..ac39fcf 100644
--- a/fawkes-0.4.2-gbx10.patch
+++ b/fawkes-0.4.2-gbx10.patch
@@ -1,6 +1,6 @@
diff -up ./fawkes-0.4.2/src/plugins/laser/laser.mk.gbx10 ./fawkes-0.4.2/src/plugins/laser/laser.mk
---- ./fawkes-0.4.2/src/plugins/laser/laser.mk.gbx10 2012-08-05 11:48:49.128372139 -0400
-+++ ./fawkes-0.4.2/src/plugins/laser/laser.mk 2012-08-05 11:49:10.289100309 -0400
+--- ./fawkes-0.4.2/src/plugins/laser/laser.mk.gbx10 2011-02-19 17:24:55.000000000 -0500
++++ ./fawkes-0.4.2/src/plugins/laser/laser.mk 2012-08-13 23:05:16.653699334 -0400
@@ -31,9 +31,9 @@ else
endif
@@ -14,3 +14,15 @@ diff -up ./fawkes-0.4.2/src/plugins/laser/laser.mk.gbx10 ./fawkes-0.4.2/src/plug
+ LDFLAGS_URG_GBX = $(shell $(PKGCONFIG) --libs 'flexiport' 'hokuyoaist')
endif
+diff -up ./fawkes-0.4.2/src/plugins/laser/urg_gbx_aqt.cpp.gbx10 ./fawkes-0.4.2/src/plugins/laser/urg_gbx_aqt.cpp
+--- ./fawkes-0.4.2/src/plugins/laser/urg_gbx_aqt.cpp.gbx10 2012-08-13 23:06:44.461874363 -0400
++++ ./fawkes-0.4.2/src/plugins/laser/urg_gbx_aqt.cpp 2012-08-13 23:07:40.906914631 -0400
+@@ -24,7 +24,7 @@
+
+ #include <core/threading/mutex.h>
+
+-#include <hokuyo_aist/hokuyo_aist.h>
++#include <hokuyoaist/hokuyo_aist.h>
+ #include <flexiport/flexiport.h>
+
+ #include <memory>
More information about the scm-commits
mailing list