From 2673f5f5673fa0002856433ce4c981178654fa40 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 15 Dec 2013 10:00:01 +0100 Subject: [PATCH 1/5] robot-state-publisher: updating to 1.9.10 (addresses #211) --- ...ate-publisher_1.9.9.bb => robot-state-publisher_1.9.10.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/robot-state-publisher/{robot-state-publisher_1.9.9.bb => robot-state-publisher_1.9.10.bb} (76%) diff --git a/recipes-ros/robot-state-publisher/robot-state-publisher_1.9.9.bb b/recipes-ros/robot-state-publisher/robot-state-publisher_1.9.10.bb similarity index 76% rename from recipes-ros/robot-state-publisher/robot-state-publisher_1.9.9.bb rename to recipes-ros/robot-state-publisher/robot-state-publisher_1.9.10.bb index e9437be..5b6434a 100644 --- a/recipes-ros/robot-state-publisher/robot-state-publisher_1.9.9.bb +++ b/recipes-ros/robot-state-publisher/robot-state-publisher_1.9.10.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=17;endline=17;md5=5ee5b8b046ae4 DEPENDS = "libeigen kdl-parser rosconsole roscpp rostime sensor-msgs tf tf-conversions" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "2315f637a70871bb460d6365a240741f" -SRC_URI[sha256sum] = "7b1321f8e26352c0fc8558ddabfc86897613ac16834fb83d8696ff7d6dd973b5" +SRC_URI[md5sum] = "69fd00d92a1fe6928d30cd49f3e41fbd" +SRC_URI[sha256sum] = "b2ee50c242508d78685e17819c3bafe22cdd667e9519c5f107169a9e1507a501" S = "${WORKDIR}/${ROS_SP}" From 8ddce632977c4483adcf73c33c1686233284da68 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Wed, 1 Jan 2014 13:20:53 +0100 Subject: [PATCH 2/5] image-view: adding patch (resolves #212) --- ...explicitly-require-OpenCV-s-core-com.patch | 25 +++++++++++++++++++ .../image-pipeline/image-view_1.11.4.bb | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 recipes-ros/image-pipeline/image-view/0001-image_view-must-explicitly-require-OpenCV-s-core-com.patch diff --git a/recipes-ros/image-pipeline/image-view/0001-image_view-must-explicitly-require-OpenCV-s-core-com.patch b/recipes-ros/image-pipeline/image-view/0001-image_view-must-explicitly-require-OpenCV-s-core-com.patch new file mode 100644 index 0000000..e7ad49f --- /dev/null +++ b/recipes-ros/image-pipeline/image-view/0001-image_view-must-explicitly-require-OpenCV-s-core-com.patch @@ -0,0 +1,25 @@ +From f4130241042b2c19dda7b6d3a22e822585b4901a Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Tue, 31 Dec 2013 16:20:04 +0100 +Subject: [PATCH] image_view must explicitly require OpenCV's core component + +--- + image_view/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/image_view/CMakeLists.txt b/image_view/CMakeLists.txt +index d72e992..e5b7790 100644 +--- a/image_view/CMakeLists.txt ++++ b/image_view/CMakeLists.txt +@@ -6,7 +6,7 @@ catkin_package() + + find_package(Boost REQUIRED COMPONENTS signals thread) + find_package(GTK2) +-find_package(OpenCV REQUIRED highgui) ++find_package(OpenCV REQUIRED core highgui) + find_package(catkin REQUIRED camera_calibration_parsers cv_bridge image_transport message_filters nodelet rosconsole roscpp) + include_directories(SYSTEM ${Boost_INCLUDE_DIRS} + ${catkin_INCLUDE_DIRS} +-- +1.8.1.4 + diff --git a/recipes-ros/image-pipeline/image-view_1.11.4.bb b/recipes-ros/image-pipeline/image-view_1.11.4.bb index 4b48b63..f3417e0 100644 --- a/recipes-ros/image-pipeline/image-view_1.11.4.bb +++ b/recipes-ros/image-pipeline/image-view_1.11.4.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de DEPENDS = "camera-calibration-parsers cv-bridge image-transport message-filters nodelet opencv rosconsole roscpp sensor-msgs std-srvs stereo-msgs" require image-pipeline.inc + +SRC_URI += "file://0001-image_view-must-explicitly-require-OpenCV-s-core-com.patch;striplevel=2" From 1592463222f1269dfd724a41f75e73be601149c2 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 19 Jan 2014 08:52:00 +0100 Subject: [PATCH 3/5] freenect-stack: removing unneeded executable mode --- recipes-ros/freenect-stack/freenect-camera_0.3.0.bb | 0 recipes-ros/freenect-stack/freenect-launch_0.3.0.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 recipes-ros/freenect-stack/freenect-camera_0.3.0.bb mode change 100755 => 100644 recipes-ros/freenect-stack/freenect-launch_0.3.0.bb diff --git a/recipes-ros/freenect-stack/freenect-camera_0.3.0.bb b/recipes-ros/freenect-stack/freenect-camera_0.3.0.bb old mode 100755 new mode 100644 diff --git a/recipes-ros/freenect-stack/freenect-launch_0.3.0.bb b/recipes-ros/freenect-stack/freenect-launch_0.3.0.bb old mode 100755 new mode 100644 From d675351507a6462100eb79cadedc8c737d06c5b1 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 19 Jan 2014 09:20:17 +0100 Subject: [PATCH 4/5] changing possibly name-clashing downloadfilename to non-clashing default one --- recipes-ros/freenect-stack/freenect-stack.inc | 2 +- recipes-ros/rosserial/rosserial.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-ros/freenect-stack/freenect-stack.inc b/recipes-ros/freenect-stack/freenect-stack.inc index 61e070a..31e1219 100644 --- a/recipes-ros/freenect-stack/freenect-stack.inc +++ b/recipes-ros/freenect-stack/freenect-stack.inc @@ -1,4 +1,4 @@ -SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${PV}.tar.gz" +SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI[md5sum] = "14841630d9d28e1b20c82993c59951ac" SRC_URI[sha256sum] = "c921ed369a3ef47ccb6e72ddbdfb3188020adecaa94ad77d28bd58086bf6614c" diff --git a/recipes-ros/rosserial/rosserial.inc b/recipes-ros/rosserial/rosserial.inc index cbdd9a7..047e266 100644 --- a/recipes-ros/rosserial/rosserial.inc +++ b/recipes-ros/rosserial/rosserial.inc @@ -1,4 +1,4 @@ -SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${PV}.tar.gz" +SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI[md5sum] = "8258067f0097e5a4355eda1b1cbaff04" SRC_URI[sha256sum] = "e84a03be89650ed9e376b7e09ffe27cf7d1670e93e0e60cc2b59659a4aac7b20" From ed42a957903f8d25cff920288de5a20e3d3b0127 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 23 Jan 2014 10:07:03 +0100 Subject: [PATCH 5/5] urdfdom: removing unneeded executable mode --- recipes-ros/urdfdom/urdfdom_0.2.8.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 recipes-ros/urdfdom/urdfdom_0.2.8.bb diff --git a/recipes-ros/urdfdom/urdfdom_0.2.8.bb b/recipes-ros/urdfdom/urdfdom_0.2.8.bb old mode 100755 new mode 100644