From 3cf27fa67c73822761032a87531b379bb508c01d Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 10 Apr 2014 07:07:49 +0200 Subject: [PATCH] image-pipeline: updating to 1.11.8 The patch for the image_view package has been merged in 1.11.8, and hence is removed. --- ...1.11.6.bb => camera-calibration_1.11.8.bb} | 0 ...c_1.11.6.bb => depth-image-proc_1.11.8.bb} | 0 recipes-ros/image-pipeline/image-pipeline.inc | 4 +-- ...ge-proc_1.11.6.bb => image-proc_1.11.8.bb} | 0 ...otate_1.11.6.bb => image-rotate_1.11.8.bb} | 0 ...explicitly-require-OpenCV-s-core-com.patch | 25 ------------------- ...ge-view_1.11.6.bb => image-view_1.11.8.bb} | 2 -- ..._1.11.6.bb => stereo-image-proc_1.11.8.bb} | 0 8 files changed, 2 insertions(+), 29 deletions(-) rename recipes-ros/image-pipeline/{camera-calibration_1.11.6.bb => camera-calibration_1.11.8.bb} (100%) rename recipes-ros/image-pipeline/{depth-image-proc_1.11.6.bb => depth-image-proc_1.11.8.bb} (100%) rename recipes-ros/image-pipeline/{image-proc_1.11.6.bb => image-proc_1.11.8.bb} (100%) rename recipes-ros/image-pipeline/{image-rotate_1.11.6.bb => image-rotate_1.11.8.bb} (100%) delete mode 100644 recipes-ros/image-pipeline/image-view/0001-image_view-must-explicitly-require-OpenCV-s-core-com.patch rename recipes-ros/image-pipeline/{image-view_1.11.6.bb => image-view_1.11.8.bb} (78%) rename recipes-ros/image-pipeline/{stereo-image-proc_1.11.6.bb => stereo-image-proc_1.11.8.bb} (100%) diff --git a/recipes-ros/image-pipeline/camera-calibration_1.11.6.bb b/recipes-ros/image-pipeline/camera-calibration_1.11.8.bb similarity index 100% rename from recipes-ros/image-pipeline/camera-calibration_1.11.6.bb rename to recipes-ros/image-pipeline/camera-calibration_1.11.8.bb diff --git a/recipes-ros/image-pipeline/depth-image-proc_1.11.6.bb b/recipes-ros/image-pipeline/depth-image-proc_1.11.8.bb similarity index 100% rename from recipes-ros/image-pipeline/depth-image-proc_1.11.6.bb rename to recipes-ros/image-pipeline/depth-image-proc_1.11.8.bb diff --git a/recipes-ros/image-pipeline/image-pipeline.inc b/recipes-ros/image-pipeline/image-pipeline.inc index 165dae5..41d5ea9 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] = "98c520ae51f6fbd6871f79461980111d" -SRC_URI[sha256sum] = "39094733f9d1409ec75702823376f433fe2ccc6a317c2bbcb1c8ebe0d076b8f4" +SRC_URI[md5sum] = "f3e4bb2e48e45d3414d7e08e109e8d1b" +SRC_URI[sha256sum] = "dea2425dadfe9315eceacbc8d49cdd8a19f4eb79bd95c030c2c8d261e04b5060" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/image-pipeline/image-proc_1.11.6.bb b/recipes-ros/image-pipeline/image-proc_1.11.8.bb similarity index 100% rename from recipes-ros/image-pipeline/image-proc_1.11.6.bb rename to recipes-ros/image-pipeline/image-proc_1.11.8.bb diff --git a/recipes-ros/image-pipeline/image-rotate_1.11.6.bb b/recipes-ros/image-pipeline/image-rotate_1.11.8.bb similarity index 100% rename from recipes-ros/image-pipeline/image-rotate_1.11.6.bb rename to recipes-ros/image-pipeline/image-rotate_1.11.8.bb 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 deleted file mode 100644 index e7ad49f..0000000 --- a/recipes-ros/image-pipeline/image-view/0001-image_view-must-explicitly-require-OpenCV-s-core-com.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.6.bb b/recipes-ros/image-pipeline/image-view_1.11.8.bb similarity index 78% rename from recipes-ros/image-pipeline/image-view_1.11.6.bb rename to recipes-ros/image-pipeline/image-view_1.11.8.bb index f3417e0..4b48b63 100644 --- a/recipes-ros/image-pipeline/image-view_1.11.6.bb +++ b/recipes-ros/image-pipeline/image-view_1.11.8.bb @@ -6,5 +6,3 @@ 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" diff --git a/recipes-ros/image-pipeline/stereo-image-proc_1.11.6.bb b/recipes-ros/image-pipeline/stereo-image-proc_1.11.8.bb similarity index 100% rename from recipes-ros/image-pipeline/stereo-image-proc_1.11.6.bb rename to recipes-ros/image-pipeline/stereo-image-proc_1.11.8.bb