* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_view/files/, dev-ros/image_view/
@ 2016-03-08 10:31 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2016-03-08 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 0b49907c76bc20a9912fe4f70bb9789019fc31ba
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 10:31:36 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 8 10:31:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b49907c
dev-ros/image_view: fix build when installing for the first time
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/image_view/files/dynrec.patch | 15 +++++++++++++++
dev-ros/image_view/image_view-1.12.15.ebuild | 1 +
dev-ros/image_view/image_view-9999.ebuild | 1 +
3 files changed, 17 insertions(+)
diff --git a/dev-ros/image_view/files/dynrec.patch b/dev-ros/image_view/files/dynrec.patch
new file mode 100644
index 0000000..499888f
--- /dev/null
+++ b/dev-ros/image_view/files/dynrec.patch
@@ -0,0 +1,15 @@
+When installing for the first time, imp.find_module will fail.
+
+Index: image_pipeline-1.12.15/image_view/cfg/ImageView.cfg
+===================================================================
+--- image_pipeline-1.12.15.orig/image_view/cfg/ImageView.cfg
++++ image_pipeline-1.12.15/image_view/cfg/ImageView.cfg
+@@ -2,8 +2,6 @@
+
+ PACKAGE='image_view'
+ try:
+- import imp
+- imp.find_module(PACKAGE)
+ from dynamic_reconfigure.parameter_generator_catkin import *
+ except:
+ import roslib; roslib.load_manifest(PACKAGE)
diff --git a/dev-ros/image_view/image_view-1.12.15.ebuild b/dev-ros/image_view/image_view-1.12.15.ebuild
index 1f5b4dd..09ccaac 100644
--- a/dev-ros/image_view/image_view-1.12.15.ebuild
+++ b/dev-ros/image_view/image_view-1.12.15.ebuild
@@ -30,3 +30,4 @@ RDEPEND="
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/dynrec.patch" )
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
index 1f5b4dd..09ccaac 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-9999.ebuild
@@ -30,3 +30,4 @@ RDEPEND="
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/dynrec.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_view/files/, dev-ros/image_view/
@ 2017-01-23 12:28 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2017-01-23 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 9f224b06d4fcfe719b2881195d4673983884d483
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 12:27:56 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 12:28:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f224b06
dev-ros/image_view: Backport upstream patch to build with gcc6.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ros/image_view/files/gcc6.patch | 44 ++++++++++++++++++++++++++++
dev-ros/image_view/image_view-1.12.19.ebuild | 3 +-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/dev-ros/image_view/files/gcc6.patch b/dev-ros/image_view/files/gcc6.patch
new file mode 100644
index 00000000..8683c0f
--- /dev/null
+++ b/dev-ros/image_view/files/gcc6.patch
@@ -0,0 +1,44 @@
+commit 6c2d65452bd5fe62723988a1a570789921900d59
+Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Fri Sep 30 15:39:47 2016 +0200
+
+ address gcc6 build error
+
+ With gcc6, compiling fails with `stdlib.h: No such file or directory`,
+ as including '-isystem /usr/include' breaks with gcc6, cf.,
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
+
+ This commit addresses this issue for this package in the same way
+ it was addressed in various other ROS packages. A list of related
+ commits and pull requests is at:
+
+ https://github.com/ros/rosdistro/issues/12783
+
+ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+
+diff --git a/image_view/CMakeLists.txt b/image_view/CMakeLists.txt
+index 78b9eaa..93fabe7 100644
+--- a/image_view/CMakeLists.txt
++++ b/image_view/CMakeLists.txt
+@@ -8,9 +8,9 @@ catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
+ find_package(Boost REQUIRED COMPONENTS signals thread)
+ find_package(OpenCV REQUIRED)
+
+-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}
+- ${catkin_INCLUDE_DIRS}
+- ${OpenCV_INCLUDE_DIRS}
++include_directories(${Boost_INCLUDE_DIRS}
++ ${catkin_INCLUDE_DIRS}
++ ${OpenCV_INCLUDE_DIRS}
+ )
+
+ # Extra tools
+@@ -40,7 +40,7 @@ endif()
+
+ find_package(GTK2)
+ add_definitions(-DHAVE_GTK)
+-include_directories(SYSTEM ${GTK2_INCLUDE_DIRS})
++include_directories(${GTK2_INCLUDE_DIRS})
+
+ # Nodelet library
+ add_library(image_view src/nodelets/image_nodelet.cpp src/nodelets/disparity_nodelet.cpp src/nodelets/window_thread.cpp)
diff --git a/dev-ros/image_view/image_view-1.12.19.ebuild b/dev-ros/image_view/image_view-1.12.19.ebuild
index 5aabd03..1856fbb 100644
--- a/dev-ros/image_view/image_view-1.12.19.ebuild
+++ b/dev-ros/image_view/image_view-1.12.19.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$
@@ -31,3 +31,4 @@ RDEPEND="
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_view/files/, dev-ros/image_view/
@ 2019-08-28 17:02 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2019-08-28 17:02 UTC (permalink / raw
To: gentoo-commits
commit: cd6af72137f80578bb6d5c1863e168f779488f08
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 16:31:51 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 17:01:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6af721
dev-ros/image_view: 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_view/files/boost170.patch | 13 +++++++++++++
dev-ros/image_view/image_view-1.12.23.ebuild | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-ros/image_view/files/boost170.patch b/dev-ros/image_view/files/boost170.patch
new file mode 100644
index 00000000000..ab52d89c5fa
--- /dev/null
+++ b/dev-ros/image_view/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: image_view/CMakeLists.txt
+===================================================================
+--- image_view.orig/CMakeLists.txt
++++ image_view/CMakeLists.txt
+@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+ generate_dynamic_reconfigure_options(cfg/ImageView.cfg)
+
+ catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
+-find_package(Boost REQUIRED COMPONENTS signals thread)
++find_package(Boost REQUIRED COMPONENTS thread)
+ find_package(OpenCV REQUIRED)
+
+ include_directories(${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild
index 6835689f080..ef3403e5342 100644
--- a/dev-ros/image_view/image_view-1.12.23.ebuild
+++ b/dev-ros/image_view/image_view-1.12.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -31,3 +31,4 @@ RDEPEND="
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-28 17:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-23 12:28 [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_view/files/, dev-ros/image_view/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2019-08-28 17:02 Alexis Ballier
2016-03-08 10:31 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox