From 8c59f763559b1ad24e7e2e88d5e6d4340fba4cd1 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 9 Feb 2014 09:43:04 +0100 Subject: [PATCH] image-common: updating to 1.11.1 The version 1.11.1 contains the local patch for CATKIN_ENABLE_TESTING, and hence the local patch can be removed. --- ...b => camera-calibration-parsers_1.11.1.bb} | 0 ...0001-check-for-CATKIN_ENABLE_TESTING.patch | 50 ------------------- ....11.0.bb => camera-info-manager_1.11.1.bb} | 2 - recipes-ros/image-common/image-common.inc | 4 +- ...rt_1.11.0.bb => image-transport_1.11.1.bb} | 0 ...mera_1.11.0.bb => polled-camera_1.11.1.bb} | 0 6 files changed, 2 insertions(+), 54 deletions(-) rename recipes-ros/image-common/{camera-calibration-parsers_1.11.0.bb => camera-calibration-parsers_1.11.1.bb} (100%) delete mode 100644 recipes-ros/image-common/camera-info-manager/0001-check-for-CATKIN_ENABLE_TESTING.patch rename recipes-ros/image-common/{camera-info-manager_1.11.0.bb => camera-info-manager_1.11.1.bb} (81%) rename recipes-ros/image-common/{image-transport_1.11.0.bb => image-transport_1.11.1.bb} (100%) rename recipes-ros/image-common/{polled-camera_1.11.0.bb => polled-camera_1.11.1.bb} (100%) diff --git a/recipes-ros/image-common/camera-calibration-parsers_1.11.0.bb b/recipes-ros/image-common/camera-calibration-parsers_1.11.1.bb similarity index 100% rename from recipes-ros/image-common/camera-calibration-parsers_1.11.0.bb rename to recipes-ros/image-common/camera-calibration-parsers_1.11.1.bb diff --git a/recipes-ros/image-common/camera-info-manager/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/image-common/camera-info-manager/0001-check-for-CATKIN_ENABLE_TESTING.patch deleted file mode 100644 index 1ae0e0f..0000000 --- a/recipes-ros/image-common/camera-info-manager/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d5a4a37e0c5eee51f183057b156a4a3ac017070c Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sat, 12 Oct 2013 07:48:25 +0200 -Subject: [PATCH] check for CATKIN_ENABLE_TESTING - ---- - camera_info_manager/CMakeLists.txt | 16 +++++++++------- - camera_info_manager/package.xml | 2 +- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt -index 64009ec..f220861 100644 ---- a/camera_info_manager/CMakeLists.txt -+++ b/camera_info_manager/CMakeLists.txt -@@ -33,10 +33,12 @@ install(DIRECTORY include/${PROJECT_NAME}/ - DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} - ) - --# Unit test uses gtest, but needs rostest to create a ROS environment. --# Hence, it must be created as a normal executable, not using --# catkin_add_gtest() which runs an additional test without rostest. --add_executable(unit_test tests/unit_test.cpp) --target_link_libraries(unit_test ${PROJECT_NAME} ${GTEST_LIBRARIES}) -- --add_rostest(tests/unit_test.test) -+if(CATKIN_ENABLE_TESTING) -+ # Unit test uses gtest, but needs rostest to create a ROS environment. -+ # Hence, it must be created as a normal executable, not using -+ # catkin_add_gtest() which runs an additional test without rostest. -+ add_executable(unit_test tests/unit_test.cpp) -+ target_link_libraries(unit_test ${PROJECT_NAME} ${GTEST_LIBRARIES}) -+ -+ add_rostest(tests/unit_test.test) -+endif() -diff --git a/camera_info_manager/package.xml b/camera_info_manager/package.xml -index 4343e02..9aadd6b 100644 ---- a/camera_info_manager/package.xml -+++ b/camera_info_manager/package.xml -@@ -18,7 +18,7 @@ - https://github.com/ros-perception/image_common/issues - https://github.com/ros-perception/image_common - -- catkin -+ catkin - - boost - camera_calibration_parsers --- -1.8.1.2 - diff --git a/recipes-ros/image-common/camera-info-manager_1.11.0.bb b/recipes-ros/image-common/camera-info-manager_1.11.1.bb similarity index 81% rename from recipes-ros/image-common/camera-info-manager_1.11.0.bb rename to recipes-ros/image-common/camera-info-manager_1.11.1.bb index 8c2934b..448cff4 100644 --- a/recipes-ros/image-common/camera-info-manager_1.11.0.bb +++ b/recipes-ros/image-common/camera-info-manager_1.11.1.bb @@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9de DEPENDS = "boost camera-calibration-parsers image-transport roscpp roslib rostest sensor-msgs" require image-common.inc - -SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2" diff --git a/recipes-ros/image-common/image-common.inc b/recipes-ros/image-common/image-common.inc index 4eb2cc7..390181e 100644 --- a/recipes-ros/image-common/image-common.inc +++ b/recipes-ros/image-common/image-common.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "72dc5897c021987cca04756cbf3ddc27" -SRC_URI[sha256sum] = "022f3c81ade13e644cf7f3c96712a362dc668f2edf37c125f3b9411818eb294a" +SRC_URI[md5sum] = "4339a2bc7a7fca8dad6b6c0d7796204d" +SRC_URI[sha256sum] = "bcce381f5525fe4185b08c23cbf4f1ddf2bc86263cdb53a7938c6dbf596d8ecc" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/image-common/image-transport_1.11.0.bb b/recipes-ros/image-common/image-transport_1.11.1.bb similarity index 100% rename from recipes-ros/image-common/image-transport_1.11.0.bb rename to recipes-ros/image-common/image-transport_1.11.1.bb diff --git a/recipes-ros/image-common/polled-camera_1.11.0.bb b/recipes-ros/image-common/polled-camera_1.11.1.bb similarity index 100% rename from recipes-ros/image-common/polled-camera_1.11.0.bb rename to recipes-ros/image-common/polled-camera_1.11.1.bb