From 74c0fb670f19f9a1264dae5a39bb6d54a3657303 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Wed, 22 Nov 2017 05:48:51 +0100 Subject: [PATCH] image-common: updating to 1.11.13 This commit also adjusts the patch file due to the recipe update. Signed-off-by: Lukas Bulwahn --- .../0001-Drop-support-for-python.patch | 33 ++++++++++--------- ... => camera-calibration-parsers_1.11.13.bb} | 2 +- ...1.12.bb => camera-info-manager_1.11.13.bb} | 0 recipes-ros/image-common/image-common.inc | 4 +-- ..._1.11.12.bb => image-transport_1.11.13.bb} | 0 ...ra_1.11.12.bb => polled-camera_1.11.13.bb} | 0 6 files changed, 21 insertions(+), 18 deletions(-) rename recipes-ros/image-common/{camera-calibration-parsers_1.11.12.bb => camera-calibration-parsers_1.11.13.bb} (80%) rename recipes-ros/image-common/{camera-info-manager_1.11.12.bb => camera-info-manager_1.11.13.bb} (100%) rename recipes-ros/image-common/{image-transport_1.11.12.bb => image-transport_1.11.13.bb} (100%) rename recipes-ros/image-common/{polled-camera_1.11.12.bb => polled-camera_1.11.13.bb} (100%) diff --git a/recipes-ros/image-common/camera-calibration-parsers/0001-Drop-support-for-python.patch b/recipes-ros/image-common/camera-calibration-parsers/0001-Drop-support-for-python.patch index 8e289a09f0d..5ae507eb55c 100644 --- a/recipes-ros/image-common/camera-calibration-parsers/0001-Drop-support-for-python.patch +++ b/recipes-ros/image-common/camera-calibration-parsers/0001-Drop-support-for-python.patch @@ -1,20 +1,24 @@ -From ddf9ddefb51502fb21ba01e31187e4ffebc70cce Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov -Date: Mon, 10 Apr 2017 10:35:26 +0300 +From 4227ce0c22e6757db1c66e46b163df7d0ecf1282 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Wed, 22 Nov 2017 13:56:25 +0100 Subject: [PATCH] Drop support for python Upstream-Status: Inappropriate [ROS still supports python2 officially] Signed-off-by: Dmitry Rozhkov + +[I rewrote the patch for the update from 1.11.12 to 1.11.13.] + +Signed-off-by: Lukas Bulwahn --- - CMakeLists.txt | 23 ++--------------------- - 1 file changed, 2 insertions(+), 21 deletions(-) + camera_calibration_parsers/CMakeLists.txt | 22 +--------------------- + 1 file changed, 1 insertion(+), 21 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c21e54a..3a89d94 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,13 +3,8 @@ project(camera_calibration_parsers) +diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt +index b70b853..b0bdf9a 100644 +--- a/camera_calibration_parsers/CMakeLists.txt ++++ b/camera_calibration_parsers/CMakeLists.txt +@@ -3,13 +3,7 @@ project(camera_calibration_parsers) find_package(catkin REQUIRED sensor_msgs rosconsole roscpp roscpp_serialization) @@ -25,12 +29,11 @@ index c21e54a..3a89d94 100644 - find_package(Boost REQUIRED COMPONENTS filesystem python3) -endif() -include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) -+ +include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) catkin_python_setup() -@@ -41,17 +36,7 @@ add_library(${PROJECT_NAME} +@@ -41,17 +35,7 @@ add_library(${PROJECT_NAME} src/parse_yml.cpp ) @@ -38,7 +41,7 @@ index c21e54a..3a89d94 100644 - src/parse_wrapper.cpp) - target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY}) --target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES}) +-target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) - -# Don't prepend wrapper library name with lib and add to Python libs. -set_target_properties(${PROJECT_NAME}_wrapper PROPERTIES @@ -48,7 +51,7 @@ index c21e54a..3a89d94 100644 add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS}) -@@ -74,10 +59,6 @@ install( +@@ -74,10 +58,6 @@ install( DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) @@ -60,5 +63,5 @@ index c21e54a..3a89d94 100644 add_subdirectory(test) endif() -- -2.9.3 +2.7.4 diff --git a/recipes-ros/image-common/camera-calibration-parsers_1.11.12.bb b/recipes-ros/image-common/camera-calibration-parsers_1.11.13.bb similarity index 80% rename from recipes-ros/image-common/camera-calibration-parsers_1.11.12.bb rename to recipes-ros/image-common/camera-calibration-parsers_1.11.13.bb index 70c433b1997..44184abb726 100644 --- a/recipes-ros/image-common/camera-calibration-parsers_1.11.12.bb +++ b/recipes-ros/image-common/camera-calibration-parsers_1.11.13.bb @@ -10,4 +10,4 @@ require image-common.inc # OE upstream doesn't support python2 in Boost, but python3 only. # So, drop python support from camera-calibration-parsers in case # we're building a python2 flavour of ROS. -SRC_URI += "${@'file://0001-Drop-support-for-python.patch' if d.getVar('PYTHON_PN', True) != 'python3' else ''}" +SRC_URI += "${@'file://0001-Drop-support-for-python.patch;striplevel=2' if d.getVar('PYTHON_PN', True) != 'python3' else ''}" diff --git a/recipes-ros/image-common/camera-info-manager_1.11.12.bb b/recipes-ros/image-common/camera-info-manager_1.11.13.bb similarity index 100% rename from recipes-ros/image-common/camera-info-manager_1.11.12.bb rename to recipes-ros/image-common/camera-info-manager_1.11.13.bb diff --git a/recipes-ros/image-common/image-common.inc b/recipes-ros/image-common/image-common.inc index e7f1477093c..f919dce6133 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] = "93262ecca39761feb87ec0538217bbb5" -SRC_URI[sha256sum] = "13d434e2d46e13af05398f3cbacffb2c69e2d015f6827d848f799a28d23e816d" +SRC_URI[md5sum] = "a9cf52febf87dfc4d2bf3eba1a499a6b" +SRC_URI[sha256sum] = "32a2e07724dec6eaaace21eae006274436d70d40bfe205249438570275c43cac" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/image-common/image-transport_1.11.12.bb b/recipes-ros/image-common/image-transport_1.11.13.bb similarity index 100% rename from recipes-ros/image-common/image-transport_1.11.12.bb rename to recipes-ros/image-common/image-transport_1.11.13.bb diff --git a/recipes-ros/image-common/polled-camera_1.11.12.bb b/recipes-ros/image-common/polled-camera_1.11.13.bb similarity index 100% rename from recipes-ros/image-common/polled-camera_1.11.12.bb rename to recipes-ros/image-common/polled-camera_1.11.13.bb