From 7d5d5bfb25baf9828fe217fab3eb8e1b9573ed0d Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 2 May 2015 08:52:28 +0200
Subject: [PATCH] laser-assembler: updating to 1.7.3
Due to the update, this commit also drops the upstream patch.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
...CMakeLists-optional-ros-rosdistro-30.patch | 36 -------------------
...bler_1.7.2.bb => laser-assembler_1.7.3.bb} | 6 ++--
2 files changed, 2 insertions(+), 40 deletions(-)
delete mode 100644 recipes-ros/laser-assembler/laser-assembler/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
rename recipes-ros/laser-assembler/{laser-assembler_1.7.2.bb => laser-assembler_1.7.3.bb} (68%)
diff --git a/recipes-ros/laser-assembler/laser-assembler/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/laser-assembler/laser-assembler/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
deleted file mode 100644
index f7b23b4..0000000
--- a/recipes-ros/laser-assembler/laser-assembler/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a4404ea5ee0f4fb192c5765ee4dce6a265a70ec9 Mon Sep 17 00:00:00 2001
-From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Sun, 27 Jul 2014 09:58:36 +0200
-Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
-
-Upstream-Status: Accepted
----
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ad9dbc..7309f3d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,8 +10,7 @@ tf sensor_msgs message_filters roscpp laser_geometry filters)
-
- find_package(catkin REQUIRED COMPONENTS
- ${THIS_PACKAGE_ROS_DEPS}
-- message_generation
-- rostest)
-+ message_generation)
- find_package(Boost REQUIRED COMPONENTS system signals)
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-
-@@ -68,6 +67,8 @@ add_dependencies(point_cloud2_assembler ${PROJECT_NAME}_gencpp)
- ## unit testing
-
- if(CATKIN_ENABLE_TESTING)
-+ find_package(rostest)
-+
- add_executable(periodic_snapshotter examples/periodic_snapshotter.cpp)
- target_link_libraries(periodic_snapshotter ${catkin_LIBRARIES} ${Boost_LIBRARIES})
- add_dependencies(periodic_snapshotter ${PROJECT_NAME}_gencpp)
---
-1.9.1
-
diff --git a/recipes-ros/laser-assembler/laser-assembler_1.7.2.bb b/recipes-ros/laser-assembler/laser-assembler_1.7.3.bb
similarity index 68%
rename from recipes-ros/laser-assembler/laser-assembler_1.7.2.bb
rename to recipes-ros/laser-assembler/laser-assembler_1.7.3.bb
index b181a54..ef11e0a 100644
--- a/recipes-ros/laser-assembler/laser-assembler_1.7.2.bb
+++ b/recipes-ros/laser-assembler/laser-assembler_1.7.3.bb
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9de
DEPENDS = "message-generation sensor-msgs message-filters tf roscpp filters laser-geometry pluginlib"
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "1e0fe2d0b5fb26eca1e9137d64767419"
-SRC_URI[sha256sum] = "de6637a229d84d6215dc0176ea05bc40c2eb2d8dec8ca520c4a29822f089e74a"
-
-SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch"
+SRC_URI[md5sum] = "f9a368c1ec64c47c3539ad2eb58e95e2"
+SRC_URI[sha256sum] = "11c01b45917f9b9f24d19b38e8d32046da4f6deae479812b2326b7deb2a624f4"
S = "${WORKDIR}/${ROS_SP}"
--
GitLab