Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/ViSP/, sci-libs/ViSP/files/
Date: Wed, 23 Dec 2015 00:07:11
Message-Id: 1450829217.e73fe98675f7ced305dfb691e76cfa7633e633c4.aballier@gentoo
1 commit: e73fe98675f7ced305dfb691e76cfa7633e633c4
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 22 23:55:59 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 00:06:57 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73fe986
7
8 sci-libs/ViSP: bump to 3.0.0
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 sci-libs/ViSP/Manifest | 1 +
14 sci-libs/ViSP/ViSP-3.0.0.ebuild | 103 ++++++++++++++++++++++++++++
15 sci-libs/ViSP/files/ViSP-3.0.0-opencv.patch | 13 ++++
16 3 files changed, 117 insertions(+)
17
18 diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
19 index ee4b922..0d946b2 100644
20 --- a/sci-libs/ViSP/Manifest
21 +++ b/sci-libs/ViSP/Manifest
22 @@ -1 +1,2 @@
23 DIST ViSP-2.10.0.tar.gz 20745399 SHA256 1c8a37cadd0012526be9ceaa182eb21fb0d45aac622a1f0f2d255225e85797aa SHA512 485bad6aea1dddf51c1edd162e22f5f00205947b67b57843207902ea3b97b683828031338282861be495d66cc79bde3a7af09c075aa9c6b783652d5d3bd4f9ef WHIRLPOOL d3d7e29076231fd581346f7de37ef49afed22f48198673d08268b1a298121d8a9bd8a9bc6e34cf2a5655cf45575599b09c5cb56e78961340122ca6f95ee275e3
24 +DIST visp-3.0.0.tar.gz 22938301 SHA256 cac5c79b00ca9bc2eeaeacffdc6e3c6f88ee101ec16f729ad3058d37092bf05f SHA512 4ba522731ffbbb55082dc9e0cfecb6bd42ad0abff88d95bd7d33f233a9159139ddef032e087a03b261c8ee2d6bc0cf4807819a27fae11ea91ec0482038acecdc WHIRLPOOL ded182caea33af0393e2e545808f03626aaf9a5929a11781953518722a5b8fbeca9d24dafd55d789ab9a71c6005eb0491c80d76285434c61f7d67f9fac9751ed
25
26 diff --git a/sci-libs/ViSP/ViSP-3.0.0.ebuild b/sci-libs/ViSP/ViSP-3.0.0.ebuild
27 new file mode 100644
28 index 0000000..0f25727
29 --- /dev/null
30 +++ b/sci-libs/ViSP/ViSP-3.0.0.ebuild
31 @@ -0,0 +1,103 @@
32 +# Copyright 1999-2015 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI=5
37 +
38 +inherit cmake-utils
39 +
40 +DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
41 +HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
42 +SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
43 +
44 +LICENSE="GPL-2"
45 +SLOT="0/3"
46 +KEYWORDS="~amd64 ~arm"
47 +IUSE="
48 + +coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre
49 + ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
50 +"
51 +
52 +RDEPEND="
53 + coin? ( media-libs/coin virtual/opengl )
54 + dmtx? ( media-libs/libdmtx )
55 + ffmpeg? ( virtual/ffmpeg )
56 + gsl? ( sci-libs/gsl )
57 + ieee1394? ( media-libs/libdc1394 )
58 + jpeg? ( virtual/jpeg:0 )
59 + lapack? ( virtual/lapack )
60 + !qt4? ( motif? ( media-libs/SoXt ) )
61 + ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
62 + opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) )
63 + png? ( media-libs/libpng:0= )
64 + qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
65 + usb? ( virtual/libusb:1 )
66 + v4l? ( media-libs/libv4l )
67 + X? ( x11-libs/libX11 )
68 + xml? ( dev-libs/libxml2 )
69 + zbar? ( media-gfx/zbar )
70 + zlib? ( sys-libs/zlib )
71 +"
72 +DEPEND="${RDEPEND}
73 + doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
74 + virtual/pkgconfig
75 + test? ( sci-misc/ViSP-images )
76 + v4l? ( virtual/os-headers )"
77 +RDEPEND="${RDEPEND}
78 + demos? ( sci-misc/ViSP-images )"
79 +REQUIRED_USE="
80 + ffmpeg? ( opencv )
81 + ois? ( ogre )
82 + qt4? ( coin )
83 + motif? ( coin )
84 +"
85 +
86 +S="${WORKDIR}/visp-${PV}"
87 +PATCHES=( "${FILESDIR}/${P}-opencv.patch" )
88 +
89 +src_configure() {
90 + local mycmakeargs=(
91 + "-DBUILD_EXAMPLES=$(usex examples ON OFF)"
92 + "-DBUILD_TESTS=$(usex test ON OFF)"
93 + "-DBUILD_DEMOS=$(usex demos ON OFF)"
94 + "-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
95 + "-DUSE_COIN3D=$(usex coin ON OFF)"
96 + "-DUSE_DC1394=$(usex ieee1394 ON OFF)"
97 + "-DUSE_DMTX=$(usex dmtx ON OFF)"
98 + "-DUSE_FFMPEG=$(usex ffmpeg ON OFF)"
99 + "-DUSE_GSL=$(usex gsl ON OFF)"
100 + "-DUSE_LAPACK=$(usex lapack ON OFF)"
101 + "-DUSE_JPEG=$(usex jpeg ON OFF)"
102 + "-DUSE_PNG=$(usex png ON OFF)"
103 + "-DUSE_LIBUSB_1=$(usex usb ON OFF)"
104 + "-DUSE_OGRE=$(usex ogre ON OFF)"
105 + "-DUSE_OIS=$(usex ois ON OFF)"
106 + "-DUSE_OPENCV=$(usex opencv ON OFF)"
107 + "-DUSE_SOQT=$(usex qt4 ON OFF)"
108 + "-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)"
109 + "-DUSE_V4L2=$(usex v4l ON OFF)"
110 + "-DUSE_X11=$(usex X ON OFF)"
111 + "-DUSE_XML2=$(usex xml ON OFF)"
112 + "-DUSE_ZBAR=$(usex zbar ON OFF)"
113 + "-DUSE_ZLIB=$(usex zlib ON OFF)"
114 + "-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
115 + "-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
116 + )
117 + cmake-utils_src_configure
118 +}
119 +
120 +src_compile() {
121 + cmake-utils_src_compile
122 + cd "${BUILD_DIR}"
123 + use doc && emake visp_doc
124 +}
125 +
126 +src_install() {
127 + cmake-utils_src_install
128 + if use tutorials ; then
129 + dodoc -r tutorial
130 + docompress -x /usr/share/doc/${PF}/tutorial
131 + fi
132 + cd "${BUILD_DIR}"
133 + use doc && dohtml -r doc/html/*
134 +}
135
136 diff --git a/sci-libs/ViSP/files/ViSP-3.0.0-opencv.patch b/sci-libs/ViSP/files/ViSP-3.0.0-opencv.patch
137 new file mode 100644
138 index 0000000..7bd7705
139 --- /dev/null
140 +++ b/sci-libs/ViSP/files/ViSP-3.0.0-opencv.patch
141 @@ -0,0 +1,13 @@
142 +Index: visp-3.0.0/modules/core/CMakeLists.txt
143 +===================================================================
144 +--- visp-3.0.0.orig/modules/core/CMakeLists.txt
145 ++++ visp-3.0.0/modules/core/CMakeLists.txt
146 +@@ -172,7 +172,7 @@ if(USE_OPENCV)
147 + list(APPEND opt_libs ${OpenCV_LIBS})
148 + endif()
149 + list(APPEND opt_incs ${OpenCV_INCLUDE_DIRS})
150 +- #list(APPEND opt_libs ${OpenCV_LIBS})
151 ++ list(APPEND opt_libs ${OpenCV_LIBS})
152 + #MESSAGE("OpenCV_INCLUDE_DIRS = ${OpenCV_INCLUDE_DIRS}")
153 + #MESSAGE("OpenCV_LIBS = ${OpenCV_LIBS}")
154 + #MESSAGE("OpenCV_LIB_DIR = ${OpenCV_LIB_DIR}")