From 4544d9b5e67b3a0322cf37b8c30e54f4c353a533 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 19 Mar 2017 15:08:19 +0100 Subject: [PATCH] filters: updating to 1.7.5 Due to the update, this commit also drops both patches that are now included in the released version. Signed-off-by: Lukas Bulwahn --- ...0001-check-for-CATKIN_ENABLE_TESTING.patch | 107 ------------------ ...CMakeLists-optional-ros-rosdistro-30.patch | 34 ------ .../{filters_1.7.4.bb => filters_1.7.5.bb} | 7 +- 3 files changed, 2 insertions(+), 146 deletions(-) delete mode 100644 recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch delete mode 100644 recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch rename recipes-ros/filters/{filters_1.7.4.bb => filters_1.7.5.bb} (59%) diff --git a/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch deleted file mode 100644 index d1cd8ff..0000000 --- a/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 2607c82034cdfbf96fe372c9637b0133b6ba6970 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sat, 12 Oct 2013 11:39:36 +0200 -Subject: [PATCH] check for CATKIN_ENABLE_TESTING - -Upstream-Status: Accepted ---- - CMakeLists.txt | 64 +++++++++++++++++++++++++++++++--------------------------- - package.xml | 2 +- - 2 files changed, 35 insertions(+), 31 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aaf586d..ccb54f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,33 +40,35 @@ target_link_libraries(median ${catkin_LIBRARIES} ${Boost_LIBRARIES}) - add_library(transfer_function src/transfer_function.cpp) - target_link_libraries(transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES}) - --# Test median filter --add_executable(median_test EXCLUDE_FROM_ALL test/test_median.cpp ) --target_link_libraries(median_test median ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) --add_rostest(test/test_median.launch) -- --# Test transfer function filter --add_executable(transfer_function_test EXCLUDE_FROM_ALL test/test_transfer_function.cpp) --target_link_libraries(transfer_function_test transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) --add_rostest(test/test_transfer_function.launch) -- --# Test mean filter --add_executable(mean_test EXCLUDE_FROM_ALL test/test_mean.cpp) --target_link_libraries(mean_test mean ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) --add_rostest(test/test_mean.launch) -- --# Test params filter --add_executable(params_test EXCLUDE_FROM_ALL test/test_params.cpp) --target_link_libraries(params_test params ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) --add_rostest(test/test_params.launch) -- --# Test plugin loading into filter chain --add_executable(chain_test EXCLUDE_FROM_ALL test/test_chain.cpp) --target_link_libraries(chain_test increment ${Boost_libraries} ${catkin_LIBRARIES} ${GTEST_LIBRARIES}) # Needed for OSX --add_rostest(test/test_chain.launch) -- --# Test realtime safe buffer class --catkin_add_gtest(realtime_buffer_test EXCLUDE_FROM_ALL test/test_realtime_circular_buffer.cpp) -+if(CATKIN_ENABLE_TESTING) -+ # Test median filter -+ add_executable(median_test EXCLUDE_FROM_ALL test/test_median.cpp ) -+ target_link_libraries(median_test median ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) -+ add_rostest(test/test_median.launch) -+ -+ # Test transfer function filter -+ add_executable(transfer_function_test EXCLUDE_FROM_ALL test/test_transfer_function.cpp) -+ target_link_libraries(transfer_function_test transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) -+ add_rostest(test/test_transfer_function.launch) -+ -+ # Test mean filter -+ add_executable(mean_test EXCLUDE_FROM_ALL test/test_mean.cpp) -+ target_link_libraries(mean_test mean ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) -+ add_rostest(test/test_mean.launch) -+ -+ # Test params filter -+ add_executable(params_test EXCLUDE_FROM_ALL test/test_params.cpp) -+ target_link_libraries(params_test params ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) -+ add_rostest(test/test_params.launch) -+ -+ # Test plugin loading into filter chain -+ add_executable(chain_test EXCLUDE_FROM_ALL test/test_chain.cpp) -+ target_link_libraries(chain_test increment ${Boost_libraries} ${catkin_LIBRARIES} ${GTEST_LIBRARIES}) # Needed for OSX -+ add_rostest(test/test_chain.launch) -+ -+ # Test realtime safe buffer class -+ catkin_add_gtest(realtime_buffer_test EXCLUDE_FROM_ALL test/test_realtime_circular_buffer.cpp) -+endif() - - ############################################################################## - # Install -@@ -88,6 +90,8 @@ install(FILES default_plugins.xml - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} - ) - --if(TARGET tests) --add_dependencies(tests median_test transfer_function_test mean_test params_test chain_test) --endif() -\ No newline at end of file -+if(CATKIN_ENABLE_TESTING) -+ if(TARGET tests) -+ add_dependencies(tests median_test transfer_function_test mean_test params_test chain_test) -+ endif() -+endif() -diff --git a/package.xml b/package.xml -index c5bc897..dd66070 100644 ---- a/package.xml -+++ b/package.xml -@@ -11,7 +11,7 @@ - BSD - http://ros.org/wiki/filters - -- catkin -+ catkin - - roslib - rosconsole --- -1.8.1.2 - diff --git a/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch deleted file mode 100644 index 7d46d06..0000000 --- a/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5aef0d6619394df17bffe743071295ad041b5794 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Tue, 4 Feb 2014 16:02:09 +0100 -Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) - -Upstream-Status: Accepted ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccb54f9..97eea51 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,7 +5,7 @@ project(filters) - # Find dependencies - ############################################################################## - --find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole rostest) -+find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole) - find_package(Boost COMPONENTS system filesystem thread REQUIRED) - - include_directories( -@@ -41,6 +41,7 @@ add_library(transfer_function src/transfer_function.cpp) - target_link_libraries(transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES}) - - if(CATKIN_ENABLE_TESTING) -+ find_package(rostest) - # Test median filter - add_executable(median_test EXCLUDE_FROM_ALL test/test_median.cpp ) - target_link_libraries(median_test median ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) --- -1.8.3.2 - diff --git a/recipes-ros/filters/filters_1.7.4.bb b/recipes-ros/filters/filters_1.7.5.bb similarity index 59% rename from recipes-ros/filters/filters_1.7.4.bb rename to recipes-ros/filters/filters_1.7.5.bb index ea6c8b8..40e196f 100644 --- a/recipes-ros/filters/filters_1.7.4.bb +++ b/recipes-ros/filters/filters_1.7.5.bb @@ -6,10 +6,7 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9de DEPENDS = "roslib rosconsole roscpp pluginlib" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "0dd26504be16afa7816e9a5aa11715f1" -SRC_URI[sha256sum] = "fb71f1fbeaf89726877fce66dce1db8957c5cc6dffa1973d6a104a10233f8237" - -SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch; \ - file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch" +SRC_URI[md5sum] = "93b0685f061351dd2169f6b7f5373ca6" +SRC_URI[sha256sum] = "6632c8bc2f3c47db6f69d136ccf58a1963ac0c83f5f542173caaebd2c7086160" inherit catkin