1 |
commit: 165c752d53b6d8ba6a9cd23daf79958c27d4c1c1 |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 28 09:57:09 2019 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 28 09:59:16 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=165c752d |
7 |
|
8 |
media-libs/opencv: Remove _ from useflags |
9 |
|
10 |
Closes: https://bugs.gentoo.org/695076 |
11 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
12 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
13 |
|
14 |
media-libs/opencv/metadata.xml | 12 +- |
15 |
media-libs/opencv/opencv-3.4.1-r5.ebuild | 503 --------------------- |
16 |
...encv-3.4.1-r6.ebuild => opencv-3.4.1-r7.ebuild} | 39 +- |
17 |
3 files changed, 25 insertions(+), 529 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml |
20 |
index e9ef881716d..a1403df457f 100644 |
21 |
--- a/media-libs/opencv/metadata.xml |
22 |
+++ b/media-libs/opencv/metadata.xml |
23 |
@@ -17,12 +17,12 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under |
24 |
<flag name="gdal">Enable support for sci-libs/gdal library</flag> |
25 |
<flag restrict=">=media-libs/opencv-3.1.0" name="gflags">Use Google's C++ argument parsing library</flag> |
26 |
<flag restrict=">=media-libs/opencv-3.1.0" name="glog">Use Google's C++ loggin library</flag> |
27 |
- <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_xfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag> |
28 |
- <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_cvv">CVV module requires Qt5</flag> |
29 |
- <flag restrict=">=media-libs/opencv-3.3.0" name="contrib_dnn">DNN module contrib requires tiny dnn</flag> |
30 |
- <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_hdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag> |
31 |
- <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_sfm">SFM module requires eigen, gflags, and glog</flag> |
32 |
- <flag restrict=">=media-libs/opencv-3.4.0" name="dnn_samples">Download dnn caffeemodel samples</flag> |
33 |
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribxfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag> |
34 |
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribcvv">CVV module requires Qt5</flag> |
35 |
+ <flag restrict=">=media-libs/opencv-3.3.0" name="contribdnn">DNN module contrib requires tiny dnn</flag> |
36 |
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribhdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag> |
37 |
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribsfm">SFM module requires eigen, gflags, and glog</flag> |
38 |
+ <flag restrict=">=media-libs/opencv-3.4.0" name="dnnsamples">Download dnn caffeemodel samples</flag> |
39 |
<flag name="opencl">Add support for OpenCL</flag> |
40 |
<flag restrict=">=media-libs/opencv-3.1.0" name="tesseract">Use Google's OCR Engine</flag> |
41 |
<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag> |
42 |
|
43 |
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild |
44 |
deleted file mode 100644 |
45 |
index 662a0e1a266..00000000000 |
46 |
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,503 +0,0 @@ |
49 |
-# Copyright 1999-2019 Gentoo Authors |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
- |
52 |
-EAPI=6 |
53 |
- |
54 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
55 |
- |
56 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
57 |
-inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib |
58 |
- |
59 |
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" |
60 |
-HOMEPAGE="https://opencv.org" |
61 |
-TINY_DNN_PV="1.0.0a3" |
62 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
63 |
- dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) |
64 |
- contrib? ( |
65 |
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz |
66 |
- contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz |
67 |
- https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz |
68 |
- ) |
69 |
- contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) |
70 |
- )" |
71 |
- |
72 |
-LICENSE="BSD" |
73 |
-SLOT="0/3.4.1" # subslot = libopencv* soname version |
74 |
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux" |
75 |
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" |
76 |
-# OpenGL needs gtk or Qt installed to activate, otherwise build system |
77 |
-# will silently disable it Wwithout the user knowing, which defeats the |
78 |
-# purpose of the opengl use flag. |
79 |
-REQUIRED_USE=" |
80 |
- cuda? ( tesseract? ( opencl ) ) |
81 |
- dnn_samples? ( examples ) |
82 |
- gflags? ( contrib ) |
83 |
- glog? ( contrib ) |
84 |
- contrib_cvv? ( contrib qt5 ) |
85 |
- contrib_dnn? ( contrib ) |
86 |
- contrib_hdf? ( contrib ) |
87 |
- contrib_sfm? ( contrib eigen gflags glog ) |
88 |
- contrib_xfeatures2d? ( contrib cuda ) |
89 |
- java? ( python ) |
90 |
- opengl? ( || ( gtk qt5 ) ) |
91 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
92 |
- tesseract? ( contrib )" |
93 |
- |
94 |
-# The following logic is intrinsic in the build system, but we do not enforce |
95 |
-# it on the useflags since this just blocks emerging pointlessly: |
96 |
-# gtk? ( !qt5 ) |
97 |
-# openmp? ( !threads ) |
98 |
- |
99 |
-RDEPEND=" |
100 |
- app-arch/bzip2[${MULTILIB_USEDEP}] |
101 |
- dev-libs/protobuf:=[${MULTILIB_USEDEP}] |
102 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
103 |
- cuda? ( dev-util/nvidia-cuda-toolkit:0= ) |
104 |
- contrib_hdf? ( sci-libs/hdf5 ) |
105 |
- ffmpeg? ( |
106 |
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) |
107 |
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
108 |
- ) |
109 |
- gdal? ( sci-libs/gdal:= ) |
110 |
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] ) |
111 |
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] ) |
112 |
- gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] ) |
113 |
- gstreamer? ( |
114 |
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
115 |
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] |
116 |
- ) |
117 |
- gtk? ( |
118 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
119 |
- x11-libs/gtk+:2[${MULTILIB_USEDEP}] |
120 |
- opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] ) |
121 |
- ) |
122 |
- ieee1394? ( |
123 |
- media-libs/libdc1394[${MULTILIB_USEDEP}] |
124 |
- sys-libs/libraw1394[${MULTILIB_USEDEP}] |
125 |
- ) |
126 |
- java? ( >=virtual/jre-1.6:* ) |
127 |
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) |
128 |
- lapack? ( virtual/lapack ) |
129 |
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) |
130 |
- openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) |
131 |
- opengl? ( |
132 |
- virtual/opengl[${MULTILIB_USEDEP}] |
133 |
- virtual/glu[${MULTILIB_USEDEP}] |
134 |
- ) |
135 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
136 |
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) |
137 |
- qt5? ( |
138 |
- dev-qt/qtgui:5 |
139 |
- dev-qt/qtwidgets:5 |
140 |
- dev-qt/qttest:5 |
141 |
- dev-qt/qtconcurrent:5 |
142 |
- opengl? ( dev-qt/qtopengl:5 ) |
143 |
- ) |
144 |
- tesseract? ( app-text/tesseract[opencl=] ) |
145 |
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] ) |
146 |
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
147 |
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) |
148 |
- vtk? ( sci-libs/vtk[rendering] ) |
149 |
- webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) |
150 |
- xine? ( media-libs/xine-lib )" |
151 |
-DEPEND="${RDEPEND} |
152 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
153 |
- contrib_dnn? ( dev-libs/cereal ) |
154 |
- eigen? ( dev-cpp/eigen:3 ) |
155 |
- java? ( >=virtual/jdk-1.6 ) |
156 |
- vaapi? ( x11-libs/libva )" |
157 |
- |
158 |
-MULTILIB_WRAPPED_HEADERS=( |
159 |
- /usr/include/opencv2/cvconfig.h |
160 |
- /usr/include/opencv2/opencv_modules.hpp |
161 |
- # [contrib_cvv] |
162 |
- /usr/include/opencv2/cvv.hpp |
163 |
- /usr/include/opencv2/cvv/call_meta_data.hpp |
164 |
- /usr/include/opencv2/cvv/cvv.hpp |
165 |
- /usr/include/opencv2/cvv/debug_mode.hpp |
166 |
- /usr/include/opencv2/cvv/dmatch.hpp |
167 |
- /usr/include/opencv2/cvv/filter.hpp |
168 |
- /usr/include/opencv2/cvv/final_show.hpp |
169 |
- /usr/include/opencv2/cvv/show_image.hpp |
170 |
- # [contrib_hdf] |
171 |
- /usr/include/opencv2/hdf.hpp |
172 |
- /usr/include/opencv2/hdf/hdf5.hpp |
173 |
- # [vtk] |
174 |
- /usr/include/opencv2/viz.hpp |
175 |
- /usr/include/opencv2/viz/types.hpp |
176 |
- /usr/include/opencv2/viz/viz3d.hpp |
177 |
- /usr/include/opencv2/viz/vizcore.hpp |
178 |
- /usr/include/opencv2/viz/widget_accessor.hpp |
179 |
- /usr/include/opencv2/viz/widgets.hpp |
180 |
- # [cudev] |
181 |
- /usr/include/opencv2/cudaarithm.hpp |
182 |
- /usr/include/opencv2/cudabgsegm.hpp |
183 |
- /usr/include/opencv2/cudacodec.hpp |
184 |
- /usr/include/opencv2/cudafeatures2d.hpp |
185 |
- /usr/include/opencv2/cudafilters.hpp |
186 |
- /usr/include/opencv2/cudaimgproc.hpp |
187 |
- /usr/include/opencv2/cudalegacy.hpp |
188 |
- /usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp |
189 |
- /usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp |
190 |
- /usr/include/opencv2/cudalegacy/NCV.hpp |
191 |
- /usr/include/opencv2/cudalegacy/NCVPyramid.hpp |
192 |
- /usr/include/opencv2/cudalegacy/NPP_staging.hpp |
193 |
- /usr/include/opencv2/cudaobjdetect.hpp |
194 |
- /usr/include/opencv2/cudaoptflow.hpp |
195 |
- /usr/include/opencv2/cudastereo.hpp |
196 |
- /usr/include/opencv2/cudawarping.hpp |
197 |
- /usr/include/opencv2/cudev/block/block.hpp |
198 |
- /usr/include/opencv2/cudev/block/detail/reduce.hpp |
199 |
- /usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp |
200 |
- /usr/include/opencv2/cudev/block/dynamic_smem.hpp |
201 |
- /usr/include/opencv2/cudev/block/reduce.hpp |
202 |
- /usr/include/opencv2/cudev/block/scan.hpp |
203 |
- /usr/include/opencv2/cudev/block/vec_distance.hpp |
204 |
- /usr/include/opencv2/cudev/common.hpp |
205 |
- /usr/include/opencv2/cudev/expr/binary_func.hpp |
206 |
- /usr/include/opencv2/cudev/expr/binary_op.hpp |
207 |
- /usr/include/opencv2/cudev/expr/color.hpp |
208 |
- /usr/include/opencv2/cudev/expr/deriv.hpp |
209 |
- /usr/include/opencv2/cudev/expr/expr.hpp |
210 |
- /usr/include/opencv2/cudev/expr/per_element_func.hpp |
211 |
- /usr/include/opencv2/cudev/expr/reduction.hpp |
212 |
- /usr/include/opencv2/cudev/expr/unary_func.hpp |
213 |
- /usr/include/opencv2/cudev/expr/unary_op.hpp |
214 |
- /usr/include/opencv2/cudev/expr/warping.hpp |
215 |
- /usr/include/opencv2/cudev/functional/color_cvt.hpp |
216 |
- /usr/include/opencv2/cudev/functional/detail/color_cvt.hpp |
217 |
- /usr/include/opencv2/cudev/functional/functional.hpp |
218 |
- /usr/include/opencv2/cudev/functional/tuple_adapter.hpp |
219 |
- /usr/include/opencv2/cudev/grid/copy.hpp |
220 |
- /usr/include/opencv2/cudev/grid/detail/copy.hpp |
221 |
- /usr/include/opencv2/cudev/grid/detail/histogram.hpp |
222 |
- /usr/include/opencv2/cudev/grid/detail/integral.hpp |
223 |
- /usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp |
224 |
- /usr/include/opencv2/cudev/grid/detail/pyr_down.hpp |
225 |
- /usr/include/opencv2/cudev/grid/detail/pyr_up.hpp |
226 |
- /usr/include/opencv2/cudev/grid/detail/reduce.hpp |
227 |
- /usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp |
228 |
- /usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp |
229 |
- /usr/include/opencv2/cudev/grid/detail/split_merge.hpp |
230 |
- /usr/include/opencv2/cudev/grid/detail/transform.hpp |
231 |
- /usr/include/opencv2/cudev/grid/detail/transpose.hpp |
232 |
- /usr/include/opencv2/cudev/grid/histogram.hpp |
233 |
- /usr/include/opencv2/cudev/grid/integral.hpp |
234 |
- /usr/include/opencv2/cudev/grid/pyramids.hpp |
235 |
- /usr/include/opencv2/cudev/grid/reduce.hpp |
236 |
- /usr/include/opencv2/cudev/grid/reduce_to_vec.hpp |
237 |
- /usr/include/opencv2/cudev/grid/split_merge.hpp |
238 |
- /usr/include/opencv2/cudev/grid/transform.hpp |
239 |
- /usr/include/opencv2/cudev/grid/transpose.hpp |
240 |
- /usr/include/opencv2/cudev.hpp |
241 |
- /usr/include/opencv2/cudev/ptr2d/constant.hpp |
242 |
- /usr/include/opencv2/cudev/ptr2d/deriv.hpp |
243 |
- /usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp |
244 |
- /usr/include/opencv2/cudev/ptr2d/extrapolation.hpp |
245 |
- /usr/include/opencv2/cudev/ptr2d/glob.hpp |
246 |
- /usr/include/opencv2/cudev/ptr2d/gpumat.hpp |
247 |
- /usr/include/opencv2/cudev/ptr2d/interpolation.hpp |
248 |
- /usr/include/opencv2/cudev/ptr2d/lut.hpp |
249 |
- /usr/include/opencv2/cudev/ptr2d/mask.hpp |
250 |
- /usr/include/opencv2/cudev/ptr2d/remap.hpp |
251 |
- /usr/include/opencv2/cudev/ptr2d/resize.hpp |
252 |
- /usr/include/opencv2/cudev/ptr2d/texture.hpp |
253 |
- /usr/include/opencv2/cudev/ptr2d/traits.hpp |
254 |
- /usr/include/opencv2/cudev/ptr2d/transform.hpp |
255 |
- /usr/include/opencv2/cudev/ptr2d/warping.hpp |
256 |
- /usr/include/opencv2/cudev/ptr2d/zip.hpp |
257 |
- /usr/include/opencv2/cudev/util/atomic.hpp |
258 |
- /usr/include/opencv2/cudev/util/detail/tuple.hpp |
259 |
- /usr/include/opencv2/cudev/util/detail/type_traits.hpp |
260 |
- /usr/include/opencv2/cudev/util/limits.hpp |
261 |
- /usr/include/opencv2/cudev/util/saturate_cast.hpp |
262 |
- /usr/include/opencv2/cudev/util/simd_functions.hpp |
263 |
- /usr/include/opencv2/cudev/util/tuple.hpp |
264 |
- /usr/include/opencv2/cudev/util/type_traits.hpp |
265 |
- /usr/include/opencv2/cudev/util/vec_math.hpp |
266 |
- /usr/include/opencv2/cudev/util/vec_traits.hpp |
267 |
- /usr/include/opencv2/cudev/warp/detail/reduce.hpp |
268 |
- /usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp |
269 |
- /usr/include/opencv2/cudev/warp/reduce.hpp |
270 |
- /usr/include/opencv2/cudev/warp/scan.hpp |
271 |
- /usr/include/opencv2/cudev/warp/shuffle.hpp |
272 |
- /usr/include/opencv2/cudev/warp/warp.hpp |
273 |
-) |
274 |
- |
275 |
-PATCHES=( |
276 |
- "${FILESDIR}/${PN}-3.0.0-gles.patch" |
277 |
- "${FILESDIR}/${PN}-3.4.0-disable-download.patch" |
278 |
- "${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530 |
279 |
- "${FILESDIR}/${P}-python-lib-suffix-hack.patch" |
280 |
- "${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch" |
281 |
- "${FILESDIR}/${P}-remove-git-autodetect.patch" |
282 |
- "${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576 |
283 |
- "${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900 |
284 |
- "${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104 |
285 |
-) |
286 |
- |
287 |
-pkg_pretend() { |
288 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
289 |
-} |
290 |
- |
291 |
-pkg_setup() { |
292 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
293 |
- java-pkg-opt-2_pkg_setup |
294 |
-} |
295 |
- |
296 |
-src_prepare() { |
297 |
- cmake-utils_src_prepare |
298 |
- |
299 |
- # remove bundled stuff |
300 |
- rm -rf 3rdparty || die "Removing 3rd party components failed" |
301 |
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ |
302 |
- -i CMakeLists.txt cmake/*cmake || die |
303 |
- |
304 |
- if use dnn_samples; then |
305 |
- mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die |
306 |
- fi |
307 |
- |
308 |
- if use contrib; then |
309 |
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die |
310 |
- eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch" |
311 |
- |
312 |
- if use contrib_xfeatures2d; then |
313 |
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die |
314 |
- fi |
315 |
- fi |
316 |
- |
317 |
- java-pkg-opt-2_src_prepare |
318 |
- |
319 |
- # this really belongs in src_prepare() too |
320 |
- JAVA_ANT_ENCODING="iso-8859-1" |
321 |
- # set encoding so even this cmake build will pick it up. |
322 |
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" |
323 |
- java-ant-2_src_configure |
324 |
-} |
325 |
- |
326 |
-multilib_src_configure() { |
327 |
- # please dont sort here, order is the same as in CMakeLists.txt |
328 |
- GLOBALCMAKEARGS=( |
329 |
- # Optional 3rd party components |
330 |
- # =================================================== |
331 |
- -DENABLE_DOWNLOAD=OFF |
332 |
- -DWITH_1394=$(usex ieee1394) |
333 |
- # -DWITH_AVFOUNDATION=OFF # IOS |
334 |
- -DWITH_VTK=$(multilib_native_usex vtk) |
335 |
- -DWITH_EIGEN=$(usex eigen) |
336 |
- -DWITH_VFW=OFF # Video windows support |
337 |
- -DWITH_FFMPEG=$(usex ffmpeg) |
338 |
- -DWITH_GSTREAMER=$(usex gstreamer) |
339 |
- -DWITH_GSTREAMER_0_10=OFF # Don't want this |
340 |
- -DWITH_GTK=$(usex gtk) |
341 |
- -DWITH_GTK_2_X=$(usex gtk) |
342 |
- -DWITH_IPP=OFF |
343 |
- -DWITH_JASPER=OFF |
344 |
- -DWITH_JPEG=$(usex jpeg) |
345 |
- -DWITH_WEBP=$(usex webp) |
346 |
- -DWITH_OPENEXR=$(usex openexr) |
347 |
- -DWITH_OPENGL=$(usex opengl) |
348 |
- -DWITH_OPENVX=OFF |
349 |
- -DWITH_OPENNI=OFF # Not packaged |
350 |
- -DWITH_OPENNI2=OFF # Not packaged |
351 |
- -DWITH_PNG=$(usex png) |
352 |
- -DWITH_GDCM=OFF |
353 |
- -DWITH_PVAPI=OFF |
354 |
- -DWITH_GIGEAPI=OFF |
355 |
- -DWITH_ARAVIS=OFF |
356 |
- -DWITH_QT=$(multilib_native_usex qt5 5 OFF) |
357 |
- -DWITH_WIN32UI=OFF # Windows only |
358 |
- # -DWITH_QUICKTIME=OFF |
359 |
- # -DWITH_QTKIT=OFF |
360 |
- -DWITH_TBB=$(usex threads) |
361 |
- -DWITH_OPENMP=$(usex openmp) |
362 |
- -DWITH_CSTRIPES=OFF |
363 |
- -DWITH_PTHREADS_PF=ON |
364 |
- -DWITH_TIFF=$(usex tiff) |
365 |
- -DWITH_UNICAP=OFF # Not packaged |
366 |
- -DWITH_V4L=$(usex v4l) |
367 |
- -DWITH_LIBV4L=$(usex v4l) |
368 |
- -DWITH_DSHOW=ON # direct show supp |
369 |
- -DWITH_MSMF=OFF |
370 |
- -DWITH_XIMEA=OFF # Windows only |
371 |
- -DWITH_XINE=$(multilib_native_usex xine) |
372 |
- -DWITH_CLP=OFF |
373 |
- -DWITH_OPENCL=$(usex opencl) |
374 |
- -DWITH_OPENCL_SVM=OFF |
375 |
- -DWITH_OPENCLAMDFFT=$(usex opencl) |
376 |
- -DWITH_OPENCLAMDBLAS=$(usex opencl) |
377 |
- -DWITH_DIRECTX=OFF |
378 |
- -DWITH_INTELPERC=OFF |
379 |
- -DWITH_IPP_A=OFF |
380 |
- -DWITH_MATLAB=OFF |
381 |
- -DWITH_VA=$(usex vaapi) |
382 |
- -DWITH_VA_INTEL=$(usex vaapi) |
383 |
- -DWITH_GDAL=$(multilib_native_usex gdal) |
384 |
- -DWITH_GPHOTO2=$(usex gphoto2) |
385 |
- -DWITH_LAPACK=$(multilib_native_usex lapack) |
386 |
- -DWITH_ITT=OFF # 3dparty libs itt_notify |
387 |
- # =================================================== |
388 |
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version |
389 |
- # =================================================== |
390 |
- -DWITH_CUDA=$(multilib_native_usex cuda) |
391 |
- -DWITH_CUBLAS=$(multilib_native_usex cuda) |
392 |
- -DWITH_CUFFT=$(multilib_native_usex cuda) |
393 |
- -DWITH_NVCUVID=OFF |
394 |
-# -DWITH_NVCUVID=$(usex cuda) |
395 |
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "") |
396 |
- # =================================================== |
397 |
- # OpenCV build components |
398 |
- # =================================================== |
399 |
- -DBUILD_SHARED_LIBS=ON |
400 |
- -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag |
401 |
- -DBUILD_ANDROID_EXAMPLES=OFF |
402 |
- -DBUILD_opencv_apps= |
403 |
- -DBUILD_DOCS=OFF # Doesn't install anyways. |
404 |
- -DBUILD_EXAMPLES=$(multilib_native_usex examples) |
405 |
- -DBUILD_PERF_TESTS=OFF |
406 |
- -DBUILD_TESTS=$(multilib_native_usex testprograms) |
407 |
- -DBUILD_WITH_DEBUG_INFO=$(usex debug) |
408 |
- # -DBUILD_WITH_STATIC_CRT=OFF |
409 |
- -DBUILD_WITH_DYNAMIC_IPP=OFF |
410 |
- -DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java) |
411 |
- # -DBUILD_ANDROID_SERVICE=OFF |
412 |
- -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda) |
413 |
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "") |
414 |
- # =================================================== |
415 |
- # OpenCV installation options |
416 |
- # =================================================== |
417 |
- -DINSTALL_CREATE_DISTRIB=OFF |
418 |
- -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples) |
419 |
- -DINSTALL_TESTS=$(multilib_native_usex testprograms) |
420 |
- -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples) |
421 |
- # -DINSTALL_ANDROID_EXAMPLES=OFF |
422 |
- -DINSTALL_TO_MANGLED_PATHS=OFF |
423 |
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX} |
424 |
- # to set its destination libdir |
425 |
- -DLIB_SUFFIX= |
426 |
- # =================================================== |
427 |
- # OpenCV build options |
428 |
- # =================================================== |
429 |
- -DENABLE_CCACHE=OFF |
430 |
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch) |
431 |
- -DENABLE_SOLUTION_FOLDERS=OFF |
432 |
- -DENABLE_PROFILING=OFF |
433 |
- -DENABLE_COVERAGE=OFF |
434 |
- |
435 |
- -DHAVE_opencv_java=$(multilib_native_usex java YES NO) |
436 |
- -DENABLE_NOISY_WARNINGS=OFF |
437 |
- -DOPENCV_WARNINGS_ARE_ERRORS=OFF |
438 |
- -DENABLE_IMPL_COLLECTION=OFF |
439 |
- -DENABLE_INSTRUMENTATION=OFF |
440 |
- -DGENERATE_ABI_DESCRIPTOR=OFF |
441 |
- -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF |
442 |
- # =================================================== |
443 |
- # things we want to be hard off or not yet figured out |
444 |
- # =================================================== |
445 |
- -DBUILD_PACKAGE=OFF |
446 |
- # =================================================== |
447 |
- # Not building protobuf but update files bug #631418 |
448 |
- # =================================================== |
449 |
- -DBUILD_PROTOBUF=OFF |
450 |
- -DPROTOBUF_UPDATE_FILES=ON |
451 |
- # =================================================== |
452 |
- # things we want to be hard enabled not worth useflag |
453 |
- # =================================================== |
454 |
- -DCMAKE_SKIP_RPATH=ON |
455 |
- -DOPENCV_DOC_INSTALL_PATH= |
456 |
- # ================================================== |
457 |
- # cpu flags, should solve 633900 |
458 |
- #=================================================== |
459 |
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON |
460 |
- -DCPU_DISPATCH= |
461 |
- -DENABLE_SSE=$(usex cpu_flags_x86_sse) |
462 |
- -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) |
463 |
- -DENABLE_SSE3=$(usex cpu_flags_x86_sse3) |
464 |
- -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3) |
465 |
- -DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1) |
466 |
- -DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2) |
467 |
- -DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt) |
468 |
- -DENABLE_AVX=$(usex cpu_flags_x86_avx) |
469 |
- -DENABLE_AVX2=$(usex cpu_flags_x86_avx2) |
470 |
- -DENABLE_FMA3=$(usex cpu_flags_x86_fma3) |
471 |
- ) |
472 |
- |
473 |
- # =================================================== |
474 |
- # OpenCV Contrib Modules |
475 |
- # =================================================== |
476 |
- if use contrib; then |
477 |
- GLOBALCMAKEARGS+=( |
478 |
- -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF) |
479 |
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}" |
480 |
- -DBUILD_opencv_dnns_easily_fooled=OFF |
481 |
- -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF) |
482 |
- -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF) |
483 |
- -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF) |
484 |
- -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF) |
485 |
- ) |
486 |
- |
487 |
- if multilib_is_native_abi; then |
488 |
- GLOBALCMAKEARGS+=( |
489 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract) |
490 |
- ) |
491 |
- else |
492 |
- GLOBALCMAKEARGS+=( |
493 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON |
494 |
- ) |
495 |
- fi |
496 |
- fi |
497 |
- |
498 |
- # workaround for bug 413429 |
499 |
- tc-export CC CXX |
500 |
- |
501 |
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]} |
502 |
- -DPYTHON_EXECUTABLE=OFF |
503 |
- -DINSTALL_PYTHON_EXAMPLES=OFF |
504 |
- ) |
505 |
- |
506 |
- cmake-utils_src_configure |
507 |
- |
508 |
- # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH} |
509 |
- # TODO patch ocv_download to copy files into destination dirs |
510 |
- if use contrib_dnn; then |
511 |
- mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die |
512 |
- cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die |
513 |
- fi |
514 |
- |
515 |
-} |
516 |
- |
517 |
-python_module_compile() { |
518 |
- local BUILD_DIR=${orig_BUILD_DIR} |
519 |
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]} ) |
520 |
- |
521 |
- # Set all python variables to load the correct Gentoo paths |
522 |
- mycmakeargs+=( |
523 |
- # python_setup alters PATH and sets this as wrapper |
524 |
- # to the correct interpreter we are building for |
525 |
- -DPYTHON_DEFAULT_EXECUTABLE=python |
526 |
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples) |
527 |
- -DLIBPY_SUFFIX=64 |
528 |
- ) |
529 |
- |
530 |
- # Regenerate cache file. Can't use rebuild_cache as it won't |
531 |
- # have the Gentoo specific options. |
532 |
- rm -rf CMakeCache.txt || die "rm failed" |
533 |
- cmake-utils_src_configure |
534 |
- cmake-utils_src_compile |
535 |
- cmake-utils_src_install |
536 |
- |
537 |
- # Remove compiled binary so new version compiles |
538 |
- # Avoid conflicts with new module builds as build system doesn't |
539 |
- # really support it. |
540 |
- rm -rf modules/python2 || die "rm failed" |
541 |
-} |
542 |
- |
543 |
-multilib_src_install() { |
544 |
- cmake-utils_src_install |
545 |
- |
546 |
- # Build and install the python modules for all targets |
547 |
- if multilib_is_native_abi && use python; then |
548 |
- local orig_BUILD_DIR=${BUILD_DIR} |
549 |
- python_foreach_impl python_module_compile |
550 |
- fi |
551 |
-} |
552 |
|
553 |
diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild |
554 |
similarity index 92% |
555 |
rename from media-libs/opencv/opencv-3.4.1-r6.ebuild |
556 |
rename to media-libs/opencv/opencv-3.4.1-r7.ebuild |
557 |
index 92376a497c4..3d7cf83a36e 100644 |
558 |
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild |
559 |
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild |
560 |
@@ -12,33 +12,33 @@ DESCRIPTION="A collection of algorithms and sample code for various computer vis |
561 |
HOMEPAGE="https://opencv.org" |
562 |
TINY_DNN_PV="1.0.0a3" |
563 |
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
564 |
- dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) |
565 |
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) |
566 |
contrib? ( |
567 |
https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz |
568 |
- contrib_dnn? ( |
569 |
+ contribdnn? ( |
570 |
https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz |
571 |
https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz |
572 |
) |
573 |
- contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) |
574 |
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) |
575 |
)" |
576 |
|
577 |
LICENSE="BSD" |
578 |
SLOT="0/3.4.1" # subslot = libopencv* soname version |
579 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" |
580 |
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" |
581 |
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" |
582 |
# OpenGL needs gtk or Qt installed to activate, otherwise build system |
583 |
# will silently disable it Wwithout the user knowing, which defeats the |
584 |
# purpose of the opengl use flag. |
585 |
REQUIRED_USE=" |
586 |
cuda? ( tesseract? ( opencl ) ) |
587 |
- dnn_samples? ( examples ) |
588 |
+ dnnsamples? ( examples ) |
589 |
gflags? ( contrib ) |
590 |
glog? ( contrib ) |
591 |
- contrib_cvv? ( contrib qt5 ) |
592 |
- contrib_dnn? ( contrib ) |
593 |
- contrib_hdf? ( contrib ) |
594 |
- contrib_sfm? ( contrib eigen gflags glog ) |
595 |
- contrib_xfeatures2d? ( contrib cuda ) |
596 |
+ contribcvv? ( contrib qt5 ) |
597 |
+ contribdnn? ( contrib ) |
598 |
+ contribhdf? ( contrib ) |
599 |
+ contribsfm? ( contrib eigen gflags glog ) |
600 |
+ contribxfeatures2d? ( contrib cuda ) |
601 |
java? ( python ) |
602 |
opengl? ( || ( gtk qt5 ) ) |
603 |
python? ( ${PYTHON_REQUIRED_USE} ) |
604 |
@@ -54,7 +54,7 @@ RDEPEND=" |
605 |
dev-libs/protobuf:=[${MULTILIB_USEDEP}] |
606 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
607 |
cuda? ( dev-util/nvidia-cuda-toolkit:0= ) |
608 |
- contrib_hdf? ( sci-libs/hdf5 ) |
609 |
+ contribhdf? ( sci-libs/hdf5 ) |
610 |
ffmpeg? ( |
611 |
libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) |
612 |
!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
613 |
@@ -103,7 +103,6 @@ RDEPEND=" |
614 |
xine? ( media-libs/xine-lib )" |
615 |
DEPEND="${RDEPEND} |
616 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
617 |
- contrib_dnn? ( dev-libs/cereal ) |
618 |
eigen? ( dev-cpp/eigen:3 ) |
619 |
java? ( >=virtual/jdk-1.6 ) |
620 |
vaapi? ( x11-libs/libva )" |
621 |
@@ -255,7 +254,7 @@ src_prepare() { |
622 |
sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ |
623 |
-i CMakeLists.txt cmake/*cmake || die |
624 |
|
625 |
- if use dnn_samples; then |
626 |
+ if use dnnsamples; then |
627 |
mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die |
628 |
fi |
629 |
|
630 |
@@ -263,7 +262,7 @@ src_prepare() { |
631 |
cd "${WORKDIR}/${PN}_contrib-${PV}" || die |
632 |
eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch" |
633 |
|
634 |
- if use contrib_xfeatures2d; then |
635 |
+ if use contribxfeatures2d; then |
636 |
mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die |
637 |
fi |
638 |
fi |
639 |
@@ -429,13 +428,13 @@ multilib_src_configure() { |
640 |
# =================================================== |
641 |
if use contrib; then |
642 |
GLOBALCMAKEARGS+=( |
643 |
- -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF) |
644 |
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF) |
645 |
-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}" |
646 |
-DBUILD_opencv_dnns_easily_fooled=OFF |
647 |
- -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF) |
648 |
- -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF) |
649 |
- -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF) |
650 |
- -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF) |
651 |
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF) |
652 |
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF) |
653 |
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF) |
654 |
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF) |
655 |
) |
656 |
|
657 |
if multilib_is_native_abi; then |
658 |
@@ -461,7 +460,7 @@ multilib_src_configure() { |
659 |
|
660 |
# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH} |
661 |
# TODO patch ocv_download to copy files into destination dirs |
662 |
- if use contrib_dnn; then |
663 |
+ if use contribdnn; then |
664 |
mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die |
665 |
cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die |
666 |
fi |