* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/
@ 2017-01-27 9:34 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-01-27 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 46c9a7464dd04c024f984e4ee45396cf733bfd3c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 09:22:20 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 09:34:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c9a746
dev-ros/image_cb_detector: Fix build with gcc6.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ros/image_cb_detector/files/gcc6.patch | 13 +++++++++++++
.../image_cb_detector/image_cb_detector-0.10.14-r1.ebuild | 3 ++-
dev-ros/image_cb_detector/image_cb_detector-9999.ebuild | 3 ++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/dev-ros/image_cb_detector/files/gcc6.patch b/dev-ros/image_cb_detector/files/gcc6.patch
new file mode 100644
index 00000000..af68c1e
--- /dev/null
+++ b/dev-ros/image_cb_detector/files/gcc6.patch
@@ -0,0 +1,13 @@
+Index: image_cb_detector/CMakeLists.txt
+===================================================================
+--- image_cb_detector.orig/CMakeLists.txt
++++ image_cb_detector/CMakeLists.txt
+@@ -24,7 +24,7 @@ catkin_package(INCLUDE_DIRS include
+
+ # define some includes
+ include_directories(include)
+-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}
++include_directories(${Boost_INCLUDE_DIRS}
+ ${catkin_INCLUDE_DIRS}
+ ${OpenCV_INCLUDE_DIRS}
+ )
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 5417220..972abdc 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,3 +29,4 @@ RDEPEND="
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.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 5417220..972abdc 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,3 +29,4 @@ RDEPEND="
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/
@ 2017-01-28 15:27 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-01-28 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 86155b599c5599a84831e1893214f65f3132a9e4
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 14:16:25 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 15:26:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86155b59
dev-ros/image_cb_detector: Fix build in C++11 mode.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ros/image_cb_detector/files/c11.patch | 13 +++++++++++++
.../image_cb_detector/image_cb_detector-0.10.14-r1.ebuild | 2 +-
dev-ros/image_cb_detector/image_cb_detector-9999.ebuild | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/dev-ros/image_cb_detector/files/c11.patch b/dev-ros/image_cb_detector/files/c11.patch
new file mode 100644
index 00000000..bddbce9
--- /dev/null
+++ b/dev-ros/image_cb_detector/files/c11.patch
@@ -0,0 +1,13 @@
+Index: image_cb_detector/src/rgbd_cb_detector_action.cpp
+===================================================================
+--- image_cb_detector.orig/src/rgbd_cb_detector_action.cpp
++++ image_cb_detector/src/rgbd_cb_detector_action.cpp
+@@ -143,7 +143,7 @@ public:
+ for(size_t i = 0; i< features.image_points.size(); i++){
+ geometry_msgs::Point pixel = features.image_points[i];
+ float depth = *(depth_ptr+width*(unsigned int)pixel.y+(unsigned int)pixel.x);
+- if ( isnan(depth) )
++ if ( std::isnan(depth) )
+ {
+ continue;
+ }
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 972abdc..59b223a 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
@@ -29,4 +29,4 @@ RDEPEND="
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.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 972abdc..59b223a 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -29,4 +29,4 @@ RDEPEND="
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/
@ 2019-08-28 17:24 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2019-08-28 17:24 UTC (permalink / raw
To: gentoo-commits
commit: c32cfbec3d05b6fbcfb1f557f1897a2af3f6a09e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 17:23:38 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 17:23:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32cfbec
dev-ros/image_cb_detector: fix build with boost 1.70
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/image_cb_detector/files/boost170.patch | 13 +++++++++++++
.../image_cb_detector/image_cb_detector-0.10.14-r1.ebuild | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/dev-ros/image_cb_detector/files/boost170.patch b/dev-ros/image_cb_detector/files/boost170.patch
new file mode 100644
index 00000000000..f8ae562dadc
--- /dev/null
+++ b/dev-ros/image_cb_detector/files/boost170.patch
@@ -0,0 +1,13 @@
+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/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 8b96da0e6b0..2502c78f860 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -29,4 +29,4 @@ RDEPEND="
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/
@ 2021-08-03 11:56 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2021-08-03 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 1f813f3ba4e70282f44e35fe4f38c60bd7c7631e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 11:54:49 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 11:56:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f813f3b
dev-ros/image_cb_detector: Remove old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/image_cb_detector/Manifest | 1 -
dev-ros/image_cb_detector/files/boost170.patch | 13 ---------
.../image_cb_detector-0.10.14-r2.ebuild | 33 ----------------------
3 files changed, 47 deletions(-)
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index 7d01d5458ac..3195e34ccbf 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -1,2 +1 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
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 f8ae562dadc..00000000000
--- 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/image_cb_detector-0.10.14-r2.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild
deleted file mode 100644
index 50537117627..00000000000
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from ROS images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
- dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
- media-libs/opencv:=
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
- dev-libs/boost:=[threads(+)]
-"
-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" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/
@ 2021-08-03 14:12 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2021-08-03 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 43acae5fae6ec15456039f9be02ddec40f916b67
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 13:46:20 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 14:12:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43acae5f
dev-ros/image_cb_detector: fix python script
Closes: https://bugs.gentoo.org/803011
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/image_cb_detector/files/py3.patch | 22 ++++++++++++++++++++++
....ebuild => image_cb_detector-0.10.15-r1.ebuild} | 2 +-
.../image_cb_detector-9999.ebuild | 2 +-
3 files changed, 24 insertions(+), 2 deletions(-)
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 00000000000..54475afd66d
--- /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.15.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
similarity index 91%
rename from dev-ros/image_cb_detector/image_cb_detector-0.10.15.ebuild
rename to dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
index 72b5cebfd88..3cb98fba9da 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.15.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" )
+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 72b5cebfd88..3cb98fba9da 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" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-03 14:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-28 17:24 [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2021-08-03 14:12 Alexis Ballier
2021-08-03 11:56 Alexis Ballier
2017-01-28 15:27 Alexis Ballier
2017-01-27 9:34 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox