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