diff options
Diffstat (limited to 'dev-ros/image_cb_detector')
| -rw-r--r-- | dev-ros/image_cb_detector/Manifest | 8 | ||||
| -rw-r--r-- | dev-ros/image_cb_detector/files/boost170.patch | 13 | ||||
| -rw-r--r-- | dev-ros/image_cb_detector/files/py3.patch | 22 | ||||
| -rw-r--r-- | dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild (renamed from dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild) | 2 | ||||
| -rw-r--r-- | dev-ros/image_cb_detector/image_cb_detector-9999.ebuild | 2 |
5 files changed, 28 insertions, 19 deletions
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest index c6c2b6c8b55f..67acad4e901d 100644 --- a/dev-ros/image_cb_detector/Manifest +++ b/dev-ros/image_cb_detector/Manifest @@ -1,7 +1,7 @@ -AUX boost170.patch 551 BLAKE2B c98a11a8faa4c22d78e991bfa911b13bcf66fe3b8b8be2efce6ba723eb1a2226de9d73186c05073bf6b12f360a160f9fe00fe24f8c9e71120abbc58252d02a6b SHA512 e75225d990f7c56522b244f95bf812df565394a3a586b4d71032fb164ae77f351f43ed27af29aa4aed0f40e4ec613600f16a10281f47223b5cf65b2860df7777 AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498 AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb -DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40 -EBUILD image_cb_detector-0.10.14-r2.ebuild 978 BLAKE2B af4bab5f3112e05db7a08a986c45f0452d0d6b664951e41d30f9caffce2009bd252269fb3fcb27011b086e63e83cfc5f5728b617d5c6cfa5ae069f502f6035fb SHA512 18d98b0ed798270184200e4cb351da57de993256e366960a7d87dd5616241f5fcc63e29ff0e0bd83014c33fdc85d29ed3673006a5b1f449ade8301cb11b41e6e -EBUILD image_cb_detector-9999.ebuild 978 BLAKE2B af4bab5f3112e05db7a08a986c45f0452d0d6b664951e41d30f9caffce2009bd252269fb3fcb27011b086e63e83cfc5f5728b617d5c6cfa5ae069f502f6035fb SHA512 18d98b0ed798270184200e4cb351da57de993256e366960a7d87dd5616241f5fcc63e29ff0e0bd83014c33fdc85d29ed3673006a5b1f449ade8301cb11b41e6e +AUX py3.patch 747 BLAKE2B 73764cc8fbf4d8bd418a1c632a2b24bd5c1a80c7de94f5e06fb8d8ad30fb62947d7a349a3deb717669ced272c7c88edf5b5aa48ad3101e1ec67c5747cb099bec SHA512 d4009bc0fd12c597356351cb12d0bf95c963c41b9fe339dcd24c0230c21fe2d0b1a17f1de389eed13fc99ac950eeb8446170199c166067f2c7bcfd2daabb34e2 +DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894 +EBUILD image_cb_detector-0.10.15-r1.ebuild 973 BLAKE2B ab907c667d6362cbb1c7f94ed5779e45be611c142eb57ae8982bbb3975c90d549968bbea79c6895e41bb79eef28632f388b439ff171ed0c189589322f75ea215 SHA512 d92b9468016376bc8f1583390ce5e133946f0b9a9b819a3269915f40618578c3d86c45c60099cdebedc6061945c1dd48ae11f6488fc6d7624655c0c8fcc91902 +EBUILD image_cb_detector-9999.ebuild 973 BLAKE2B ab907c667d6362cbb1c7f94ed5779e45be611c142eb57ae8982bbb3975c90d549968bbea79c6895e41bb79eef28632f388b439ff171ed0c189589322f75ea215 SHA512 d92b9468016376bc8f1583390ce5e133946f0b9a9b819a3269915f40618578c3d86c45c60099cdebedc6061945c1dd48ae11f6488fc6d7624655c0c8fcc91902 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963 diff --git a/dev-ros/image_cb_detector/files/boost170.patch b/dev-ros/image_cb_detector/files/boost170.patch deleted file mode 100644 index f8ae562dadc5..000000000000 --- a/dev-ros/image_cb_detector/files/boost170.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: image_cb_detector/CMakeLists.txt -=================================================================== ---- image_cb_detector.orig/CMakeLists.txt -+++ image_cb_detector/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 2.8.3) - project(image_cb_detector) - --find_package(Boost REQUIRED thread signals) -+find_package(Boost REQUIRED thread) - find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs cv_bridge genmsg geometry_msgs image_transport message_filters roscpp sensor_msgs std_msgs) - find_package(OpenCV REQUIRED) - diff --git a/dev-ros/image_cb_detector/files/py3.patch b/dev-ros/image_cb_detector/files/py3.patch new file mode 100644 index 000000000000..54475afd66dc --- /dev/null +++ b/dev-ros/image_cb_detector/files/py3.patch @@ -0,0 +1,22 @@ +Index: image_cb_detector/src/image_cb_detector/cb_detector.py +=================================================================== +--- image_cb_detector.orig/src/image_cb_detector/cb_detector.py ++++ image_cb_detector/src/image_cb_detector/cb_detector.py +@@ -39,7 +39,7 @@ NAME = 'image_cb_detector_node' + import roslib; roslib.load_manifest(PKG) + + import rospy +-import cv ++import cv2 as cv + import math + + from sensor_msgs.msg import Image +@@ -130,7 +130,7 @@ class ImageCbDetectorNode: + #we need to convert the ros image to an opencv image + try: + image = self.bridge.imgmsg_to_cv(ros_image, "mono8") +- except CvBridgeError, e: ++ except CvBridgeError as e: + rospy.logerror("Error importing image %s" % e) + return + diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild index 505371176272..3cb98fba9da3 100644 --- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild +++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild @@ -30,4 +30,4 @@ DEPEND="${RDEPEND} dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " -PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" ) +PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" ) diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild index 505371176272..3cb98fba9da3 100644 --- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild +++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild @@ -30,4 +30,4 @@ DEPEND="${RDEPEND} dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " -PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" ) +PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" ) |