Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
Date: Fri, 01 Sep 2017 11:39:06
Message-Id: 1504265827.02d7a8a902caf91a4b7a7aa460beb87ff826c28f.amynka@gentoo
1 commit: 02d7a8a902caf91a4b7a7aa460beb87ff826c28f
2 Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 1 11:31:54 2017 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 1 11:37:07 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d7a8a9
7
8 media-libs/opencv: remove old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 media-libs/opencv/opencv-3.1.0-r6.ebuild | 295 ---------------------------
13 media-libs/opencv/opencv-3.1.0-r7.ebuild | 290 ---------------------------
14 media-libs/opencv/opencv-3.2.0.ebuild | 329 -------------------------------
15 3 files changed, 914 deletions(-)
16
17 diff --git a/media-libs/opencv/opencv-3.1.0-r6.ebuild b/media-libs/opencv/opencv-3.1.0-r6.ebuild
18 deleted file mode 100644
19 index 06daae20513..00000000000
20 --- a/media-libs/opencv/opencv-3.1.0-r6.ebuild
21 +++ /dev/null
22 @@ -1,295 +0,0 @@
23 -# Copyright 1999-2017 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=6
27 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
28 -
29 -inherit toolchain-funcs cmake-utils python-r1 java-pkg-opt-2 java-ant-2
30 -
31 -DESCRIPTION="A collection of algorithms and sample code for
32 - various computer vision problems"
33 -HOMEPAGE="http://opencv.org"
34 -
35 -BASE_URI="https://github.com/${PN}/${PN}"
36 -#commit from Thu, 02 Jun 2016
37 -CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376"
38 -CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}"
39 -
40 -SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz
41 - contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )"
42 -LICENSE="BSD"
43 -SLOT="0/3.1" # subslot = libopencv* soname version
44 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
45 -IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \
46 - ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
47 - +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \
48 - contrib_cvv contrib_hdf contrib_sfm"
49 -
50 -# OpenGL needs gtk or Qt installed to activate, otherwise build system
51 -# will silently disable it without the user knowing, which defeats the
52 -# purpose of the opengl use flag.
53 -REQUIRED_USE="
54 - cuda? ( tesseract? ( opencl ) )
55 - gflags? ( contrib )
56 - glog? ( contrib )
57 - contrib_cvv? ( contrib qt5 )
58 - contrib_hdf? ( contrib )
59 - contrib_sfm? ( contrib eigen gflags glog )
60 - opengl? ( || ( gtk qt5 ) )
61 - python? ( ${PYTHON_REQUIRED_USE} )
62 - tesseract? ( contrib )"
63 -
64 -# The following logic is intrinsic in the build system, but we do not enforce
65 -# it on the useflags since this just blocks emerging pointlessly:
66 -# gtk? ( !qt5 )
67 -# openmp? ( !threads )
68 -
69 -RDEPEND="
70 - app-arch/bzip2
71 - sys-libs/zlib
72 - cuda? ( dev-util/nvidia-cuda-toolkit:0= )
73 - ffmpeg? (
74 - libav? ( media-video/libav:0= )
75 - !libav? ( media-video/ffmpeg:0= )
76 - )
77 - gdal? ( sci-libs/gdal )
78 - gflags? ( dev-cpp/gflags )
79 - glog? ( dev-cpp/glog )
80 - gphoto2? ( media-libs/libgphoto2 )
81 - gstreamer? (
82 - media-libs/gstreamer:1.0
83 - media-libs/gst-plugins-base:1.0
84 - )
85 - gtk? (
86 - dev-libs/glib:2
87 - x11-libs/gtk+:2
88 - opengl? ( x11-libs/gtkglext )
89 - )
90 - java? ( >=virtual/jre-1.6:* )
91 - jpeg? ( virtual/jpeg:0 )
92 - jpeg2k? ( media-libs/jasper:= )
93 - ieee1394? (
94 - media-libs/libdc1394
95 - sys-libs/libraw1394
96 - )
97 - ipp? ( sci-libs/ipp )
98 - contrib_hdf? ( sci-libs/hdf5 )
99 - opencl? ( virtual/opencl )
100 - openexr? ( media-libs/openexr )
101 - opengl? ( virtual/opengl virtual/glu )
102 - png? ( media-libs/libpng:0= )
103 - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
104 - qt5? (
105 - dev-qt/qtgui:5
106 - dev-qt/qtwidgets:5
107 - dev-qt/qttest:5
108 - dev-qt/qtconcurrent:5
109 - opengl? ( dev-qt/qtopengl:5 )
110 - )
111 - tesseract? ( app-text/tesseract[opencl=] )
112 - threads? ( dev-cpp/tbb )
113 - tiff? ( media-libs/tiff:0 )
114 - v4l? ( >=media-libs/libv4l-0.8.3 )
115 - vtk? ( sci-libs/vtk[rendering] )
116 - webp? ( media-libs/libwebp )
117 - xine? ( media-libs/xine-lib )"
118 -DEPEND="${RDEPEND}
119 - virtual/pkgconfig
120 - eigen? ( dev-cpp/eigen:3 )
121 - java? ( >=virtual/jdk-1.6 )"
122 -
123 -PATCHES=(
124 - "${FILESDIR}"/${PN}-3.0.0-gles.patch
125 - "${FILESDIR}"/${P}-cmake-no-opengl.patch
126 - "${FILESDIR}"/${P}-git-autodetect.patch
127 - "${FILESDIR}"/${P}-java-magic.patch
128 - "${FILESDIR}"/${P}-gentooify-python.patch
129 - "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch
130 - "${FILESDIR}"/${P}-find-libraries-fix.patch
131 -)
132 -
133 -GLOBALCMAKEARGS=()
134 -
135 -pkg_pretend() {
136 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
137 -}
138 -
139 -pkg_setup() {
140 - java-pkg-opt-2_pkg_setup
141 -}
142 -
143 -src_prepare() {
144 - default
145 -
146 - # remove bundled stuff
147 - rm -rf 3rdparty || die "Removing 3rd party components failed"
148 - sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
149 - -i CMakeLists.txt cmake/*cmake || die
150 -
151 - java-pkg-opt-2_src_prepare
152 -}
153 -
154 -src_configure() {
155 - JAVA_ANT_ENCODING="iso-8859-1"
156 - # set encoding so even this cmake build will pick it up.
157 - export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
158 - java-ant-2_src_configure
159 -
160 - # please dont sort here, order is the same as in CMakeLists.txt
161 - GLOBALCMAKEARGS=(
162 - # Optional 3rd party components
163 - # ===================================================
164 - -DWITH_1394=$(usex ieee1394)
165 - -DWITH_AVFOUNDATION=OFF # IOS
166 - -DWITH_VTK=$(usex vtk)
167 - -DWITH_EIGEN=$(usex eigen)
168 - -DWITH_VFW=OFF # Video windows support
169 - -DWITH_FFMPEG=$(usex ffmpeg)
170 - -DWITH_GSTREAMER=$(usex gstreamer)
171 - -DWITH_GSTREAMER_0_10=OFF # Don't want this
172 - -DWITH_GTK=$(usex gtk)
173 - -DWITH_GTK_2_X=$(usex gtk)
174 - -DWITH_IPP=$(usex ipp)
175 - -DWITH_JASPER=$(usex jpeg2k)
176 - -DWITH_JPEG=$(usex jpeg)
177 - -DWITH_WEBP=$(usex webp)
178 - -DWITH_OPENEXR=$(usex openexr)
179 - -DWITH_OPENGL=$(usex opengl)
180 - -DWITH_OPENNI=OFF # Not packaged
181 - -DWITH_OPENNI2=OFF # Not packaged
182 - -DWITH_PNG=$(usex png)
183 - -DWITH_PVAPI=OFF # Not packaged
184 - -DWITH_GIGEAPI=OFF
185 - -DWITH_QT=$(usex qt5 5 OFF)
186 - -DWITH_WIN32UI=OFF # Windows only
187 - -DWITH_QUICKTIME=OFF
188 - -DWITH_TBB=$(usex threads)
189 - -DWITH_OPENMP=$(usex openmp)
190 - -DWITH_CSTRIPES=OFF
191 - -DWITH_PTHREADS_PF=ON
192 - -DWITH_TIFF=$(usex tiff)
193 - -DWITH_UNICAP=OFF # Not packaged
194 - -DWITH_V4L=$(usex v4l)
195 - -DWITH_LIBV4L=$(usex v4l)
196 - -DWITH_DSHOW=ON # direct show supp
197 - -DWITH_MSMF=OFF
198 - -DWITH_XIMEA=OFF # Windows only
199 - -DWITH_XINE=$(usex xine)
200 - -DWITH_CLP=OFF
201 - -DWITH_OPENCL=$(usex opencl)
202 - -DWITH_OPENCL_SVM=OFF
203 - -DWITH_OPENCLAMDFFT=$(usex opencl)
204 - -DWITH_OPENCLAMDBLAS=$(usex opencl)
205 - -DWITH_DIRECTX=OFF
206 - -DWITH_INTELPERC=OFF
207 - -DWITH_JAVA=$(usex java) # Ant needed, no compile flag
208 - -DWITH_IPP_A=OFF
209 - -DWITH_MATLAB=OFF
210 - -DWITH_VA=$(usex vaapi)
211 - -DWITH_VA_INTEL=$(usex vaapi)
212 - -DWITH_GDAL=$(usex gdal)
213 - -DWITH_GPHOTO2=$(usex gphoto2)
214 - # ===================================================
215 - # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
216 - # ===================================================
217 - -DWITH_CUDA=$(usex cuda)
218 - -DWITH_CUBLAS=$(usex cuda)
219 - -DWITH_CUFFT=$(usex cuda)
220 - -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
221 - # ===================================================
222 - # OpenCV build components
223 - # ===================================================
224 - -DBUILD_SHARED_LIBS=ON
225 - -DBUILD_ANDROID_EXAMPLES=OFF
226 - -DBUILD_DOCS=OFF # Doesn't install anyways.
227 - -DBUILD_EXAMPLES=$(usex examples)
228 - -DBUILD_PERF_TESTS=OFF
229 - -DBUILD_TESTS=$(usex testprograms)
230 - -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "")
231 - # ===================================================
232 - # OpenCV installation options
233 - # ===================================================
234 - -DINSTALL_C_EXAMPLES=$(usex examples)
235 - -DINSTALL_TESTS=$(usex testprograms)
236 - # ===================================================
237 - # OpenCV build options
238 - # ===================================================
239 - -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
240 - -DHAVE_opencv_java=$(usex java YES NO)
241 - # ===================================================
242 - # things we want to be hard off or not yet figured out
243 - # ===================================================
244 - -DBUILD_PACKAGE=OFF
245 - -DENABLE_PROFILING=OFF
246 - # ===================================================
247 - # things we want to be hard enabled not worth useflag
248 - # ===================================================
249 - -DCMAKE_SKIP_RPATH=ON
250 - -DOPENCV_DOC_INSTALL_PATH=
251 - )
252 -
253 - # ===================================================
254 - # OpenCV Contrib Modules
255 - # ===================================================
256 - if use contrib; then
257 - GLOBALCMAKEARGS+=(
258 - -DBUILD_opencv_dnn=OFF
259 - -DBUILD_opencv_dnns_easily_fooled=OFF
260 - -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
261 - -DBUILD_opencv_hdf=$(usex contrib_hdf ON OFF)
262 - -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
263 - )
264 - fi
265 -
266 - # workaround for bug 413429
267 - tc-export CC CXX
268 -
269 - local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
270 - -DWITH_PYTHON=OFF
271 - -DINSTALL_PYTHON_EXAMPLES=OFF
272 - )
273 -
274 - cmake-utils_src_configure
275 -}
276 -
277 -python_module_compile() {
278 - local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
279 -
280 - # Set all python variables to load the correct Gentoo paths
281 - mycmakeargs+=(
282 - -DWITH_PYTHON=ON
283 - -DGENTOO_PYTHON_EXECUTABLE=${EPYTHON}
284 - -DGENTOO_PYTHON_INCLUDE_PATH="$(python_get_includedir)"
285 - -DGENTOO_PYTHON_LIBRARIES="$(python_get_library_path)"
286 - -DGENTOO_PYTHON_PACKAGES_PATH="$(python_get_sitedir)"
287 - -DGENTOO_PYTHON_MAJOR=${EPYTHON:6:1}
288 - -DGENTOO_PYTHON_MINOR=${EPYTHON:8:1}
289 - -DGENTOO_PYTHON_DEBUG_LIBRARIES=""
290 - -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
291 - )
292 -
293 - # Compile and install all at once because configuration will be wiped
294 - # for each impl of Python
295 - BUILD_DIR="${WORKDIR}"/${P}_build
296 - cd "${BUILD_DIR}" || die "cd failed"
297 -
298 - # Regenerate cache file. Can't use rebuild_cache as it won't
299 - # have the Gentoo specific options.
300 - rm -rf CMakeCache.txt || die "rm failed"
301 - cmake-utils_src_configure
302 - cmake-utils_src_compile
303 - cmake-utils_src_install
304 -
305 - # Remove compiled binary so new version compiles
306 - # Avoid conflicts with new module builds as build system doesn't
307 - # really support it.
308 - emake -C modules/${EPYTHON:0:7} clean
309 - rm -rf modules/${EPYTHON:0:7} || die "rm failed"
310 -}
311 -
312 -src_install() {
313 - cmake-utils_src_install
314 -
315 - # Build and install the python modules for all targets
316 - use python && python_foreach_impl python_module_compile
317 -}
318
319 diff --git a/media-libs/opencv/opencv-3.1.0-r7.ebuild b/media-libs/opencv/opencv-3.1.0-r7.ebuild
320 deleted file mode 100644
321 index 41aa05a2ab7..00000000000
322 --- a/media-libs/opencv/opencv-3.1.0-r7.ebuild
323 +++ /dev/null
324 @@ -1,290 +0,0 @@
325 -# Copyright 1999-2017 Gentoo Foundation
326 -# Distributed under the terms of the GNU General Public License v2
327 -
328 -EAPI=6
329 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
330 -
331 -inherit toolchain-funcs cmake-utils python-r1 java-pkg-opt-2 java-ant-2
332 -
333 -DESCRIPTION="A collection of algorithms and sample code for
334 - various computer vision problems"
335 -HOMEPAGE="http://opencv.org"
336 -
337 -BASE_URI="https://github.com/${PN}/${PN}"
338 -#commit from Thu, 02 Jun 2016
339 -CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376"
340 -CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}"
341 -
342 -SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz
343 - contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )"
344 -LICENSE="BSD"
345 -SLOT="0/3.1" # subslot = libopencv* soname version
346 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
347 -IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \
348 - ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
349 - +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \
350 - contrib_cvv contrib_hdf contrib_sfm"
351 -
352 -# OpenGL needs gtk or Qt installed to activate, otherwise build system
353 -# will silently disable it without the user knowing, which defeats the
354 -# purpose of the opengl use flag.
355 -REQUIRED_USE="
356 - cuda? ( tesseract? ( opencl ) )
357 - gflags? ( contrib )
358 - glog? ( contrib )
359 - contrib_cvv? ( contrib qt5 )
360 - contrib_hdf? ( contrib )
361 - contrib_sfm? ( contrib eigen gflags glog )
362 - opengl? ( || ( gtk qt5 ) )
363 - python? ( ${PYTHON_REQUIRED_USE} )
364 - tesseract? ( contrib )"
365 -
366 -# The following logic is intrinsic in the build system, but we do not enforce
367 -# it on the useflags since this just blocks emerging pointlessly:
368 -# gtk? ( !qt5 )
369 -# openmp? ( !threads )
370 -
371 -RDEPEND="
372 - app-arch/bzip2
373 - sys-libs/zlib
374 - cuda? ( dev-util/nvidia-cuda-toolkit:0= )
375 - ffmpeg? (
376 - libav? ( media-video/libav:0= )
377 - !libav? ( media-video/ffmpeg:0= )
378 - )
379 - gdal? ( sci-libs/gdal )
380 - gflags? ( dev-cpp/gflags )
381 - glog? ( dev-cpp/glog )
382 - gphoto2? ( media-libs/libgphoto2 )
383 - gstreamer? (
384 - media-libs/gstreamer:1.0
385 - media-libs/gst-plugins-base:1.0
386 - )
387 - gtk? (
388 - dev-libs/glib:2
389 - x11-libs/gtk+:2
390 - opengl? ( x11-libs/gtkglext )
391 - )
392 - java? ( >=virtual/jre-1.6:* )
393 - jpeg? ( virtual/jpeg:0 )
394 - jpeg2k? ( media-libs/jasper:= )
395 - ieee1394? (
396 - media-libs/libdc1394
397 - sys-libs/libraw1394
398 - )
399 - ipp? ( sci-libs/ipp )
400 - contrib_hdf? ( sci-libs/hdf5 )
401 - opencl? ( virtual/opencl )
402 - openexr? ( media-libs/openexr )
403 - opengl? ( virtual/opengl virtual/glu )
404 - png? ( media-libs/libpng:0= )
405 - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
406 - qt5? (
407 - dev-qt/qtgui:5
408 - dev-qt/qtwidgets:5
409 - dev-qt/qttest:5
410 - dev-qt/qtconcurrent:5
411 - opengl? ( dev-qt/qtopengl:5 )
412 - )
413 - tesseract? ( app-text/tesseract[opencl=] )
414 - threads? ( dev-cpp/tbb )
415 - tiff? ( media-libs/tiff:0 )
416 - v4l? ( >=media-libs/libv4l-0.8.3 )
417 - vtk? ( sci-libs/vtk[rendering] )
418 - webp? ( media-libs/libwebp )
419 - xine? ( media-libs/xine-lib )"
420 -DEPEND="${RDEPEND}
421 - virtual/pkgconfig
422 - eigen? ( dev-cpp/eigen:3 )
423 - java? ( >=virtual/jdk-1.6 )"
424 -
425 -PATCHES=(
426 - "${FILESDIR}"/${PN}-3.0.0-gles.patch
427 - "${FILESDIR}"/${P}-cmake-no-opengl.patch
428 - "${FILESDIR}"/${P}-git-autodetect.patch
429 - "${FILESDIR}"/${P}-java-magic.patch
430 - "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch
431 - "${FILESDIR}"/${P}-find-libraries-fix.patch
432 -)
433 -
434 -GLOBALCMAKEARGS=()
435 -
436 -pkg_pretend() {
437 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
438 -}
439 -
440 -pkg_setup() {
441 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
442 - java-pkg-opt-2_pkg_setup
443 -}
444 -
445 -src_prepare() {
446 - cmake-utils_src_prepare
447 -
448 - # remove bundled stuff
449 - rm -rf 3rdparty || die "Removing 3rd party components failed"
450 - sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
451 - -i CMakeLists.txt cmake/*cmake || die
452 -
453 - java-pkg-opt-2_src_prepare
454 -}
455 -
456 -src_configure() {
457 - JAVA_ANT_ENCODING="iso-8859-1"
458 - # set encoding so even this cmake build will pick it up.
459 - export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
460 - java-ant-2_src_configure
461 -
462 - # please dont sort here, order is the same as in CMakeLists.txt
463 - GLOBALCMAKEARGS=(
464 - # Optional 3rd party components
465 - # ===================================================
466 - -DWITH_1394=$(usex ieee1394)
467 - -DWITH_AVFOUNDATION=OFF # IOS
468 - -DWITH_VTK=$(usex vtk)
469 - -DWITH_EIGEN=$(usex eigen)
470 - -DWITH_VFW=OFF # Video windows support
471 - -DWITH_FFMPEG=$(usex ffmpeg)
472 - -DWITH_GSTREAMER=$(usex gstreamer)
473 - -DWITH_GSTREAMER_0_10=OFF # Don't want this
474 - -DWITH_GTK=$(usex gtk)
475 - -DWITH_GTK_2_X=$(usex gtk)
476 - -DWITH_IPP=$(usex ipp)
477 - -DWITH_JASPER=$(usex jpeg2k)
478 - -DWITH_JPEG=$(usex jpeg)
479 - -DWITH_WEBP=$(usex webp)
480 - -DWITH_OPENEXR=$(usex openexr)
481 - -DWITH_OPENGL=$(usex opengl)
482 - -DWITH_OPENNI=OFF # Not packaged
483 - -DWITH_OPENNI2=OFF # Not packaged
484 - -DWITH_PNG=$(usex png)
485 - -DWITH_PVAPI=OFF # Not packaged
486 - -DWITH_GIGEAPI=OFF
487 - -DWITH_QT=$(usex qt5 5 OFF)
488 - -DWITH_WIN32UI=OFF # Windows only
489 - -DWITH_QUICKTIME=OFF
490 - -DWITH_TBB=$(usex threads)
491 - -DWITH_OPENMP=$(usex openmp)
492 - -DWITH_CSTRIPES=OFF
493 - -DWITH_PTHREADS_PF=ON
494 - -DWITH_TIFF=$(usex tiff)
495 - -DWITH_UNICAP=OFF # Not packaged
496 - -DWITH_V4L=$(usex v4l)
497 - -DWITH_LIBV4L=$(usex v4l)
498 - -DWITH_DSHOW=ON # direct show supp
499 - -DWITH_MSMF=OFF
500 - -DWITH_XIMEA=OFF # Windows only
501 - -DWITH_XINE=$(usex xine)
502 - -DWITH_CLP=OFF
503 - -DWITH_OPENCL=$(usex opencl)
504 - -DWITH_OPENCL_SVM=OFF
505 - -DWITH_OPENCLAMDFFT=$(usex opencl)
506 - -DWITH_OPENCLAMDBLAS=$(usex opencl)
507 - -DWITH_DIRECTX=OFF
508 - -DWITH_INTELPERC=OFF
509 - -DWITH_JAVA=$(usex java) # Ant needed, no compile flag
510 - -DWITH_IPP_A=OFF
511 - -DWITH_MATLAB=OFF
512 - -DWITH_VA=$(usex vaapi)
513 - -DWITH_VA_INTEL=$(usex vaapi)
514 - -DWITH_GDAL=$(usex gdal)
515 - -DWITH_GPHOTO2=$(usex gphoto2)
516 - # ===================================================
517 - # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
518 - # ===================================================
519 - -DWITH_CUDA=$(usex cuda)
520 - -DWITH_CUBLAS=$(usex cuda)
521 - -DWITH_CUFFT=$(usex cuda)
522 - -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
523 - # ===================================================
524 - # OpenCV build components
525 - # ===================================================
526 - -DBUILD_SHARED_LIBS=ON
527 - -DBUILD_ANDROID_EXAMPLES=OFF
528 - -DBUILD_DOCS=OFF # Doesn't install anyways.
529 - -DBUILD_EXAMPLES=$(usex examples)
530 - -DBUILD_PERF_TESTS=OFF
531 - -DBUILD_TESTS=$(usex testprograms)
532 - -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "")
533 - # ===================================================
534 - # OpenCV installation options
535 - # ===================================================
536 - -DINSTALL_C_EXAMPLES=$(usex examples)
537 - -DINSTALL_TESTS=$(usex testprograms)
538 - # ===================================================
539 - # OpenCV build options
540 - # ===================================================
541 - -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
542 - -DHAVE_opencv_java=$(usex java YES NO)
543 - # ===================================================
544 - # things we want to be hard off or not yet figured out
545 - # ===================================================
546 - -DBUILD_PACKAGE=OFF
547 - -DENABLE_PROFILING=OFF
548 - # ===================================================
549 - # things we want to be hard enabled not worth useflag
550 - # ===================================================
551 - -DCMAKE_SKIP_RPATH=ON
552 - -DOPENCV_DOC_INSTALL_PATH=
553 - )
554 -
555 - # ===================================================
556 - # OpenCV Contrib Modules
557 - # ===================================================
558 - if use contrib; then
559 - GLOBALCMAKEARGS+=(
560 - -DBUILD_opencv_dnn=OFF
561 - -DBUILD_opencv_dnns_easily_fooled=OFF
562 - -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
563 - -DBUILD_opencv_hdf=$(usex contrib_hdf ON OFF)
564 - -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
565 - )
566 - fi
567 -
568 - # workaround for bug 413429
569 - tc-export CC CXX
570 -
571 - local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
572 - -DPYTHON_EXECUTABLE=OFF
573 - -DINSTALL_PYTHON_EXAMPLES=OFF
574 - )
575 -
576 - cmake-utils_src_configure
577 -}
578 -
579 -python_module_compile() {
580 - local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
581 -
582 - # Set all python variables to load the correct Gentoo paths
583 - mycmakeargs+=(
584 - # upstream doesn't really care about 2/3, and if we don't
585 - # disable this, it builds python2 + python3 module for the same
586 - # version of Python 3 (i.e. two identical modules)...
587 - -DPYTHON3_EXECUTABLE=/bin/false
588 - -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
589 - )
590 -
591 - # Compile and install all at once because configuration will be wiped
592 - # for each impl of Python
593 - BUILD_DIR="${WORKDIR}"/${P}_build
594 - cd "${BUILD_DIR}" || die "cd failed"
595 -
596 - # Regenerate cache file. Can't use rebuild_cache as it won't
597 - # have the Gentoo specific options.
598 - rm -rf CMakeCache.txt || die "rm failed"
599 - cmake-utils_src_configure
600 - cmake-utils_src_compile
601 - cmake-utils_src_install
602 -
603 - # Remove compiled binary so new version compiles
604 - # Avoid conflicts with new module builds as build system doesn't
605 - # really support it.
606 - rm -rf modules/python2 || die "rm failed"
607 -}
608 -
609 -src_install() {
610 - cmake-utils_src_install
611 -
612 - # Build and install the python modules for all targets
613 - use python && python_foreach_impl python_module_compile
614 -}
615
616 diff --git a/media-libs/opencv/opencv-3.2.0.ebuild b/media-libs/opencv/opencv-3.2.0.ebuild
617 deleted file mode 100644
618 index 4f91336a398..00000000000
619 --- a/media-libs/opencv/opencv-3.2.0.ebuild
620 +++ /dev/null
621 @@ -1,329 +0,0 @@
622 -# Copyright 1999-2017 Gentoo Foundation
623 -# Distributed under the terms of the GNU General Public License v2
624 -
625 -EAPI=6
626 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
627 -
628 -inherit toolchain-funcs cmake-utils python-r1 java-pkg-opt-2 java-ant-2
629 -
630 -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
631 -HOMEPAGE="http://opencv.org"
632 -
633 -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
634 - contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
635 - contrib_xfeatures2d? ( http://dev.gentoo.org/~amynka/snap/vgg_boostdesc-${PV}.tar.gz ) )"
636 -LICENSE="BSD"
637 -SLOT="0/3.2" # subslot = libopencv* soname version
638 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
639 -IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
640 -
641 -# OpenGL needs gtk or Qt installed to activate, otherwise build system
642 -# will silently disable it without the user knowing, which defeats the
643 -# purpose of the opengl use flag.
644 -REQUIRED_USE="
645 - cuda? ( tesseract? ( opencl ) )
646 - gflags? ( contrib )
647 - glog? ( contrib )
648 - contrib_cvv? ( contrib qt5 )
649 - contrib_hdf? ( contrib )
650 - contrib_sfm? ( contrib eigen gflags glog )
651 - opengl? ( || ( gtk qt5 ) )
652 - python? ( ${PYTHON_REQUIRED_USE} )
653 - tesseract? ( contrib )"
654 -
655 -# The following logic is intrinsic in the build system, but we do not enforce
656 -# it on the useflags since this just blocks emerging pointlessly:
657 -# gtk? ( !qt5 )
658 -# openmp? ( !threads )
659 -
660 -RDEPEND="
661 - app-arch/bzip2
662 - sys-libs/zlib
663 - cuda? ( dev-util/nvidia-cuda-toolkit:0= )
664 - contrib_hdf? ( sci-libs/hdf5 )
665 - ffmpeg? (
666 - libav? ( media-video/libav:0= )
667 - !libav? ( media-video/ffmpeg:0= )
668 - )
669 - gdal? ( sci-libs/gdal:= )
670 - gflags? ( dev-cpp/gflags )
671 - glog? ( dev-cpp/glog )
672 - gphoto2? ( media-libs/libgphoto2 )
673 - gstreamer? (
674 - media-libs/gstreamer:1.0
675 - media-libs/gst-plugins-base:1.0
676 - )
677 - gtk? (
678 - dev-libs/glib:2
679 - x11-libs/gtk+:2
680 - opengl? ( x11-libs/gtkglext )
681 - )
682 - ieee1394? (
683 - media-libs/libdc1394
684 - sys-libs/libraw1394
685 - )
686 - ipp? ( sci-libs/ipp )
687 - java? ( >=virtual/jre-1.6:* )
688 - jpeg? ( virtual/jpeg:0 )
689 - jpeg2k? ( media-libs/jasper:= )
690 - lapack? ( virtual/lapack )
691 - opencl? ( virtual/opencl )
692 - openexr? ( media-libs/openexr )
693 - opengl? ( virtual/opengl virtual/glu )
694 - png? ( media-libs/libpng:0= )
695 - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
696 - qt5? (
697 - dev-qt/qtgui:5
698 - dev-qt/qtwidgets:5
699 - dev-qt/qttest:5
700 - dev-qt/qtconcurrent:5
701 - opengl? ( dev-qt/qtopengl:5 )
702 - )
703 - tesseract? ( app-text/tesseract[opencl=] )
704 - threads? ( dev-cpp/tbb )
705 - tiff? ( media-libs/tiff:0 )
706 - v4l? ( >=media-libs/libv4l-0.8.3 )
707 - vtk? ( sci-libs/vtk[rendering] )
708 - webp? ( media-libs/libwebp )
709 - xine? ( media-libs/xine-lib )"
710 -DEPEND="${RDEPEND}
711 - virtual/pkgconfig
712 - eigen? ( dev-cpp/eigen:3 )
713 - java? ( >=virtual/jdk-1.6 )"
714 -
715 -PATCHES=(
716 - "${FILESDIR}/${PN}-3.0.0-gles.patch"
717 - "${FILESDIR}/${PN}-3.1.0-java-magic.patch"
718 - "${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
719 - "${FILESDIR}/${P}-vtk.patch"
720 -)
721 -
722 -pkg_pretend() {
723 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
724 -}
725 -
726 -pkg_setup() {
727 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
728 - java-pkg-opt-2_pkg_setup
729 -}
730 -
731 -src_prepare() {
732 - cmake-utils_src_prepare
733 -
734 - # remove bundled stuff
735 - rm -rf 3rdparty || die "Removing 3rd party components failed"
736 - sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
737 - -i CMakeLists.txt cmake/*cmake || die
738 -
739 - if use contrib && use contrib_xfeatures2d; then
740 - cd "${WORKDIR}/${PN}_contrib-${PV}" || die
741 - eapply "${FILESDIR}/${P}-contrib_xfeatures2d-autodownload.patch"
742 - mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
743 - fi
744 -
745 - java-pkg-opt-2_src_prepare
746 -}
747 -
748 -src_configure() {
749 - JAVA_ANT_ENCODING="iso-8859-1"
750 - # set encoding so even this cmake build will pick it up.
751 - export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
752 - java-ant-2_src_configure
753 -
754 - # please dont sort here, order is the same as in CMakeLists.txt
755 - GLOBALCMAKEARGS=(
756 - # Optional 3rd party components
757 - # ===================================================
758 - -DWITH_1394=$(usex ieee1394)
759 - # -DWITH_AVFOUNDATION=OFF # IOS
760 - -DWITH_VTK=$(usex vtk)
761 - -DWITH_EIGEN=$(usex eigen)
762 - -DWITH_VFW=OFF # Video windows support
763 - -DWITH_FFMPEG=$(usex ffmpeg)
764 - -DWITH_GSTREAMER=$(usex gstreamer)
765 - -DWITH_GSTREAMER_0_10=OFF # Don't want this
766 - -DWITH_GTK=$(usex gtk)
767 - -DWITH_GTK_2_X=$(usex gtk)
768 - -DWITH_IPP=$(usex ipp)
769 - -DWITH_JASPER=$(usex jpeg2k)
770 - -DWITH_JPEG=$(usex jpeg)
771 - -DWITH_WEBP=$(usex webp)
772 - -DWITH_OPENEXR=$(usex openexr)
773 - -DWITH_OPENGL=$(usex opengl)
774 - -DWITH_OPENVX=OFF
775 - -DWITH_OPENNI=OFF # Not packaged
776 - -DWITH_OPENNI2=OFF # Not packaged
777 - -DWITH_PNG=$(usex png)
778 - -DWITH_GDCM=OFF
779 - -DWITH_PVAPI=OFF
780 - -DWITH_GIGEAPI=OFF
781 - -DWITH_ARAVIS=OFF
782 - -DWITH_QT=$(usex qt5 5 OFF)
783 - -DWITH_WIN32UI=OFF # Windows only
784 - # -DWITH_QUICKTIME=OFF
785 - # -DWITH_QTKIT=OFF
786 - -DWITH_TBB=$(usex threads)
787 - -DWITH_OPENMP=$(usex openmp)
788 - -DWITH_CSTRIPES=OFF
789 - -DWITH_PTHREADS_PF=ON
790 - -DWITH_TIFF=$(usex tiff)
791 - -DWITH_UNICAP=OFF # Not packaged
792 - -DWITH_V4L=$(usex v4l)
793 - -DWITH_LIBV4L=$(usex v4l)
794 - -DWITH_DSHOW=ON # direct show supp
795 - -DWITH_MSMF=OFF
796 - -DWITH_XIMEA=OFF # Windows only
797 - -DWITH_XINE=$(usex xine)
798 - -DWITH_CLP=OFF
799 - -DWITH_OPENCL=$(usex opencl)
800 - -DWITH_OPENCL_SVM=OFF
801 - -DWITH_OPENCLAMDFFT=$(usex opencl)
802 - -DWITH_OPENCLAMDBLAS=$(usex opencl)
803 - -DWITH_DIRECTX=OFF
804 - -DWITH_INTELPERC=OFF
805 - -DWITH_JAVA=$(usex java) # Ant needed, no compile flag
806 - -DWITH_IPP_A=OFF
807 - -DWITH_MATLAB=OFF
808 - -DWITH_VA=$(usex vaapi)
809 - -DWITH_VA_INTEL=$(usex vaapi)
810 - -DWITH_GDAL=$(usex gdal)
811 - -DWITH_GPHOTO2=$(usex gphoto2)
812 - -DWITH_LAPACK=$(usex lapack)
813 - # ===================================================
814 - # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
815 - # ===================================================
816 - -DWITH_CUDA=$(usex cuda)
817 - -DWITH_CUBLAS=$(usex cuda)
818 - -DWITH_CUFFT=$(usex cuda)
819 - -DWITH_NVCUVID=OFF
820 -# -DWITH_NVCUVID=$(usex cuda)
821 - -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
822 - # ===================================================
823 - # OpenCV build components
824 - # ===================================================
825 - -DBUILD_SHARED_LIBS=ON
826 - -DBUILD_ANDROID_EXAMPLES=OFF
827 - -BUILD_opencv_apps=
828 - -DBUILD_DOCS=OFF # Doesn't install anyways.
829 - -DBUILD_EXAMPLES=$(usex examples)
830 - -DBUILD_PERF_TESTS=OFF
831 - -DBUILD_TESTS=$(usex testprograms)
832 - -DBUILD_WITH_DEBUG_INFO=$(usex debug)
833 - # -DBUILD_WITH_STATIC_CRT=OFF
834 - -DBUILD_WITH_DYNAMIC_IPP=OFF
835 - -DBUILD_FAT_JAVA_LIB=$(usex java)
836 - # -DBUILD_ANDROID_SERVICE=OFF
837 - -DBUILD_CUDA_STUBS=$(usex cuda)
838 - -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
839 - # ===================================================
840 - # OpenCV installation options
841 - # ===================================================
842 - -DINSTALL_CREATE_DISTRIB=OFF
843 - -DINSTALL_C_EXAMPLES=$(usex examples)
844 - -DINSTALL_TESTS=$(usex testprograms)
845 - -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
846 - # -DINSTALL_ANDROID_EXAMPLES=OFF
847 - -DINSTALL_TO_MANGLED_PATHS=OFF
848 - # ===================================================
849 - # OpenCV build options
850 - # ===================================================
851 - -DENABLE_CCACHE=OFF
852 - -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
853 - -DENABLE_SOLUTION_FOLDERS=OFF
854 - -DENABLE_PROFILING=OFF
855 - -DENABLE_COVERAGE=OFF
856 - -DENABLE_OMIT_FRAME_POINTER=OFF
857 - -DENABLE_FAST_MATH=OFF
858 - -DENABLE_SSE=OFF
859 - -DENABLE_SSE2=OFF
860 - -DENABLE_SSE3=OFF
861 - -DENABLE_SSSE3=OFF
862 - -DENABLE_SSE41=OFF
863 - -DENABLE_SSE42=OFF
864 - -DENABLE_POPCNT=OFF
865 - -DENABLE_AVX=OFF
866 - -DENABLE_AVX=OFF
867 - -DENABLE_AVX2=OFF
868 - -DENABLE_FMA3=OFF
869 - -DENABLE_NEON=OFF
870 -
871 - -DHAVE_opencv_java=$(usex java YES NO)
872 - -DENABLE_NOISY_WARNINGS=OFF
873 - -DOPENCV_WARNINGS_ARE_ERRORS=OFF
874 - -DENABLE_IMPL_COLLECTION=OFF
875 - -DENABLE_INSTRUMENTATION=OFF
876 - -DGENERATE_ABI_DESCRIPTOR=OFF
877 - -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
878 - # ===================================================
879 - # things we want to be hard off or not yet figured out
880 - # ===================================================
881 - -DBUILD_PACKAGE=OFF
882 - -DENABLE_PROFILING=OFF
883 - # ===================================================
884 - # things we want to be hard enabled not worth useflag
885 - # ===================================================
886 - -DCMAKE_SKIP_RPATH=ON
887 - -DOPENCV_DOC_INSTALL_PATH=
888 - )
889 -
890 - # ===================================================
891 - # OpenCV Contrib Modules
892 - # ===================================================
893 - if use contrib; then
894 - GLOBALCMAKEARGS+=(
895 - -DBUILD_opencv_dnn=OFF
896 - -DBUILD_opencv_dnns_easily_fooled=OFF
897 - -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
898 - -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
899 - -DBUILD_opencv_hdf=$(usex contrib_hdf ON OFF)
900 - -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
901 - )
902 - fi
903 -
904 - # workaround for bug 413429
905 - tc-export CC CXX
906 -
907 - local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
908 - -DPYTHON_EXECUTABLE=OFF
909 - -DINSTALL_PYTHON_EXAMPLES=OFF
910 - )
911 -
912 - cmake-utils_src_configure
913 -}
914 -
915 -python_module_compile() {
916 - local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
917 -
918 - # Set all python variables to load the correct Gentoo paths
919 - mycmakeargs+=(
920 - # cheap trick: python_setup sets one of them as a symlink
921 - # to the correct interpreter, and the other to fail-wrapper
922 - -DPYTHON2_EXECUTABLE=$(type -P python2)
923 - -DPYTHON3_EXECUTABLE=$(type -P python3)
924 - -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
925 - )
926 -
927 - # Compile and install all at once because configuration will be wiped
928 - # for each impl of Python
929 - BUILD_DIR="${WORKDIR}"/${P}_build
930 - cd "${BUILD_DIR}" || die "cd failed"
931 -
932 - # Regenerate cache file. Can't use rebuild_cache as it won't
933 - # have the Gentoo specific options.
934 - rm -rf CMakeCache.txt || die "rm failed"
935 - cmake-utils_src_configure
936 - cmake-utils_src_compile
937 - cmake-utils_src_install
938 -
939 - # Remove compiled binary so new version compiles
940 - # Avoid conflicts with new module builds as build system doesn't
941 - # really support it.
942 - rm -rf modules/python2 || die "rm failed"
943 -}
944 -
945 -src_install() {
946 - cmake-utils_src_install
947 -
948 - # Build and install the python modules for all targets
949 - use python && python_foreach_impl python_module_compile
950 -}