From 0fb748c3b0a6539a81dd4ce4e57665eb830dba8c Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sat, 23 Nov 2013 15:00:32 +0100 Subject: [PATCH 1/4] robot-model: updating to 1.10.17 This commit updates to 1.10.17 and removes the local patch that has been added to 1.10.17. The new version of collada-urdf has added another target, and its recipe must be updated. --- ...r_1.10.15.bb => collada-parser_1.10.17.bb} | 0 ...rdf_1.10.15.bb => collada-urdf_1.10.17.bb} | 4 +- ...15e06c1ceb0d3cb43a0863441d872056d239.patch | 139 ------------------ ...15.bb => joint-state-publisher_1.10.17.bb} | 0 ...arser_1.10.15.bb => kdl-parser_1.10.17.bb} | 0 ...10.15.bb => resource-retriever_1.10.17.bb} | 0 recipes-ros/robot-model/robot-model.inc | 6 +- ...10.15.bb => urdf-parser-plugin_1.10.17.bb} | 0 .../{urdf_1.10.15.bb => urdf_1.10.17.bb} | 0 9 files changed, 4 insertions(+), 145 deletions(-) rename recipes-ros/robot-model/{collada-parser_1.10.15.bb => collada-parser_1.10.17.bb} (100%) rename recipes-ros/robot-model/{collada-urdf_1.10.15.bb => collada-urdf_1.10.17.bb} (85%) delete mode 100644 recipes-ros/robot-model/files/eec215e06c1ceb0d3cb43a0863441d872056d239.patch rename recipes-ros/robot-model/{joint-state-publisher_1.10.15.bb => joint-state-publisher_1.10.17.bb} (100%) rename recipes-ros/robot-model/{kdl-parser_1.10.15.bb => kdl-parser_1.10.17.bb} (100%) rename recipes-ros/robot-model/{resource-retriever_1.10.15.bb => resource-retriever_1.10.17.bb} (100%) rename recipes-ros/robot-model/{urdf-parser-plugin_1.10.15.bb => urdf-parser-plugin_1.10.17.bb} (100%) rename recipes-ros/robot-model/{urdf_1.10.15.bb => urdf_1.10.17.bb} (100%) diff --git a/recipes-ros/robot-model/collada-parser_1.10.15.bb b/recipes-ros/robot-model/collada-parser_1.10.17.bb similarity index 100% rename from recipes-ros/robot-model/collada-parser_1.10.15.bb rename to recipes-ros/robot-model/collada-parser_1.10.17.bb diff --git a/recipes-ros/robot-model/collada-urdf_1.10.15.bb b/recipes-ros/robot-model/collada-urdf_1.10.17.bb similarity index 85% rename from recipes-ros/robot-model/collada-urdf_1.10.15.bb rename to recipes-ros/robot-model/collada-urdf_1.10.17.bb index 696eaf6..1c1a495 100644 --- a/recipes-ros/robot-model/collada-urdf_1.10.15.bb +++ b/recipes-ros/robot-model/collada-urdf_1.10.17.bb @@ -3,12 +3,12 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "angles assimp resource-retriever collada-dom collada-parser roscpp urdf geometric-shapes" +DEPENDS = "angles assimp resource-retriever collada-dom collada-parser roscpp urdf geometric-shapes tf" require robot-model.inc do_configure_append() { - for f in collada_urdf.dir urdf_to_collada.dir + for f in collada_urdf.dir collada_to_urdf.dir urdf_to_collada.dir do sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \ -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \ diff --git a/recipes-ros/robot-model/files/eec215e06c1ceb0d3cb43a0863441d872056d239.patch b/recipes-ros/robot-model/files/eec215e06c1ceb0d3cb43a0863441d872056d239.patch deleted file mode 100644 index e59edac..0000000 --- a/recipes-ros/robot-model/files/eec215e06c1ceb0d3cb43a0863441d872056d239.patch +++ /dev/null @@ -1,139 +0,0 @@ -From eec215e06c1ceb0d3cb43a0863441d872056d239 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sun, 15 Sep 2013 14:35:12 +0200 -Subject: [PATCH] check for CATKIN_ENABLE_TESTING - ---- - collada_urdf/CMakeLists.txt | 8 +++++--- - collada_urdf/package.xml | 2 +- - kdl_parser/CMakeLists.txt | 6 ++++-- - kdl_parser/package.xml | 2 +- - resource_retriever/CMakeLists.txt | 4 +++- - resource_retriever/package.xml | 2 +- - urdf/CMakeLists.txt | 6 ++++-- - urdf/package.xml | 2 +- - 8 files changed, 20 insertions(+), 12 deletions(-) - -diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt -index 9d0e228..05217be 100644 ---- a/collada_urdf/CMakeLists.txt -+++ b/collada_urdf/CMakeLists.txt -@@ -65,9 +65,11 @@ target_link_libraries(collada_to_urdf ${ASSIMP_LIBRARIES} ${catkin_LIBRARIES} ${ - set_target_properties(collada_to_urdf PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}") - set_target_properties(collada_to_urdf PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}") - --catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp) --target_link_libraries(test_collada_writer ${PROJECT_NAME} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES} -- ${Boost_LIBRARIES}) -+if(CATKIN_ENABLE_TESTING) -+ catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp) -+ target_link_libraries(test_collada_writer ${PROJECT_NAME} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES} -+ ${Boost_LIBRARIES}) -+endif() - - install(TARGETS ${PROJECT_NAME} urdf_to_collada collada_to_urdf - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml -index a846861..8cde4fe 100644 ---- a/collada_urdf/package.xml -+++ b/collada_urdf/package.xml -@@ -16,7 +16,7 @@ - - http://ros.org/wiki/collada_urdf - -- catkin -+ catkin - - angles - assimp -diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt -index 7522ac3..3b8ff1d 100644 ---- a/kdl_parser/CMakeLists.txt -+++ b/kdl_parser/CMakeLists.txt -@@ -31,8 +31,10 @@ target_link_libraries(${PROJECT_NAME} - add_executable(check_kdl_parser src/check_kdl_parser.cpp ) - target_link_libraries(check_kdl_parser ${PROJECT_NAME}) - --catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp ) --target_link_libraries(test_kdl_parser ${PROJECT_NAME}) -+if(CATKIN_ENABLE_TESTING) -+ catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp ) -+ target_link_libraries(test_kdl_parser ${PROJECT_NAME}) -+endif() - - # How does CATKIN do this? - #rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_kdl_parser.launch) -diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml -index a82798a..e977f03 100644 ---- a/kdl_parser/package.xml -+++ b/kdl_parser/package.xml -@@ -17,7 +17,7 @@ - https://github.com/ros/robot_model - https://github.com/ros/robot_model/issues - -- catkin -+ catkin - - orocos_kdl - rosconsole -diff --git a/resource_retriever/CMakeLists.txt b/resource_retriever/CMakeLists.txt -index 6e67160..f34b0da 100644 ---- a/resource_retriever/CMakeLists.txt -+++ b/resource_retriever/CMakeLists.txt -@@ -26,7 +26,9 @@ include_directories(${CURL_INCLUDE_DIRS}) - add_library(${PROJECT_NAME} src/retriever.cpp) - target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${catkin_LIBRARIES}) - --add_subdirectory(test EXCLUDE_FROM_ALL) -+if(CATKIN_ENABLE_TESTING) -+ add_subdirectory(test EXCLUDE_FROM_ALL) -+endif() - - install(TARGETS ${PROJECT_NAME} - DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) -diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml -index 562dff4..6e98408 100644 ---- a/resource_retriever/package.xml -+++ b/resource_retriever/package.xml -@@ -19,7 +19,7 @@ - https://github.com/ros/robot_model - https://github.com/ros/robot_model/issues - -- catkin -+ catkin - - curl - rosconsole -diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt -index 5fde363..7b07226 100644 ---- a/urdf/CMakeLists.txt -+++ b/urdf/CMakeLists.txt -@@ -33,8 +33,10 @@ if(APPLE) - set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") - endif(APPLE) - --catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp) --target_link_libraries(test_parser ${PROJECT_NAME}) -+if(CATKIN_ENABLE_TESTING) -+ catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp) -+ target_link_libraries(test_parser ${PROJECT_NAME}) -+endif() - - # no idea how CATKIN does this - # rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch) -diff --git a/urdf/package.xml b/urdf/package.xml -index b623dfd..daf04a6 100644 ---- a/urdf/package.xml -+++ b/urdf/package.xml -@@ -17,7 +17,7 @@ - https://github.com/ros/robot_model - https://github.com/ros/robot_model/issues - -- catkin -+ catkin - - rosconsole_bridge - roscpp --- -1.8.4 - diff --git a/recipes-ros/robot-model/joint-state-publisher_1.10.15.bb b/recipes-ros/robot-model/joint-state-publisher_1.10.17.bb similarity index 100% rename from recipes-ros/robot-model/joint-state-publisher_1.10.15.bb rename to recipes-ros/robot-model/joint-state-publisher_1.10.17.bb diff --git a/recipes-ros/robot-model/kdl-parser_1.10.15.bb b/recipes-ros/robot-model/kdl-parser_1.10.17.bb similarity index 100% rename from recipes-ros/robot-model/kdl-parser_1.10.15.bb rename to recipes-ros/robot-model/kdl-parser_1.10.17.bb diff --git a/recipes-ros/robot-model/resource-retriever_1.10.15.bb b/recipes-ros/robot-model/resource-retriever_1.10.17.bb similarity index 100% rename from recipes-ros/robot-model/resource-retriever_1.10.15.bb rename to recipes-ros/robot-model/resource-retriever_1.10.17.bb diff --git a/recipes-ros/robot-model/robot-model.inc b/recipes-ros/robot-model/robot-model.inc index 2dd334a..6df421b 100644 --- a/recipes-ros/robot-model/robot-model.inc +++ b/recipes-ros/robot-model/robot-model.inc @@ -1,8 +1,6 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "8408e5b990d157d1d30e56cc0a1ec28c" -SRC_URI[sha256sum] = "72374d3c43a2715a743365be186fddd23f016889430b5da1209f5bcaba08d141" - -SRC_URI += "file://eec215e06c1ceb0d3cb43a0863441d872056d239.patch;patchdir=.." +SRC_URI[md5sum] = "77c87b3045771a9875f51000fe075559" +SRC_URI[sha256sum] = "cb6cf4beb4429bc9a5d6502a1865c5dae447a40c09f8188a0253e931e66e5f78" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/robot-model/urdf-parser-plugin_1.10.15.bb b/recipes-ros/robot-model/urdf-parser-plugin_1.10.17.bb similarity index 100% rename from recipes-ros/robot-model/urdf-parser-plugin_1.10.15.bb rename to recipes-ros/robot-model/urdf-parser-plugin_1.10.17.bb diff --git a/recipes-ros/robot-model/urdf_1.10.15.bb b/recipes-ros/robot-model/urdf_1.10.17.bb similarity index 100% rename from recipes-ros/robot-model/urdf_1.10.15.bb rename to recipes-ros/robot-model/urdf_1.10.17.bb From 808e449c447ebad19534befbe9c46ad1ab9d2f40 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sat, 23 Nov 2013 17:01:43 +0100 Subject: [PATCH 2/4] image-pipeline: updating to 1.11.4 The version 1.11.4 contains the local patches for CATKIN_ENABLE_TESTING, and hence the local patches can be removed. --- ...0001-check-for-CATKIN_ENABLE_TESTING.patch | 61 ------------------- ...1.11.3.bb => camera-calibration_1.11.4.bb} | 4 +- ...c_1.11.3.bb => depth-image-proc_1.11.4.bb} | 0 recipes-ros/image-pipeline/image-pipeline.inc | 4 +- ...0001-check-for-CATKIN_ENABLE_TESTING.patch | 42 ------------- ...ge-proc_1.11.3.bb => image-proc_1.11.4.bb} | 2 - ...otate_1.11.3.bb => image-rotate_1.11.4.bb} | 0 ...ge-view_1.11.3.bb => image-view_1.11.4.bb} | 0 ..._1.11.3.bb => stereo-image-proc_1.11.4.bb} | 0 9 files changed, 3 insertions(+), 110 deletions(-) delete mode 100644 recipes-ros/image-pipeline/camera-calibration/0001-check-for-CATKIN_ENABLE_TESTING.patch rename recipes-ros/image-pipeline/{camera-calibration_1.11.3.bb => camera-calibration_1.11.4.bb} (62%) rename recipes-ros/image-pipeline/{depth-image-proc_1.11.3.bb => depth-image-proc_1.11.4.bb} (100%) delete mode 100644 recipes-ros/image-pipeline/image-proc/0001-check-for-CATKIN_ENABLE_TESTING.patch rename recipes-ros/image-pipeline/{image-proc_1.11.3.bb => image-proc_1.11.4.bb} (82%) rename recipes-ros/image-pipeline/{image-rotate_1.11.3.bb => image-rotate_1.11.4.bb} (100%) rename recipes-ros/image-pipeline/{image-view_1.11.3.bb => image-view_1.11.4.bb} (100%) rename recipes-ros/image-pipeline/{stereo-image-proc_1.11.3.bb => stereo-image-proc_1.11.4.bb} (100%) diff --git a/recipes-ros/image-pipeline/camera-calibration/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/image-pipeline/camera-calibration/0001-check-for-CATKIN_ENABLE_TESTING.patch deleted file mode 100644 index a006ef3..0000000 --- a/recipes-ros/image-pipeline/camera-calibration/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 7d0a39237d5b6570aa4c931670420b44975a2447 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sat, 12 Oct 2013 13:43:17 +0200 -Subject: [PATCH] check for CATKIN_ENABLE_TESTING - ---- - camera_calibration/CMakeLists.txt | 21 +++++++++++---------- - camera_calibration/package.xml | 2 +- - 2 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/camera_calibration/CMakeLists.txt b/camera_calibration/CMakeLists.txt -index 129294f..69f1eeb 100644 ---- a/camera_calibration/CMakeLists.txt -+++ b/camera_calibration/CMakeLists.txt -@@ -6,19 +6,20 @@ catkin_package() - - catkin_python_setup() - --# Unit test of calibrator.py --catkin_add_nosetests(test/directed.py) -+if(CATKIN_ENABLE_TESTING) -+ # Unit test of calibrator.py -+ catkin_add_nosetests(test/directed.py) - --# Unit test of the approximate synchronizer --catkin_add_nosetests(test/testapproxsync.py) -+ # Unit test of the approximate synchronizer -+ catkin_add_nosetests(test/testapproxsync.py) - --# Tests simple calibration dataset --catkin_download_test_data(camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz MD5 6da43ea314640a4c15dd7a90cbc3aee0) -- --# Tests multiple checkerboards --catkin_download_test_data(multi_board_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz MD5 ddc0f69582d140e33f9d3bfb681956bb) --catkin_add_nosetests(test/multiple_boards.py) -+ # Tests simple calibration dataset -+ catkin_download_test_data(camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz MD5 6da43ea314640a4c15dd7a90cbc3aee0) - -+ # Tests multiple checkerboards -+ catkin_download_test_data(multi_board_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz MD5 ddc0f69582d140e33f9d3bfb681956bb) -+ catkin_add_nosetests(test/multiple_boards.py) -+endif() - - install(PROGRAMS nodes/camera_calibrate_from_disk.py - nodes/cameracalibrator.py -diff --git a/camera_calibration/package.xml b/camera_calibration/package.xml -index 620f958..662e938 100644 ---- a/camera_calibration/package.xml -+++ b/camera_calibration/package.xml -@@ -9,7 +9,7 @@ - Patrick Mihelich - Vincent Rabaud - -- catkin -+ catkin - - rostest - --- -1.8.1.2 - diff --git a/recipes-ros/image-pipeline/camera-calibration_1.11.3.bb b/recipes-ros/image-pipeline/camera-calibration_1.11.4.bb similarity index 62% rename from recipes-ros/image-pipeline/camera-calibration_1.11.3.bb rename to recipes-ros/image-pipeline/camera-calibration_1.11.4.bb index 2143a33..2596fb0 100644 --- a/recipes-ros/image-pipeline/camera-calibration_1.11.3.bb +++ b/recipes-ros/image-pipeline/camera-calibration_1.11.4.bb @@ -2,8 +2,6 @@ DESCRIPTION = "camera_calibration allows easy calibration of monocular or stereo cameras using a checkerboard calibration target." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=22;endline=22;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=24;endline=24;md5=d566ef916e9dedc494f5f793a6690ba5" require image-pipeline.inc - -SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2" diff --git a/recipes-ros/image-pipeline/depth-image-proc_1.11.3.bb b/recipes-ros/image-pipeline/depth-image-proc_1.11.4.bb similarity index 100% rename from recipes-ros/image-pipeline/depth-image-proc_1.11.3.bb rename to recipes-ros/image-pipeline/depth-image-proc_1.11.4.bb diff --git a/recipes-ros/image-pipeline/image-pipeline.inc b/recipes-ros/image-pipeline/image-pipeline.inc index f4b8b31..fa2c7a6 100644 --- a/recipes-ros/image-pipeline/image-pipeline.inc +++ b/recipes-ros/image-pipeline/image-pipeline.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] = "655ceb0d966d7105679d8c96304b2537" -SRC_URI[sha256sum] = "76bda6a0179de44a65f51a14d1967b81d45fe4e71c167cde25bd273bc63d22e0" +SRC_URI[md5sum] = "1c13b6e63b31dc336b4f48825a3fb271" +SRC_URI[sha256sum] = "d7f68f40e937f47e49121442825c30d9af4fdab68d53cff23863f885956f90ae" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/image-pipeline/image-proc/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/image-pipeline/image-proc/0001-check-for-CATKIN_ENABLE_TESTING.patch deleted file mode 100644 index 668ed74..0000000 --- a/recipes-ros/image-pipeline/image-proc/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ /dev/null @@ -1,42 +0,0 @@ -From caee053fb6a82bf1552a7ca226f80014d830a089 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sat, 12 Oct 2013 13:55:06 +0200 -Subject: [PATCH] check for CATKIN_ENABLE_TESTING - ---- - image_proc/CMakeLists.txt | 8 +++++--- - image_proc/package.xml | 2 +- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/image_proc/CMakeLists.txt b/image_proc/CMakeLists.txt -index 25f9499..3653279 100644 ---- a/image_proc/CMakeLists.txt -+++ b/image_proc/CMakeLists.txt -@@ -54,6 +54,8 @@ install(DIRECTORY launch - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/ - ) - --# Tests --catkin_add_gtest(image_proc_rostest test/rostest.cpp) --target_link_libraries(image_proc_rostest ${catkin_LIBRARIES} ${Boost_LIBRARIES}) -+if(CATKIN_ENABLE_TESTING) -+ # Tests -+ catkin_add_gtest(image_proc_rostest test/rostest.cpp) -+ target_link_libraries(image_proc_rostest ${catkin_LIBRARIES} ${Boost_LIBRARIES}) -+endif() -diff --git a/image_proc/package.xml b/image_proc/package.xml -index ebe5882..fd7dd92 100644 ---- a/image_proc/package.xml -+++ b/image_proc/package.xml -@@ -13,7 +13,7 @@ - - - -- catkin -+ catkin - - rostest - --- -1.8.1.2 - diff --git a/recipes-ros/image-pipeline/image-proc_1.11.3.bb b/recipes-ros/image-pipeline/image-proc_1.11.4.bb similarity index 82% rename from recipes-ros/image-pipeline/image-proc_1.11.3.bb rename to recipes-ros/image-pipeline/image-proc_1.11.4.bb index 99a6fa9..fd8f8a6 100644 --- a/recipes-ros/image-pipeline/image-proc_1.11.3.bb +++ b/recipes-ros/image-pipeline/image-proc_1.11.4.bb @@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc DEPENDS = "boost camera-calibration-parsers cv-bridge dynamic-reconfigure image-geometry image-transport nodelet opencv roscpp sensor-msgs" require image-pipeline.inc - -SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2" diff --git a/recipes-ros/image-pipeline/image-rotate_1.11.3.bb b/recipes-ros/image-pipeline/image-rotate_1.11.4.bb similarity index 100% rename from recipes-ros/image-pipeline/image-rotate_1.11.3.bb rename to recipes-ros/image-pipeline/image-rotate_1.11.4.bb diff --git a/recipes-ros/image-pipeline/image-view_1.11.3.bb b/recipes-ros/image-pipeline/image-view_1.11.4.bb similarity index 100% rename from recipes-ros/image-pipeline/image-view_1.11.3.bb rename to recipes-ros/image-pipeline/image-view_1.11.4.bb diff --git a/recipes-ros/image-pipeline/stereo-image-proc_1.11.3.bb b/recipes-ros/image-pipeline/stereo-image-proc_1.11.4.bb similarity index 100% rename from recipes-ros/image-pipeline/stereo-image-proc_1.11.3.bb rename to recipes-ros/image-pipeline/stereo-image-proc_1.11.4.bb From b6080314504be62c8fbfcb1d583e688448a2f023 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sat, 23 Nov 2013 20:38:41 +0100 Subject: [PATCH 3/4] python-numpy: provide native package for cv-bridge 1.10.14 --- recipes-devtools/python/python-native_2.7.3.bbappend | 7 ++++++- recipes-devtools/python/python-numpy_1.7.0.bbappend | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 recipes-devtools/python/python-numpy_1.7.0.bbappend diff --git a/recipes-devtools/python/python-native_2.7.3.bbappend b/recipes-devtools/python/python-native_2.7.3.bbappend index e742099..b7eaffc 100644 --- a/recipes-devtools/python/python-native_2.7.3.bbappend +++ b/recipes-devtools/python/python-native_2.7.3.bbappend @@ -1 +1,6 @@ -RPROVIDES += "python-datetime-native python-netclient-native python-subprocess-native python-xml-native" +RPROVIDES += "python-datetime-native python-difflib-native \ + python-doctest-native python-email-native python-mmap-native \ + python-misc-native python-netclient-native python-numbers-native \ + python-pickle-native python-pkgutil-native python-pprint-native \ + python-pydoc-native python-shell-native python-subprocess-native \ + python-unittest-native python-xml-native" diff --git a/recipes-devtools/python/python-numpy_1.7.0.bbappend b/recipes-devtools/python/python-numpy_1.7.0.bbappend new file mode 100644 index 0000000..d3267ac --- /dev/null +++ b/recipes-devtools/python/python-numpy_1.7.0.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native" From e7af4dcf1d22899bd5473601c844b10f6d6e17e9 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sat, 23 Nov 2013 20:34:13 +0100 Subject: [PATCH 4/4] vision-opencv: updating to 1.10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The cv-bridge 1.10.14 now needs python-numpy-native, as a python script with ´import numpy´ is executed at compile time. --- .../{cv-bridge_1.10.11.bb => cv-bridge_1.10.14.bb} | 2 +- .../{image-geometry_1.10.11.bb => image-geometry_1.10.14.bb} | 0 recipes-ros/vision-opencv/vision-opencv.inc | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename recipes-ros/vision-opencv/{cv-bridge_1.10.11.bb => cv-bridge_1.10.14.bb} (78%) rename recipes-ros/vision-opencv/{image-geometry_1.10.11.bb => image-geometry_1.10.14.bb} (100%) diff --git a/recipes-ros/vision-opencv/cv-bridge_1.10.11.bb b/recipes-ros/vision-opencv/cv-bridge_1.10.14.bb similarity index 78% rename from recipes-ros/vision-opencv/cv-bridge_1.10.11.bb rename to recipes-ros/vision-opencv/cv-bridge_1.10.14.bb index e70ff8a..0b268b2 100644 --- a/recipes-ros/vision-opencv/cv-bridge_1.10.11.bb +++ b/recipes-ros/vision-opencv/cv-bridge_1.10.14.bb @@ -3,6 +3,6 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "boost opencv rosconsole sensor-msgs" +DEPENDS = "boost opencv rosconsole sensor-msgs python-numpy-native" require vision-opencv.inc diff --git a/recipes-ros/vision-opencv/image-geometry_1.10.11.bb b/recipes-ros/vision-opencv/image-geometry_1.10.14.bb similarity index 100% rename from recipes-ros/vision-opencv/image-geometry_1.10.11.bb rename to recipes-ros/vision-opencv/image-geometry_1.10.14.bb diff --git a/recipes-ros/vision-opencv/vision-opencv.inc b/recipes-ros/vision-opencv/vision-opencv.inc index 1cc33e4..d12e382 100644 --- a/recipes-ros/vision-opencv/vision-opencv.inc +++ b/recipes-ros/vision-opencv/vision-opencv.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] = "8d5fcadd2383832c663a83b5e669e06d" -SRC_URI[sha256sum] = "c95257b963a4e9cba3c3f76c1ca03f3050b5a4736a4b2cda88a5e2282521f1c9" +SRC_URI[md5sum] = "dedd510c159dfdf26fc0fad10ff58818" +SRC_URI[sha256sum] = "439da90a7cb45afe4105f158adad3149a968414256b12162afa7a35e1c51d79c" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"