Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/visp_bridge/, dev-ros/visp_bridge/files/
Date: Sat, 28 Jan 2017 15:53:52
Message-Id: 1485618818.dd3fd2c52b0a64b3371e534328f5baea43287177.aballier@gentoo
1 commit: dd3fd2c52b0a64b3371e534328f5baea43287177
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 28 15:39:52 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 28 15:53:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3fd2c5
7
8 dev-ros/visp_bridge: Bump to kinetic version and 0.9.3. Fix build with gcc6.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-ros/visp_bridge/Manifest | 1 +
13 dev-ros/visp_bridge/files/gcc6.patch | 13 +++++++++++++
14 .../{visp_bridge-9999.ebuild => visp_bridge-0.9.3.ebuild} | 7 ++++---
15 dev-ros/visp_bridge/visp_bridge-9999.ebuild | 7 ++++---
16 4 files changed, 22 insertions(+), 6 deletions(-)
17
18 diff --git a/dev-ros/visp_bridge/Manifest b/dev-ros/visp_bridge/Manifest
19 index bff3bdf..14f6b62 100644
20 --- a/dev-ros/visp_bridge/Manifest
21 +++ b/dev-ros/visp_bridge/Manifest
22 @@ -1,2 +1,3 @@
23 DIST vision_visp-0.8.0.tar.gz 1010996 SHA256 5166e1f17601328d09716879ceb66135e07bdb71a375765a937e3b78a12b0e54 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a WHIRLPOOL 015778e4cff63a9dbb5bf5812e38f7564b68cb71886e472062be15ec31a87a7299bff7ef9df50124294e22906420f60075cf6cc69f77df1cd29267b401f655e5
24 DIST vision_visp-0.9.1.tar.gz 1014625 SHA256 918bf731a2fab8bd9fa082c0d0f86800710c79eeb9ec5e8b0c8d5baaffb7988d SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e WHIRLPOOL 8af772091c1c3fec475f32ff0d7232b728b3154491c4ed56300221c0ca96661c63c19baa50d6cdf010d1ffc304049f0ea1e7f5c403f15fb028b1417e41ed88b4
25 +DIST vision_visp-0.9.3.tar.gz 1014883 SHA256 bf51470d167b1ee202dc55348ad54f6398f0f951b3af06fd32d0689b2fa98347 SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a WHIRLPOOL 9163c1aa27f405213aa7290d9e7ecb4b4f6d0daf79879708bd9246fac9eeb3c6b816de3505729b17cb72357e684bb7af9db6688441c42b279089fbdd8116acc0
26
27 diff --git a/dev-ros/visp_bridge/files/gcc6.patch b/dev-ros/visp_bridge/files/gcc6.patch
28 new file mode 100644
29 index 00000000..9840509
30 --- /dev/null
31 +++ b/dev-ros/visp_bridge/files/gcc6.patch
32 @@ -0,0 +1,13 @@
33 +Index: visp_bridge/CMakeLists.txt
34 +===================================================================
35 +--- visp_bridge.orig/CMakeLists.txt
36 ++++ visp_bridge/CMakeLists.txt
37 +@@ -36,7 +36,7 @@ catkin_package(
38 +
39 + include_directories(include)
40 +
41 +-include_directories(SYSTEM
42 ++include_directories(
43 + ${VISP_INCLUDE_DIRS}
44 + ${catkin_INCLUDE_DIRS}
45 + ${Boost_INCLUDE_DIRS}
46
47 diff --git a/dev-ros/visp_bridge/visp_bridge-9999.ebuild b/dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild
48 similarity index 79%
49 copy from dev-ros/visp_bridge/visp_bridge-9999.ebuild
50 copy to dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild
51 index 8569a26..978d1a7 100644
52 --- a/dev-ros/visp_bridge/visp_bridge-9999.ebuild
53 +++ b/dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild
54 @@ -1,11 +1,11 @@
55 -# Copyright 1999-2014 Gentoo Foundation
56 +# Copyright 1999-2017 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Id$
59
60 EAPI=5
61 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
62 KEYWORDS="~amd64 ~arm"
63 -VER_PREFIX="jade-"
64 +VER_PREFIX="kinetic-"
65 ROS_SUBDIR=${PN}
66
67 inherit ros-catkin
68 @@ -25,5 +25,6 @@ RDEPEND="
69 "
70 DEPEND="${RDEPEND}"
71 if [ "${PV#9999}" = "${PV}" ] ; then
72 - S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
73 + S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
74 fi
75 +PATCHES=( "${FILESDIR}/gcc6.patch" )
76
77 diff --git a/dev-ros/visp_bridge/visp_bridge-9999.ebuild b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
78 index 8569a26..978d1a7 100644
79 --- a/dev-ros/visp_bridge/visp_bridge-9999.ebuild
80 +++ b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
81 @@ -1,11 +1,11 @@
82 -# Copyright 1999-2014 Gentoo Foundation
83 +# Copyright 1999-2017 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 # $Id$
86
87 EAPI=5
88 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
89 KEYWORDS="~amd64 ~arm"
90 -VER_PREFIX="jade-"
91 +VER_PREFIX="kinetic-"
92 ROS_SUBDIR=${PN}
93
94 inherit ros-catkin
95 @@ -25,5 +25,6 @@ RDEPEND="
96 "
97 DEPEND="${RDEPEND}"
98 if [ "${PV#9999}" = "${PV}" ] ; then
99 - S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
100 + S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
101 fi
102 +PATCHES=( "${FILESDIR}/gcc6.patch" )